Updating liguros repo

17 files changed, 386 insertions, 23 deletions

diff --git a/dev-python/alembic/metadata.xml b/dev-python/alembic/metadata.xml
index 34e0adeb1ac7..31c172975f4c 100644
--- a/dev-python/alembic/metadata.xml
+++ b/dev-python/alembic/metadata.xml
@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">alembic</remote-id>
-    <remote-id type="bitbucket">zzzeek/alembic</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">alembic</remote-id>
+		<remote-id type="github">sqlalchemy/alembic</remote-id>
+		<remote-id type="bitbucket">zzzeek/alembic</remote-id>
+		<bugs-to>https://github.com/sqlalchemy/alembic/issues</bugs-to>
+	</upstream>
 	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/dev-python/pydocstyle/pydocstyle-5.1.1.ebuild b/dev-python/pydocstyle/pydocstyle-5.1.1.ebuild
index 00dcd5438954..165f5595fc0b 100644
--- a/dev-python/pydocstyle/pydocstyle-5.1.1.ebuild
+++ b/dev-python/pydocstyle/pydocstyle-5.1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/PyCQA/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 
 RDEPEND="dev-python/snowballstemmer[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/pyglet/Manifest b/dev-python/pyglet/Manifest
index 22553e3c7142..9418add7c98d 100644
--- a/dev-python/pyglet/Manifest
+++ b/dev-python/pyglet/Manifest
@@ -1,2 +1,3 @@
 DIST pyglet-1.5.3.tar.gz 6356079 BLAKE2B 517b196eff334d572d4db181ce0480c3af8e2bc4a92e23e1fd7c335aedebe3afa493eb3f4745d8daffc3c7d930b9e333075014d2ba5d4303f4691c490a09f252 SHA512 12e7189272b9ab3b4bd3d713d0e979cfc1d76200fc8454b31573fca29b179f99242c34a1adb7a1c2fabb7b950cc3006cfcd8b188eb2c50ae95cca95b0e15582c
 DIST pyglet-1.5.7.tar.gz 6367378 BLAKE2B 68d4aa673a7463f7da0f4ccb7f413b602f32ecc423438326fc4262a4449fe22dff25a513074611ce2c77c130dfe9cc29e44e54a95169875208731f70803f1a45 SHA512 2c2a06636b1db788241028d1ef2290a774b98721ccc92ceed2b2895bcee81d4aa72b2111896091b54531936513772505b0d43003e412735d606130ed4b08f8c9
