gentoo resync : 29.12.2022

6 files changed, 138 insertions, 205 deletions

diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index 18970f625373..049f8bfebd40 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -1,8 +1,9 @@
-AUX sqlalchemy-1.3.20-pypy3.patch 7321 BLAKE2B 706ff7da1f25a667784f462effb85593e8ad9a3fe893000866e487ec32328a571f4440ce4dcce61e2b5f1ded5c8145f5cd12a141c40f4bb64e87135aa18a8274 SHA512 40944c59cc6cb17f512d0df1e2cf50626dfa6a53e2e8b182c0ccb4007c2338d8058459a9158e9e72ee6aa89394275cf818f0c7572b249175d3acd52f5a1c2827
-DIST SQLAlchemy-1.4.31.tar.gz 7999646 BLAKE2B 4c394aaa4bc5636cc90f06017466c227b5e16fc54c3a9a42b18cc13906640e4710146325e870598f8905074bf6dad42ea524febc029b1dd5f063e978ebc9a442 SHA512 e54261fcf992845b2e6be47d23f530aec28c7517e6741b1b6a101b9888d3dc3162c1eeab0acc1edb33f56f1360bae3cdccdbcbff0e1e88e477c93d0cd910c17c
-DIST SQLAlchemy-1.4.35.tar.gz 8136388 BLAKE2B 01a47eab8e11daef133a218a7ef13fa149fb4616b531c3c6d227cc26e3264c259f42770b72335a9fbda5e66ae1ce242fcbe676a528ca1af896d990a84a1f1a57 SHA512 195ab35934bca36e7c4c2127f153eff31775f7f150163912f79143efae63911eded67d8645e08ede2c533c675d18c3c5796235e0c0f6d1e6ebb97664ac13f171
 DIST SQLAlchemy-1.4.36.tar.gz 8146415 BLAKE2B 62560ac2f2c542d60588a24eef225d39f1b6c4cf6feddfac4631e06731206a837cc0f76b88b40c73600361243857e9e1768b4b4ac0bf5ee8e28736d81028ae58 SHA512 c9bb38ce5eeb7817727e93695f10cf5c247710b809f3298b233ed8be4e2cc08e5a14581d0c5aa2af02d7a49f036fe3a0bb7a88120b58bdce0f115016bdaf2c77
