gentoo auto-resync : 26:12:2022 - 02:06:21

3 files changed, 78 insertions, 2 deletions

diff --git a/dev-python/python-lzo/Manifest b/dev-python/python-lzo/Manifest
index 438f954d0e4b..119386c60f9d 100644
--- a/dev-python/python-lzo/Manifest
+++ b/dev-python/python-lzo/Manifest
@@ -1,3 +1,4 @@
+AUX python-lzo-1.14-pytest.patch 2080 BLAKE2B 00b9fd5d242fba39a57b53c1c4c2af32c6a6457e787616f019b861d3bfb96582eb61668f3bbf51794d2b9c4f8d7d08f5a637e39a1e39b58d69299c4e66acde00 SHA512 9c6b1f9743dfca25832d225e2e0d46aaacf0a6f591a5d430349c972a80888e4d5bed8752970a7dc46813fddb3887a30cf2dbe8a66aa098e71b003f5c9ea0eff5
 DIST python-lzo-1.14.tar.gz 14050 BLAKE2B e1df6b842562064ca13ddbacb194047ca343694d480a5a65e7d2876ec98a4215b4badb3b2a839f308dea8624c162a0536f363c093bcb2e5b48c68b69fb472729 SHA512 036cf7199afe12cec8b9c7ee92134f58357e1f892870ade3a619541a69c9cc92155892d53bd43330732b848016c2997e096a9a492e52f15d04fa516ca7645b93
-EBUILD python-lzo-1.14-r1.ebuild 721 BLAKE2B 92181057f0ec0e4beb8aa0d6cc59249de0968e6676aa955909c7033e621acc7b3e425dadc9bbaae79ddf5b62b1f5e7ce91fa7a4857c42f570bc3d107190f73cb SHA512 57bd2a69b72c4a1edb5f6b4b904abd3c77aa010a3f424cc109ee3d233fd63d03395033851917e6c15b1d00fec8b598537987679ff51b9c77450d38dffd1027d0
+EBUILD python-lzo-1.14-r1.ebuild 769 BLAKE2B a48a9357257c7eef795c127ffd5bc764b53d18ee8bbb532c801fde84cc7c63a73118a4e36c5d4c5452e597ea579fc22075f35d7e538e312d0c2172c16a293fe2 SHA512 7951ac05fc471718be047896850f7867320f5b91140886d6c4d7b27ad41fdd8a02177954a7f06f0bf7abf38e6b2736607e97a82736b5944d2b061e16ea76b639
 MISC metadata.xml 386 BLAKE2B d9e750b2ca0a3d46a031a5fab249197e73847ee5997a12c71f441eb5e386821818df07dadb272d5a726255a9310afecafa34b5f2196b49095a5ddd768054f5b4 SHA512 d98f79fd1e62456f1603ba412cdfb14e986c6d7831b6c88d9b561da24d36924aa3a979411f1d216cbbaf4740af2db733f61dd13f64ef94fe0e6d8e5e80545630
diff --git a/dev-python/python-lzo/files/python-lzo-1.14-pytest.patch b/dev-python/python-lzo/files/python-lzo-1.14-pytest.patch
new file mode 100644
index 000000000000..2abaab19aab5
--- /dev/null
+++ b/dev-python/python-lzo/files/python-lzo-1.14-pytest.patch
@@ -0,0 +1,71 @@
+https://github.com/jd-boyd/python-lzo/pull/66
+
+diff --git a/setup.py b/setup.py
+index 033692d..e7e383d 100644
+--- a/setup.py
++++ b/setup.py
+@@ -33,7 +33,7 @@ class TestCommand(Command):
+         raise SystemExit(
+             subprocess.call([sys.executable,
+                              '-m',
+-                             'nose']))
++                             'pytest']))
+ 
+ 
+ if sys.platform == "win32":
+@@ -91,7 +91,7 @@ setup_args = get_kw(
+     maintainer_email="jdboyd@jdboyd.net",
+     url="https://github.com/jd-boyd/python-lzo",
+     license="GNU General Public License (GPL)",
+-    tests_require=['nose'],
++    tests_require=['pytest'],
+     cmdclass={
+         'test': TestCommand
+     },
+diff --git a/tests/test.py b/tests/test_lzo.py
+similarity index 88%
+rename from tests/test.py
+rename to tests/test_lzo.py
+index af761d9..b9d5c88 100644
+--- a/tests/test.py
++++ b/tests/test_lzo.py
+@@ -32,6 +32,7 @@
+ 
+ from __future__ import print_function
+ 
++import pytest
+ import sys, string
+ 
+ # update sys.path when running in the build directory
+@@ -94,22 +95,20 @@ def test_version():
+     assert pkg_version == mod_version, \
+         "%r != %r" %(pkg_version, mod_version)
+ 
+-def test_lzo():
+-    yield gen, b"aaaaaaaaaaaaaaaaaaaaaaaa"
+-    yield gen, b"abcabcabcabcabcabcabcabc"
+-    yield gen, b"abcabcabcabcabcabcabcabc", 9
++@pytest.mark.parametrize("src, level", [(b"aaaaaaaaaaaaaaaaaaaaaaaa", 1), (b"abcabcabcabcabcabcabcabc", 1), (b"abcabcabcabcabcabcabcabc", 9)])
++def test_lzo(src, level):
++    gen(src, level)
+ 
+-
+-def test_lzo_raw():
+-    yield gen_raw, b"aaaaaaaaaaaaaaaaaaaaaaaa"
+-    yield gen_raw, b"abcabcabcabcabcabcabcabc"
+-    yield gen_raw, b"abcabcabcabcabcabcabcabc", 9
++@pytest.mark.parametrize("src, level", [(b"aaaaaaaaaaaaaaaaaaaaaaaa", 1), (b"abcabcabcabcabcabcabcabc", 1), (b"abcabcabcabcabcabcabcabc", 9)])
++def test_lzo_raw(src, level):
++    gen_raw(src, level)
+ 
+ 
+ def test_lzo_empty():
+-    yield gen, b""
+-    yield gen_raw, b""
++    gen(b"")
+ 
++def test_lzo_empty_raw():
++    gen_raw(b"")
+ 
+ def test_lzo_big():
+     gen(b" " * 131072)
diff --git a/dev-python/python-lzo/python-lzo-1.14-r1.ebuild b/dev-python/python-lzo/python-lzo-1.14-r1.ebuild
index 6493182b8432..6131a4803068 100644
--- a/dev-python/python-lzo/python-lzo-1.14-r1.ebuild
+++ b/dev-python/python-lzo/python-lzo-1.14-r1.ebuild
@@ -19,9 +19,13 @@ KEYWORDS="amd64 ~riscv x86 ~amd64-linux ~x86-linux"
 RDEPEND="dev-libs/lzo:2"
 DEPEND="${RDEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-pytest.patch
+)
+
 # We can't use pytest at the moment because the package uses "yield tests"
 # https://docs.pytest.org/en/6.2.x/deprecations.html#yield-tests
-distutils_enable_tests nose
+distutils_enable_tests pytest
 
 python_prepare_all() {
 	hprefixify setup.py