+DIST pyglet-1.5.8.tar.gz 6394207 BLAKE2B dcd3750b7296ab919ecb20417f0dfa2e89ab2754c28562a38175cf87f06bcd41d9b1ed2c568ed516e444a5968e21a772f0f4cfb5b626bb1aeb066f3b17f1cf18 SHA512 346dafbc751a4cfbdaf65643701500f5b5ad40541168eeea13467d0b97283baa35b22708dfc15569adcfad0b8ecb51d1b45d18775d564b12ed4be0965971229b
diff --git a/dev-python/pyglet/pyglet-1.5.8.ebuild b/dev-python/pyglet/pyglet-1.5.8.ebuild
new file mode 100644
index 000000000000..0e1bac84c1e6
--- /dev/null
+++ b/dev-python/pyglet/pyglet-1.5.8.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit distutils-r1 virtualx xdg-utils
+
+DESCRIPTION="Cross-platform windowing and multimedia library for Python"
+HOMEPAGE="https://www.pyglet.org/"
+SRC_URI="https://github.com/pyglet/pyglet/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples image +sound"
+
+BDEPEND="
+	test? (
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/gst-python[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	virtual/glu
+	virtual/opengl
+	image? ( || (
+		dev-python/pillow[${PYTHON_USEDEP}]
+		x11-libs/gtk+:2
+	) )
+	sound? ( || (
+		media-libs/openal
+		media-sound/pulseaudio
+	) )
+"
+#	ffmpeg? ( media-libs/avbin-bin )
+
+DOCS=( DESIGN NOTICE README.md RELEASE_NOTES )
+
+distutils_enable_tests pytest
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	xdg_environment_reset
+
+	# Specify path to avoid running interactive tests
+	# We could add in integration tests, but they're slow
+	pytest -vv tests/unit || die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pytest-django/Manifest b/dev-python/pytest-django/Manifest
index ab2f423b22ee..f9cd0ce843b2 100644
--- a/dev-python/pytest-django/Manifest
+++ b/dev-python/pytest-django/Manifest
@@ -1 +1,2 @@
 DIST pytest-django-3.10.0.gh.tar.gz 68995 BLAKE2B dcc9ddceda88c32dab559c065feb347582e72ec5fcd9929cb2bde091bd5c89bbe09879901daf5dc0adc7e38921de5b4989e0d1bbefaa5eb1cdce1dfd2ef58a11 SHA512 7f66fa9287fb80082018613ec3b15a0da3f7a13075e85f0a2eff9e13358c993e56245c441d952d13f232bf7e49a05c799b4affbb844e90abaac736d86bb0a6c9
+DIST pytest-django-4.0.0.gh.tar.gz 67041 BLAKE2B 74971186666498a39afca4ad273b932579ce425df439805b6f1e36eadfa916dfaa4affc29ce2987ac62d38ae517140cedbeb9a20c6e13e2362af21878f4694a5 SHA512 411a28b6e2f4cef8a0bae1ce3a937e47fa11728a873ec6a8de6599d02e5a548548ecf56d896600924acfbc0a74c651c66f9d7c4d772ce572879c17bccd3bb27d
diff --git a/dev-python/pytest-django/pytest-django-4.0.0.ebuild b/dev-python/pytest-django/pytest-django-4.0.0.ebuild
new file mode 100644
index 000000000000..dbfdf71f70cf
--- /dev/null
+++ b/dev-python/pytest-django/pytest-django-4.0.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A Django plugin for py.test"
+HOMEPAGE="
+	https://pypi.org/project/pytest-django/
+	https://pytest-django.readthedocs.org
+	https://github.com/pytest-dev/pytest-django"
+SRC_URI="
+	https://github.com/pytest-dev/pytest-django/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+
+RDEPEND="
+	>=dev-python/pytest-5.4[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools_scm-1.11.1[${PYTHON_USEDEP}]
+"
+
+# not all test dependencies are packaged and this package isn't worth it.
+RESTRICT="test"
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/python-jsonrpc-server/files/python-jsonrpc-server-0.4.0-fix-test-with-ujson-3-and-up.patch b/dev-python/python-jsonrpc-server/files/python-jsonrpc-server-0.4.0-fix-test-with-ujson-3-and-up.patch
new file mode 100644
index 000000000000..b639d69bbd04
--- /dev/null
+++ b/dev-python/python-jsonrpc-server/files/python-jsonrpc-server-0.4.0-fix-test-with-ujson-3-and-up.patch
@@ -0,0 +1,12 @@
+diff --git a/test/test_streams.py b/test/test_streams.py
+index 6985aec..9e64489 100644
+--- a/test/test_streams.py
++++ b/test/test_streams.py
+@@ -119,6 +119,7 @@ def test_writer_bad_message(wfile, writer):
+         hour=1,
+         minute=1,
+         second=1,
++        tzinfo=datetime.timezone.utc
+     ))
+
+     assert wfile.getvalue() in [
diff --git a/dev-python/python-jsonrpc-server/python-jsonrpc-server-0.4.0.ebuild b/dev-python/python-jsonrpc-server/python-jsonrpc-server-0.4.0-r1.ebuild
index 0b4515918814..33b6d6e78990 100644
--- a/dev-python/python-jsonrpc-server/python-jsonrpc-server-0.4.0.ebuild
+++ b/dev-python/python-jsonrpc-server/python-jsonrpc-server-0.4.0-r1.ebuild
@@ -21,17 +21,15 @@ BDEPEND="dev-python/versioneer[${PYTHON_USEDEP}]
 		dev-python/pycodestyle[${PYTHON_USEDEP}]
 )"
 
-RDEPEND="~dev-python/ujson-1.35[${PYTHON_USEDEP}]"
+RDEPEND=">=dev-python/ujson-3[${PYTHON_USEDEP}]"
 
 distutils_enable_tests pytest
 
+PATCHES=( "${FILESDIR}/${PN}-0.4.0-fix-test-with-ujson-3-and-up.patch" )
+
 python_prepare_all() {
 	# Remove pytest-cov dep
 	sed -i -e '0,/addopts/I!d' setup.cfg || die
 
-	# jsonrpc-server does not actually work with ujson>3.0.0: tests fail
-	sed -i -e 's/ujson>=3.0.0/ujson==1.35/g' setup.py || die
-	sed -i -e 's/ujson>=3.0.0/ujson==1.35/g' python_jsonrpc_server.egg-info/requires.txt || die
-
 	distutils-r1_python_prepare_all
 }
diff --git a/dev-python/python-language-server/python-language-server-0.35.1.ebuild b/dev-python/python-language-server/python-language-server-0.35.1-r1.ebuild
index 7cfa8059d3be..5c202c3a0dd8 100644
--- a/dev-python/python-language-server/python-language-server-0.35.1.ebuild
+++ b/dev-python/python-language-server/python-language-server-0.35.1-r1.ebuild
@@ -44,7 +44,7 @@ RDEPEND="
 	<dev-python/jedi-0.18.0[${PYTHON_USEDEP}]
 	dev-python/pluggy[${PYTHON_USEDEP}]
 	>=dev-python/python-jsonrpc-server-0.4.0[${PYTHON_USEDEP}]
-	~dev-python/ujson-1.35[${PYTHON_USEDEP}]
+	>=dev-python/ujson-3[${PYTHON_USEDEP}]
 "
 
 distutils_enable_tests pytest
@@ -53,10 +53,6 @@ python_prepare_all() {
 	# remove pytest-cov dep
 	sed -i -e '0,/addopts/I!d' setup.cfg || die
 
-	# jsonrpc-server does not actually work with ujson>3.0.0: test fail
-	sed -i -e 's/ujson>=3.0.0/ujson==1.35/g' setup.py || die
-	sed -i -e 's/ujson>=3.0.0/ujson==1.35/g' python_language_server.egg-info/requires.txt || die
-
 	distutils-r1_python_prepare_all
 }
 
diff --git a/dev-python/qdarkstyle/qdarkstyle-2.8.1.ebuild b/dev-python/qdarkstyle/qdarkstyle-2.8.1.ebuild
index 637111a307f8..8cd0381ec5d6 100644
--- a/dev-python/qdarkstyle/qdarkstyle-2.8.1.ebuild
+++ b/dev-python/qdarkstyle/qdarkstyle-2.8.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/ColinDuquesnoy/${MY_PN}/archive/v${PV}.tar.gz -> ${P
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="examples"
 
diff --git a/dev-python/sphinx-multiversion/sphinx-multiversion-0.2.4.ebuild b/dev-python/sphinx-multiversion/sphinx-multiversion-0.2.4.ebuild
index eb17e4c52eac..f2e37d40c773 100644
--- a/dev-python/sphinx-multiversion/sphinx-multiversion-0.2.4.ebuild
+++ b/dev-python/sphinx-multiversion/sphinx-multiversion-0.2.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/Holzhaus/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="
 	dev-python/sphinx[${PYTHON_USEDEP}]
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index 556c40c1eaa2..c5caff9cd008 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -1,2 +1,3 @@
 DIST SQLAlchemy-1.3.11.tar.gz 6007784 BLAKE2B c889ea28ae08fcb83d338ab01a64533142428ee91a6c11b9a7f2116f99161c066e66f49d76bdd2c7600f1a7f86a2add217f49dda4cf97566a875f28d3d4b24be SHA512 c691539db4edd62af749087728dfd424010bfb3ca2cc8503a4b96c1625d059d4c2a748b9a35cc870cc99ca9df61966cce406f9b570b25e55c3632a99b8621e74
 DIST SQLAlchemy-1.3.17.tar.gz 5979141 BLAKE2B f0fa46493461f532ebca9420fc9f49a2c04af888aa99653946a5bb563d40b8bb714a03301300ebb80cca76a99f8226ddfcde4216e8fc2593d3a161b5072276ab SHA512 6f6d54b9018ece6c289f28a3a41ffb1b2216206edee08c49f387e9f30740969dfe0f8272654ce4efca159a2a6619e76c41b2ad2b10c391cdd64681ac17d0bc79
+DIST SQLAlchemy-1.3.20.tar.gz 6264898 BLAKE2B 4c386eff56c2f9ec7ef467e3bc0032629582a970707dc11e3744fe3903d9cb18457f5e0be4dc9c20727b5733f158e031bf8b40f586dadb8f4ab8d0cae3cf7398 SHA512 29c52ada1a66f906ed2563df2ab093eceb7c09de45749c96031f30a1512d20b1d698e00640c777169ef3db99ab012151770a3daea45a51df934269b554ff4b28
diff --git a/dev-python/sqlalchemy/files/sqlalchemy-1.3.20-pypy3.patch b/dev-python/sqlalchemy/files/sqlalchemy-1.3.20-pypy3.patch
new file mode 100644
index 000000000000..3455534eb35d
--- /dev/null
+++ b/dev-python/sqlalchemy/files/sqlalchemy-1.3.20-pypy3.patch
@@ -0,0 +1,188 @@
+commit 1607c5c19f8ef362be7182b0ee0fddc6a3d3140e
+Author: Federico Caselli <cfederico87@gmail.com>
+Date:   Sat Apr 18 18:10:59 2020 +0200
+
+    Enable pypy tests on github workflow
+    
+    Fixes: #5223
+    Change-Id: I0952e54ed9af2952ea340be1945311376ffc1ad2
+
+diff --git a/lib/sqlalchemy/orm/mapper.py b/lib/sqlalchemy/orm/mapper.py
+index 6f3170a9e..0427eeac5 100644
+--- a/lib/sqlalchemy/orm/mapper.py
++++ b/lib/sqlalchemy/orm/mapper.py
+@@ -1326,7 +1326,7 @@ class Mapper(InspectionAttr):
+             if key == "__init__" and hasattr(method, "_sa_original_init"):
+                 method = method._sa_original_init
+                 if isinstance(method, types.MethodType):
+-                    method = method.im_func
++                    method = method.__func__
+             if isinstance(method, types.FunctionType):
+                 if hasattr(method, "__sa_reconstructor__"):
+                     self._reconstructor = method
+diff --git a/lib/sqlalchemy/testing/plugin/pytestplugin.py b/lib/sqlalchemy/testing/plugin/pytestplugin.py
+index ad4ebb656..dc47f671e 100644
+--- a/lib/sqlalchemy/testing/plugin/pytestplugin.py
++++ b/lib/sqlalchemy/testing/plugin/pytestplugin.py
+@@ -340,7 +340,7 @@ def %(name)s(%(args)s):
+             code, {"target": target, "fn": fn}, fn.__name__
+         )
+         if not add_positional_parameters:
+-            decorated.__defaults__ = getattr(fn, "im_func", fn).__defaults__
++            decorated.__defaults__ = getattr(fn, "__func__", fn).__defaults__
+             decorated.__wrapped__ = fn
+             return update_wrapper(decorated, fn)
+         else:
+diff --git a/lib/sqlalchemy/util/langhelpers.py b/lib/sqlalchemy/util/langhelpers.py
+index 7de16bcdf..e256d7764 100644
+--- a/lib/sqlalchemy/util/langhelpers.py
++++ b/lib/sqlalchemy/util/langhelpers.py
+@@ -151,7 +151,7 @@ def %(name)s(%(args)s):
+         decorated = _exec_code_in_env(
+             code, {targ_name: target, fn_name: fn}, fn.__name__
+         )
+-        decorated.__defaults__ = getattr(fn, "im_func", fn).__defaults__
++        decorated.__defaults__ = getattr(fn, "__func__", fn).__defaults__
+         decorated.__wrapped__ = fn
+         return update_wrapper(decorated, fn)
+ 
+@@ -751,7 +751,7 @@ def monkeypatch_proxied_specials(
+             fn = getattr(from_cls, method)
+             if not hasattr(fn, "__call__"):
+                 continue
+-            fn = getattr(fn, "im_func", fn)
++            fn = getattr(fn, "__func__", fn)
+         except AttributeError:
+             continue
+         try:
+diff --git a/test/base/test_utils.py b/test/base/test_utils.py
+index 8356de61b..c04dea7cd 100644
+--- a/test/base/test_utils.py
++++ b/test/base/test_utils.py
+@@ -411,7 +411,8 @@ class WrapCallableTest(fixtures.TestBase):
+             lambda: my_functools_default(), my_functools_default
+         )
+         eq_(c.__name__, "partial")
+-        eq_(c.__doc__, my_functools_default.__call__.__doc__)
++        if not compat.pypy:  # pypy fails this check
++            eq_(c.__doc__, my_functools_default.__call__.__doc__)
+         eq_(c(), 5)
+ 
+ 
+diff --git a/test/engine/test_logging.py b/test/engine/test_logging.py
+index fe4ff44a7..e14c3a37d 100644
+--- a/test/engine/test_logging.py
++++ b/test/engine/test_logging.py
+@@ -8,6 +8,7 @@ from sqlalchemy import or_
+ from sqlalchemy import select
+ from sqlalchemy import String
+ from sqlalchemy import Table
++from sqlalchemy import testing
+ from sqlalchemy import util
+ from sqlalchemy.sql import util as sql_util
+ from sqlalchemy.testing import assert_raises_message
+@@ -460,10 +461,12 @@ class PoolLoggingTest(fixtures.TestBase):
+         q = self._stpool_logging_fixture()
+         self._test_queuepool(q, False)
+ 
++    @testing.requires.predictable_gc
+     def test_queuepool_echo(self):
+         q = self._queuepool_echo_fixture()
+         self._test_queuepool(q)
+ 
++    @testing.requires.predictable_gc
+     def test_queuepool_logging(self):
+         q = self._queuepool_logging_fixture()
+         self._test_queuepool(q)
+diff --git a/test/engine/test_pool.py b/test/engine/test_pool.py
+index 3b989959e..c8cd89555 100644
+--- a/test/engine/test_pool.py
++++ b/test/engine/test_pool.py
+@@ -608,6 +608,7 @@ class PoolEventsTest(PoolTestBase):
+         assert canary.call_args_list[0][0][0] is dbapi_con
+         assert canary.call_args_list[0][0][2] is exc
+ 
++    @testing.requires.predictable_gc
+     def test_checkin_event_gc(self):
+         p, canary = self._checkin_event_fixture()
+ 
+diff --git a/test/orm/test_deferred.py b/test/orm/test_deferred.py
+index f8817bbd7..2bf466c15 100644
+--- a/test/orm/test_deferred.py
++++ b/test/orm/test_deferred.py
+@@ -1700,6 +1700,8 @@ class WithExpressionTest(fixtures.DeclarativeMappedTest):
+         c1 = s.query(C).order_by(C.id)
+         eq_(c1.all(), [C(c_expr=1), C(c_expr=1)])
+ 
++        s.expunge_all()
++
+         c2 = (
+             s.query(C)
+             .options(with_expression(C.c_expr, C.x * 2))
+
+commit 8d3ac81a8794bdd3532ad07427edf9f48493919d
+Date:   Wed Oct 14 18:25:45 2020 +0200
+
+    Skip a failing test that got removed in master
+    
+    https://github.com/sqlalchemy/sqlalchemy/commit/a9b068ae564e5e775e312373088545b75aeaa1b0
+
+diff --git a/test/orm/test_deprecations.py b/test/orm/test_deprecations.py
+index 156898f..0d6dc72 100644
+--- a/test/orm/test_deprecations.py
++++ b/test/orm/test_deprecations.py
+@@ -560,7 +560,7 @@ class StrongIdentityMapTest(_fixtures.FixtureTest):
+     def test_prune_imap(self):
+         self._test_prune(self._strong_ident_fixture)
+ 
+-    def test_prune_events(self):
++    def _test_prune_events(self):
+         self._test_prune(self._event_fixture)
+ 
+     @testing.fails_if(lambda: pypy, "pypy has a real GC")
+
+commit 1a1cc0e623698a75274f1525d2d14464ff738b86
+Date:   Wed Oct 14 18:28:56 2020 +0200
+
+    Fix PyPy-related tests
+    
+    Partial backport of https://github.com/sqlalchemy/sqlalchemy/commit/9e31fc74089cf565df5f275d22eb8ae5414d6e45
+
+diff --git a/test/base/test_utils.py b/test/base/test_utils.py
+diff --git a/test/base/test_utils.py b/test/base/test_utils.py
+index 8356de61b..c3d25b824 100644
+--- a/test/base/test_utils.py
++++ b/test/base/test_utils.py
+@@ -1725,7 +1725,7 @@ class ArgInspectionTest(fixtures.TestBase):
+ 
+         assert_raises(TypeError, get_callable_argspec, datetime.datetime.now)
+ 
+-    @fails_if(lambda: util.pypy, "pypy returns plain *arg, **kw")
++    @testing.requires.cpython
+     def test_callable_argspec_obj_init(self):
+         assert_raises(TypeError, get_callable_argspec, object)
+ 
+@@ -2154,10 +2154,7 @@ class TestFormatArgspec(_Py3KFixtures, fixtures.TestBase):
+                 grouped=False,
+             )
+ 
+-    @testing.fails_if(
+-        lambda: util.pypy,
+-        "pypy doesn't report Obj.__init__ as object.__init__",
+-    )
++    @testing.requires.cpython
+     def test_init_grouped(self):
+         object_spec = {
+             "args": "(self)",
+@@ -2181,10 +2178,7 @@ class TestFormatArgspec(_Py3KFixtures, fixtures.TestBase):
+         self._test_init(None, object_spec, wrapper_spec, custom_spec)
+         self._test_init(True, object_spec, wrapper_spec, custom_spec)
+ 
+-    @testing.fails_if(
+-        lambda: util.pypy,
+-        "pypy doesn't report Obj.__init__ as object.__init__",
+-    )
++    @testing.requires.cpython
+     def test_init_bare(self):
+         object_spec = {
+             "args": "self",
diff --git a/dev-python/sqlalchemy/metadata.xml b/dev-python/sqlalchemy/metadata.xml
index ea923f2ab7b4..c49c98487467 100644
--- a/dev-python/sqlalchemy/metadata.xml
+++ b/dev-python/sqlalchemy/metadata.xml
@@ -7,6 +7,8 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="pypi">SQLAlchemy</remote-id>
+		<remote-id type="github">sqlalchemy/sqlalchemy</remote-id>
+		<bugs-to>https://github.com/sqlalchemy/sqlalchemy/issues</bugs-to>
 	</upstream>
 	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.3.20.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.3.20.ebuild
new file mode 100644
index 000000000000..2e87477ec838
--- /dev/null
+++ b/dev-python/sqlalchemy/sqlalchemy-1.3.20.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
+PYTHON_REQ_USE="sqlite?"
+
+inherit distutils-r1 optfeature
+
+MY_PN="SQLAlchemy"
+MY_P="${MY_PN}-${PV/_beta/b}"
+
+DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
+HOMEPAGE="https://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+IUSE="examples +sqlite test"
+
+REQUIRED_USE="test? ( sqlite )"
+
+# Use pytest-xdist to speed up tests
+BDEPEND="
+	test? (
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	# Ported part of those commits to fix failing tests:
+	# https://github.com/sqlalchemy/sqlalchemy/commit/c68f9fb87868c45fcadcc942ce4a35f10ff2f7ea
+	# https://github.com/sqlalchemy/sqlalchemy/commit/a9b068ae564e5e775e312373088545b75aeaa1b0
+	# https://github.com/sqlalchemy/sqlalchemy/commit/9e31fc74089cf565df5f275d22eb8ae5414d6e45
+	"${FILESDIR}/${P}-pypy3.patch"
+)
+
+distutils_enable_tests pytest
+
+python_test() {
+	# Use all CPUs with pytest-xdist
+	pytest -n auto -vv || die "Tests failed with ${EPYTHON}"
+}
+
+python_prepare_all() {
+	# Disable tests hardcoding function call counts specific to Python versions.
+	rm -r test/aaa_profiling || die
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		dodoc -r examples
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "MySQL support" dev-python/mysqlclient dev-python/pymysql \
+		dev-python/mysql-connector-python
+	optfeature "mssql support" dev-python/pymssql
+	optfeature "postgresql support" dev-python/psycopg:2
+}
diff --git a/dev-python/zipp/Manifest b/dev-python/zipp/Manifest
index b5608260e3d3..069f2fc3b8b0 100644
--- a/dev-python/zipp/Manifest
+++ b/dev-python/zipp/Manifest
@@ -1,3 +1,3 @@
 DIST zipp-3.1.0.tar.gz 14808 BLAKE2B fb5524c2619e51c5f8c1b85fa819d1001e6296df6c9d5320c6ab3ec88fa5c932c139161e621d51b2827ef40402bb2492b8b08e470b7333e847495ec690024879 SHA512 bb8dea71eccc4f3b18fc816dae700582c3feb72f346e115bb2d1adc336f121304a285e4d5dad48d15b386b9e137c6e1d1793ef50d22b6bd697812a661817684e
-DIST zipp-3.2.0.tar.gz 16238 BLAKE2B d74781639c714342863a0532ac8bbfc4d8cdcd554b9ce2b0edf83dc26ac423231ac85323379b4923308f2319c828aca2e0bcd4bd136845e7026b09e1e16e108e SHA512 fc0c8a9f1fbbcdd0f70c536e7498605e0a338dd99abd65f16b360cb16f96c7860d422ce2b55f7b2c1bfd7e5c5b5ca3bf818a48bae19bfbf190d91d4778aed31a
 DIST zipp-3.3.0.tar.gz 16796 BLAKE2B 4d6acbca82e7da97f0634a47306d157fc3bc9cd37875c95fa449cd08ac7c9ad266c43cfeec373a6d866fc21ccb7ced9049552cc9cc816e471bbe5f7ffd43a4df SHA512 af43451d908dca5971625dade20fa8038713a2c4d2c3ddb1690199832d44b8515124276193bb514883cfba70b32360b450a64a2ed1d8537dc71f243ef57e9d92
+DIST zipp-3.3.1.tar.gz 17336 BLAKE2B a71e4a059f5c1f3d7a91032f48686aeda64b5bdd83da45fadc24d6662d03944e3ac9484a1a1ec345baf9ebc4f64b73bf4d880fcdda46e23a17291b6e06a7a72e SHA512 0504e42b09148e5db45d8368e5a9d7b857474d81d18561342cac3306e26944df291c2961114b568940ef003387461ac55b673ae21b2f5e5820194119173fd732
diff --git a/dev-python/zipp/zipp-3.2.0.ebuild b/dev-python/zipp/zipp-3.3.1.ebuild
index 6206e0c94929..52445b7f7362 100644
--- a/dev-python/zipp/zipp-3.2.0.ebuild
+++ b/dev-python/zipp/zipp-3.3.1.ebuild
@@ -14,7 +14,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="test"
 
 BDEPEND="
 	dev-python/toml[${PYTHON_USEDEP}]