gentoo auto-resync : 01:04:2024 - 20:14:15

3 files changed, 75 insertions, 1 deletions

diff --git a/dev-python/alembic/Manifest b/dev-python/alembic/Manifest
index c84c5316dcaa..72a56d4dc86d 100644
--- a/dev-python/alembic/Manifest
+++ b/dev-python/alembic/Manifest
@@ -1,3 +1,4 @@
+AUX alembic-1.13.1-pytest-8.patch 2119 BLAKE2B e03335427447649b710f5fc9daf1c62ecd0fb7452e301d49e74a0f8c2ce4d4a2eb7800e1e020b67c813fafe4ada27c28ae66c1f9b40f4db37dbeb9ae4ab2be33 SHA512 77146e56c15bcd04130bb68cb8a96cc25c221db9bb884215ea5f5b45e93708ee6cad639fc1db686c960cd265f3bee274784362be9409a50ffc0fc889162d5c24
 DIST alembic-1.13.1.tar.gz 1213288 BLAKE2B 12c01f60a564c3021b3d2ae61f220822a0ca644af5097b72a826f48d04225c441f580204680674410e6e2570b5c7ee24053024863162d7d43bc423a86cddcea6 SHA512 2a5826461bec22c2efc244dd8394d34d39ed6e3511a32e8e460057ab34f9e559d28dda4ea7e34ccd30628e889a3cb37cb156596e37dba748c12a0195d78aa678
-EBUILD alembic-1.13.1.ebuild 1059 BLAKE2B 5dfe4acf00d65da4b05d8a949dca30c516e45e71a79d303a2a09bdeaf2fb85265b12935a52c5488d183a35dfdb9d0608a27cdea9864574ff21152add9959c8df SHA512 5dcfe017f47f7e345b561737eec79db2c9a0131abacf5e49c6e16d1d03142e8ac4e5f29ef2648e2dd570b8d1550d04e2cf3bb17667b793a85b195fa8bfb6ea67
+EBUILD alembic-1.13.1.ebuild 1196 BLAKE2B a9ab8592ee62e83611313e60c0c63246a1cfcd020b7c52bd396100e55ef99b230bd6e50f2c36da174720f137c7c88f83b11461798ede861bb8c46c8c0ad58aa8 SHA512 9e392a31b81e1c4613111e50117dd91d281ef23c62e036cdaba4bb4948fe6d1b1968b71f76a9cacbe21641023732a07b8cb85ff55b607b8f86e0bace0691bb20
 MISC metadata.xml 516 BLAKE2B 08b11ebed2913b00e0a8c0044a50e3ca7bc0e51fcad180725c90445227fed1aed58ed89b4bed58ef5c050c3eee3c19da33aabce5cd1f7835f4b560e67ccc7744 SHA512 b4afb6af57562e6065f03db71da0dbdfc9c4337e54cbaddfa257ee7bad48dbeecfaccd765901bf65279e34cf96be3975f983017858904716a36bf8c18f33db79
diff --git a/dev-python/alembic/alembic-1.13.1.ebuild b/dev-python/alembic/alembic-1.13.1.ebuild
index d30bacd5aaea..e8a5a9d46409 100644
--- a/dev-python/alembic/alembic-1.13.1.ebuild
+++ b/dev-python/alembic/alembic-1.13.1.ebuild
@@ -34,6 +34,11 @@ BDEPEND="
 EPYTEST_XDIST=1
 distutils_enable_tests pytest
 
+PATCHES=(
+	# https://github.com/sqlalchemy/alembic/commit/6bdb9043868d4bd04ebe3fe8a4991735d5f87ed3
+	"${FILESDIR}/${P}-pytest-8.patch"
+)
+
 python_test() {
 	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
 	# setup.cfg contains -p no:warnings in addopts which triggers
diff --git a/dev-python/alembic/files/alembic-1.13.1-pytest-8.patch b/dev-python/alembic/files/alembic-1.13.1-pytest-8.patch
new file mode 100644
index 000000000000..a681645e02ec
--- /dev/null
+++ b/dev-python/alembic/files/alembic-1.13.1-pytest-8.patch
@@ -0,0 +1,68 @@
+From 6bdb9043868d4bd04ebe3fe8a4991735d5f87ed3 Mon Sep 17 00:00:00 2001
+From: Mike Bayer <mike_mp@zzzcomputing.com>
+Date: Sun, 3 Mar 2024 23:11:50 -0500
+Subject: [PATCH] use SQLAlchemy's xdist methods
+
+Fixes to support pytest 8.1 for the test suite.
+
+the use of teardown() was based on pytest's nose
+compat, which is removed.  their xdist style tests use the name
+"setup_method()" and "teardown_method()" now.
+
+We have SQLAlchemy's pytestplugin in use which uses pytest fixtures
+to invoke our own xdist style setUp and tearDown methods, which we
+are already using here, so use those for this one test.
+
+Fixes: #1435
+Change-Id: I4c49e81fca6bfa957594714009531fe12691ace5
+---
+ docs/build/unreleased/1435.rst |  5 +++++
+ tests/test_command.py          | 15 +++++++--------
+ tox.ini                        |  2 +-
+ 3 files changed, 13 insertions(+), 9 deletions(-)
+ create mode 100644 docs/build/unreleased/1435.rst
+
+diff --git a/tests/test_command.py b/tests/test_command.py
+index c665f95..04a624a 100644
+--- a/tests/test_command.py
++++ b/tests/test_command.py
+@@ -64,7 +64,7 @@ class HistoryTest(_BufMixin, TestBase):
+     def teardown_class(cls):
+         clear_staging_env()
+ 
+-    def teardown(self):
++    def tearDown(self):
+         self.cfg.set_main_option("revision_environment", "false")
+ 
+     @classmethod
+@@ -206,13 +206,12 @@ finally:
+ 
+ 
+ class RevisionEnvironmentTest(_BufMixin, TestBase):
+-    @classmethod
+-    def setup(cls):
+-        cls.env = staging_env()
+-        cls.cfg = _sqlite_testing_config()
+-        cls._setup_env_file()
++    def setUp(self):
++        self.env = staging_env()
++        self.cfg = _sqlite_testing_config()
++        self._setup_env_file()
+ 
+-    def teardown(self):
++    def tearDown(self):
+         self.cfg.set_main_option("revision_environment", "false")
+         clear_staging_env()
+ 
+@@ -1144,7 +1143,7 @@ class CommandLineTest(TestBase):
+         cls.cfg = _sqlite_testing_config()
+         cls.a, cls.b, cls.c = three_rev_fixture(cls.cfg)
+ 
+-    def teardown(self):
++    def tearDown(self):
+         os.environ.pop("ALEMBIC_CONFIG", None)
+ 
+     @classmethod
+-- 
+2.44.0
+