-EBUILD sqlalchemy-1.4.31.ebuild 1904 BLAKE2B 0e84fa418b508f4793ceabbe655c227b3f2cd92bd626e5ecde35a9996182f24690db87cfaf5172eec8d0ec27e425824180fa1f5fddf4b68ed026d7c6ad95a373 SHA512 9dad795092985c87f6929f9e8f4184ec3ae99458e2bf2518da13769c059bb24b91782d8fb4d5b00e7eb5e477428cd1eb7c1dc2dfc03c521bc7576aafe52153a5
-EBUILD sqlalchemy-1.4.35.ebuild 2658 BLAKE2B d625ac04a292116546425a8e6f958e03f968c5008305d62cdaf6c266705b0f6b2694027bf0b35244479ca8368cb5a2527c4966dd950e225b18428a38a3d7af57 SHA512 30c78ed65b85379acbaeb3f06b505a4ed8ed73a6027e009b9dafbf37383b2ff0a68d988c7bf65355bc87c80916403c2ff7bb12bde04947c692fe2a15b37e345b
-EBUILD sqlalchemy-1.4.36.ebuild 2672 BLAKE2B 868685c76e5db4f863006002b84cf660492fd86ee38ea7e941eb2b1b917777a4aa037e96ddd56336d3d2c2ed238886354aa2dbca64743040a1008e63de158045 SHA512 2894b255260a6143d9e9a1789db08980e84dec7e6b6a8428aa170668bee0186afb5d8273ca7c7b49fb7f96bdcced9c23602b27572d20fec43a0f127646988bc7
+DIST SQLAlchemy-1.4.37.tar.gz 8155965 BLAKE2B cf21c2ab73a5ba2576a857a12f30ea516265af946e25c1b137e57019d862bf04f4757b4755cee28e6f53642d1f1b58f43c99cd1c69f87640e47ac8a1d1ff8d28 SHA512 3f8a814f9bb6fa273f7b210c4567bf7411d0cf2e5caf010a5387fb946063704c342072145a858fb906545dfb1b959155d041e6073273674e51715356fc1f39e6
+DIST SQLAlchemy-1.4.38.tar.gz 8211925 BLAKE2B c65a8bddfc77bb6262e24a9b191344da312641dcd759de8541439e13cc532d9c2ef92da50c0b46ace60f2fd8582dfa6ea37b2f393fd979b3f122d962c688ede8 SHA512 4f54873fe2ba14b00cfa900251bc81d4fbbd62ed2b0f5f35bd3d5157796b869a3b7a9acf162f65da3f05b4b43cfc8bba437600f7fb81887a1839043a6ad516b4
+DIST SQLAlchemy-1.4.39.tar.gz 8212369 BLAKE2B d65993c4342c2cb5bc76ea4ecc986d0ec521a6eb785604ceeca0c9c22187e4af29fc8bd940a130162ca9dd5c30d58b5d0999472285382c6f6bed3863ff9f20cd SHA512 a7c6b73250044289add492b2d7df9010f3b9a3a5126c8b3448d7339cf743c4be3f1c08d238107bb12c579b2bbd7d20e216e331d3ee10dcf79c0f23ca44d496af
+EBUILD sqlalchemy-1.4.36.ebuild 2839 BLAKE2B b19eea5aad1cb6309d4b8b93777a0dbc9bafce964aea03a3cda6a80acc603fc1ff18cfcf324b6a9a65faf00354f49c778203e02277b8c277dcd484cc381654b5 SHA512 881a5a1b470dcb2c15ce0dead3ea454ec11a130202bb243e14c0622a0d7ab424747b42ac349eb3d7b4f68c27495e273f23d5d1d4c0f8d5fa4cd1efedec785e6a
+EBUILD sqlalchemy-1.4.37.ebuild 2847 BLAKE2B 2f86c2ac04799d1f99503d37ecf027aff9197ba4eb2f2c739b4d6d66ce69ac83e1c12a621563a44a07b0e150ba2f3702446684f70a7808e57fba81ccc5458304 SHA512 802c09ba8a51a6d432cf7b5e7df0a7e970702659eafc6cba108605a66be8004aec2cb867da1646c194dcbcedb77d6d819109d8ca0c3572eb2f5f2adf80314d13
+EBUILD sqlalchemy-1.4.38.ebuild 2625 BLAKE2B cb12c0a41a713cad62ed92c4232a24a3ef0293e5d48488ed3ebf9cb70106a9febab2caa70bfbbb7c22e281d6db222f1a0e3cc5ce782272880effeda6a4ae2fd8 SHA512 dec936b66e10c04ce2c9eb2af65cf48c64a5e9b04ef1279c1133fb56d9a424853544ef5c3e7412d5cd5bc58c36c3697f34e2ce05cf847335872891d5f397e16c
+EBUILD sqlalchemy-1.4.39.ebuild 2625 BLAKE2B cb12c0a41a713cad62ed92c4232a24a3ef0293e5d48488ed3ebf9cb70106a9febab2caa70bfbbb7c22e281d6db222f1a0e3cc5ce782272880effeda6a4ae2fd8 SHA512 dec936b66e10c04ce2c9eb2af65cf48c64a5e9b04ef1279c1133fb56d9a424853544ef5c3e7412d5cd5bc58c36c3697f34e2ce05cf847335872891d5f397e16c
 MISC metadata.xml 444 BLAKE2B 5fbfcf8f16e52ab5bb691b0b33a8491d94e42a80409114cd9b306af7d4b0eb8b6660fabc663adee53080c635217961301b78df536995b91afe9288d255f73d62 SHA512 b432b65ed3033d34ac0784d007909eb838b309b6a4785eebb1a3f808e43dfc41c786cd55e4dd048776c65127aac170bdd9fb9e5a8ae63accb5f65e300bca9676
diff --git a/dev-python/sqlalchemy/files/sqlalchemy-1.3.20-pypy3.patch b/dev-python/sqlalchemy/files/sqlalchemy-1.3.20-pypy3.patch
deleted file mode 100644
index 3455534eb35d..000000000000
--- a/dev-python/sqlalchemy/files/sqlalchemy-1.3.20-pypy3.patch
+++ /dev/null
@@ -1,188 +0,0 @@
-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/sqlalchemy-1.4.36.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.36.ebuild
index f6015bde3b33..7c460a84d5da 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.36.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.36.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
 PYTHON_REQ_USE="sqlite?"
 
 inherit distutils-r1 optfeature
@@ -23,7 +23,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="examples +sqlite test"
 
 BDEPEND="
@@ -52,6 +52,10 @@ python_test() {
 	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
 		test/ext/test_associationproxy.py::ProxyHybridTest::test_msg_fails_on_cls_access
 	)
