gentoo auto-resync : 03:10:2024 - 04:43:49

4 files changed, 53 insertions, 33 deletions

diff --git a/dev-python/pyrqlite/Manifest b/dev-python/pyrqlite/Manifest
index 06b4f915a89e..12f163bf57ec 100644
--- a/dev-python/pyrqlite/Manifest
+++ b/dev-python/pyrqlite/Manifest
@@ -1,5 +1,4 @@
-DIST pyrqlite-2.2.2.gh.tar.gz 21302 BLAKE2B 8a16155287f4a4698ca63d4643c9fde0dbf4fc8238b4259f194b66a30846bab9b6420df0cc8049b2ea16d8ffdcd8c99f2b7e49a135af458e2b239b52e3ac4f5b SHA512 6faf6d5b1a264a85247ee5a790bc4e718d0632ee4d4bcd16aed2bce65216f23c0cb44d7c367ae73874bdb618d9c56bbefdaeebb40322f228e0ee50d78e03b91b
+AUX pyrqlite-2.2.3-test-support.patch 1528 BLAKE2B 71754c366e71795655ca9559eae7d46fb2c7fba8561fcf587d7be32fea125877495df9ae515309f60e0c1021516ae5463dfc85d59b1e6c109fafae4ab481648f SHA512 5c6039ee2025861c5c43db010e0a999247a17988cd87790d651aa0de41197cfde851df7559d313eddb94ec3182caddcd136b0dc99e922a31c71fdab9424f1e5c
 DIST pyrqlite-2.2.3.gh.tar.gz 21554 BLAKE2B 1a3c09eaee20a19ab06a4f91a5b12659eafe425f796599ef9abf85f99563a62b40f1f82488611e0bbd1fb18853e2b1e310ecd7f94cb89f5840e34c51a4bd42ef SHA512 063a9072846c31fd34ea5261fe97f1023a95122c39c58292c7ab08ba148e01ab5001adda28c2856f0e29b67be553a8bae011d274edfdd3028aacd22179d309d7
-EBUILD pyrqlite-2.2.2.ebuild 544 BLAKE2B 0b0d6f6cf6a0f0d49334beb3944511924dc364a2fa32d94132ba9cb3c70bde8167f23853806a1f7daeaf262747fd9893d624c517720e40210a383f72244363c9 SHA512 7d8e6f8f02a18847ae5c8028c8de9455c0dac51db02614f2d4c338a496c70c8453d42e0dea64939a4dbf4f320b7f98a72aff5d75014758c61da679bb27fec296
-EBUILD pyrqlite-2.2.3.ebuild 544 BLAKE2B 0b0d6f6cf6a0f0d49334beb3944511924dc364a2fa32d94132ba9cb3c70bde8167f23853806a1f7daeaf262747fd9893d624c517720e40210a383f72244363c9 SHA512 7d8e6f8f02a18847ae5c8028c8de9455c0dac51db02614f2d4c338a496c70c8453d42e0dea64939a4dbf4f320b7f98a72aff5d75014758c61da679bb27fec296
+EBUILD pyrqlite-2.2.3.ebuild 602 BLAKE2B 969c3e81d474c3e9ef903c4b876ef598d05a5a85ae3dbdf3c75942f290cd7d13cdbb7cc68f74bb1b2412944b66e4e16617086cb98edb5b9680efbb6ef94cc2f9 SHA512 916fc24ea5f1d0fb5d34175daaf5df99f2e9eb7d82db02c16488beded9890f525e83737ce23f7ed8786709a2f9daafdbc55792f2bb6a3565818f97aa3b1281e6
 MISC metadata.xml 357 BLAKE2B 449eff24c8febb1ff5a30b6ceab4786f1b85aded9e3dfb10dd89c116e7b740ca30377a0404dee72988d884298c7e378291a2eccc40bdc1b56a65031dcaea1887 SHA512 2168a2d8f948b9d8e29561931469cb4b4a708d2068c5c1767bdae45046b8ad138e0eac8379003f50a933e488c2bb624a9f2e0e10702e096b1ff486cbfba994e1
diff --git a/dev-python/pyrqlite/files/pyrqlite-2.2.3-test-support.patch b/dev-python/pyrqlite/files/pyrqlite-2.2.3-test-support.patch
new file mode 100644
index 000000000000..06559446ef12
--- /dev/null
+++ b/dev-python/pyrqlite/files/pyrqlite-2.2.3-test-support.patch
@@ -0,0 +1,50 @@
+From cb5ba83c0ba95eae0026afdc8ae0312b8e51f647 Mon Sep 17 00:00:00 2001
+From: Zac Medico <zmedico@gmail.com>
+Date: Wed, 2 Oct 2024 16:48:38 -0700
+Subject: [PATCH] Eliminate non-public test.support usage
+
+This fixes the "No module named test" issue reported here:
+
+https://bugs.gentoo.org/940579
+---
+ src/test/test_dbapi.py | 17 ++++++-----------
+ 1 file changed, 6 insertions(+), 11 deletions(-)
+
+diff --git a/src/test/test_dbapi.py b/src/test/test_dbapi.py
+index df32f2f..cb756d2 100644
+--- a/src/test/test_dbapi.py
++++ b/src/test/test_dbapi.py
+@@ -24,13 +24,6 @@
+ from __future__ import print_function
+ 
+ import sys
+-try:
+-    import test.support.warnings_helper as test_support
+-except ImportError:
+-    try:
+-        import test.support as test_support
+-    except ImportError:
+-        from test import test_support
+ import unittest
+ 
+ import pyrqlite.dbapi2 as sqlite
+@@ -571,10 +564,12 @@ class ConstructorTests(unittest.TestCase):
+         ts = sqlite.TimestampFromTicks(42)
+ 
+     def test_CheckBinary(self):
+-        with (test_support.check_warnings() if sys.version_info[0] >= 3
+-            else test_support.check_py3k_warnings()):
+-            b = sqlite.Binary(chr(0).encode() + b"'"
+-                if sys.version_info[0] >= 3 else chr(0) + b"'")
++        self.assertEqual(
++            b"\0'",
++            sqlite.Binary(
++                chr(0).encode() + b"'" if sys.version_info[0] >= 3 else chr(0) + b"'"
++            ),
++        )
+ 
+ class ExtensionTests(unittest.TestCase):
+     @classmethod
+-- 
+2.45.2
+
diff --git a/dev-python/pyrqlite/pyrqlite-2.2.2.ebuild b/dev-python/pyrqlite/pyrqlite-2.2.2.ebuild
deleted file mode 100644
index ec12bed1b7aa..000000000000
--- a/dev-python/pyrqlite/pyrqlite-2.2.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-inherit distutils-r1
-
-DESCRIPTION="Python client for rqlite"
-HOMEPAGE="
-	https://github.com/rqlite/pyrqlite/
-	https://pypi.org/project/pyrqlite/
-"
-SRC_URI="
-	https://github.com/rqlite/pyrqlite/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="
-	test? (
-		>=dev-db/rqlite-6.7.0
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pyrqlite/pyrqlite-2.2.3.ebuild b/dev-python/pyrqlite/pyrqlite-2.2.3.ebuild
index ec12bed1b7aa..133e7efb299b 100644
--- a/dev-python/pyrqlite/pyrqlite-2.2.3.ebuild
+++ b/dev-python/pyrqlite/pyrqlite-2.2.3.ebuild
@@ -26,5 +26,6 @@ BDEPEND="
 		>=dev-db/rqlite-6.7.0
 	)
 "
+PATCHES=("${FILESDIR}/pyrqlite-2.2.3-test-support.patch")
 
 distutils_enable_tests pytest