+	[[ ${EPYTHON} == python3.11 ]] && EPYTEST_DESELECT+=(
+		# https://github.com/sqlalchemy/sqlalchemy/issues/8019
+		test/engine/test_logging.py::TransactionContextLoggingTest::test_log_messages_have_correct_metadata_echo
+	)
 	if ! has_version "dev-python/greenlet[${PYTHON_USEDEP}]"; then
 		EPYTEST_DESELECT+=(
 			test/ext/asyncio/test_engine_py3k.py::TextSyncDBAPI::test_sync_driver_execution
@@ -89,6 +93,5 @@ pkg_postinst() {
 		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/sqlalchemy/sqlalchemy-1.4.37.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.37.ebuild
new file mode 100644
index 000000000000..d5071298604b
--- /dev/null
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.37.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+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/
+	https://github.com/sqlalchemy/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 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="examples +sqlite test"
+
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	# hardcode call counts specific to Python versions
+	test/aaa_profiling
+)
+
+src_prepare() {
+	sed -i -e '/greenlet/d' setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# warning tests are unreliable
+		test/base/test_warnings.py
+	)
+	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
+		test/ext/test_associationproxy.py::ProxyHybridTest::test_msg_fails_on_cls_access
+	)
+	[[ ${EPYTHON} == python3.11 ]] && EPYTEST_DESELECT+=(
+		# https://github.com/sqlalchemy/sqlalchemy/issues/8019
+		test/engine/test_logging.py::TransactionContextLoggingTest::test_log_messages_have_correct_metadata_echo
+	)
+	if ! has_version "dev-python/greenlet[${PYTHON_USEDEP}]"; then
+		EPYTEST_DESELECT+=(
+			test/ext/asyncio/test_engine_py3k.py::TextSyncDBAPI::test_sync_driver_execution
+			test/ext/asyncio/test_engine_py3k.py::TextSyncDBAPI::test_sync_driver_run_sync
+			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[True-_exclusions0]"
+			"test/engine/test_pool.py::QueuePoolTest::test_userspace_disconnectionerror_weakref_finalizer[True-_exclusions0]"
+		)
+	fi
+
+	# upstream's test suite is horribly hacky; it relies on disabling
+	# the warnings plugin and turning warnings into errors;  this also
+	# means that any DeprecationWarnings from third-party plugins cause
+	# everything to explode
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=
+	# upstream automagically depends on xdist when it is importable
+	if has_version "dev-python/pytest-xdist[${PYTHON_USEDEP}]"; then
+		PYTEST_PLUGINS+=xdist.plugin
+	fi
+	epytest
+}
+
+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 "asyncio support" dev-python/greenlet
+	optfeature "MySQL support" \
+		dev-python/mysqlclient \
+		dev-python/pymysql \
+		dev-python/mysql-connector-python
+	optfeature "postgresql support" dev-python/psycopg:2
+}
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.35.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.38.ebuild
index 01bf4fee6568..b9b2ea0d21f1 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.35.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.38.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
 PYTHON_REQ_USE="sqlite?"
 
 inherit distutils-r1 optfeature
@@ -23,7 +23,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="examples +sqlite test"
 
 BDEPEND="
@@ -89,6 +89,5 @@ pkg_postinst() {
 		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/sqlalchemy/sqlalchemy-1.4.31.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.39.ebuild
index 811eb0d99f70..b9b2ea0d21f1 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.31.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.39.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
 PYTHON_REQ_USE="sqlite?"
 
 inherit distutils-r1 optfeature
@@ -13,13 +13,17 @@ 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/"
+HOMEPAGE="
+	https://www.sqlalchemy.org/
+	https://pypi.org/project/SQLAlchemy/
+	https://github.com/sqlalchemy/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 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="examples +sqlite test"
 
 BDEPEND="
@@ -41,6 +45,22 @@ src_prepare() {
 }
 
 python_test() {
+	local EPYTEST_DESELECT=(
+		# warning tests are unreliable
+		test/base/test_warnings.py
+	)
+	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
+		test/ext/test_associationproxy.py::ProxyHybridTest::test_msg_fails_on_cls_access
+	)
+	if ! has_version "dev-python/greenlet[${PYTHON_USEDEP}]"; then
+		EPYTEST_DESELECT+=(
+			test/ext/asyncio/test_engine_py3k.py::TextSyncDBAPI::test_sync_driver_execution
+			test/ext/asyncio/test_engine_py3k.py::TextSyncDBAPI::test_sync_driver_run_sync
+			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[True-_exclusions0]"
+			"test/engine/test_pool.py::QueuePoolTest::test_userspace_disconnectionerror_weakref_finalizer[True-_exclusions0]"
+		)
+	fi
+
 	# upstream's test suite is horribly hacky; it relies on disabling
 	# the warnings plugin and turning warnings into errors;  this also
 	# means that any DeprecationWarnings from third-party plugins cause
@@ -65,8 +85,9 @@ python_install_all() {
 
 pkg_postinst() {
 	optfeature "asyncio support" dev-python/greenlet
-	optfeature "MySQL support" dev-python/mysqlclient dev-python/pymysql \
+	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
 }