gentoo resync : 04.01.2022

3 files changed, 5 insertions, 105 deletions

diff --git a/dev-python/pyudev/Manifest b/dev-python/pyudev/Manifest
index 27df83cf62f5..c5dfb7b94025 100644
--- a/dev-python/pyudev/Manifest
+++ b/dev-python/pyudev/Manifest
@@ -1,5 +1,4 @@
-AUX pyudev-0.22-fix-hypothesis.patch 4582 BLAKE2B 8fc2f27890b68baa5e5771ab2d992ac41c9a7e51e63c11d5d317ba9a9dbc90f018e29d1d4ff292596cc3103e1a09a9140c5c76c2647cd0a4fe87eae747d5fcb4 SHA512 b1c6e08e95ed8f31d106820b888aadde7844a7e2c64277245108f9af74ea9be8606d70ebbfd18287993cb0c84b76972941499f0efbda7079b22e889b0bb8eda0
 DIST pyudev-0.22.0.tar.gz 85077 BLAKE2B 66c78aa4d3bea5ceae3660a93e5bd1733629bb5228d67d8e647abb8c237a2786c1061b07e034be5467f5bcab58d95ba30f91d74bdc54cd8253dff69be3ad4a80 SHA512 a09ed479a54a1772a6af68cb975fef792068c2de3655e20223905bc3f574fd32bd3dbe6b97062eee3ab5f08a8b041ad3ea86dfb68c839ea44e29d65ec1686670
-EBUILD pyudev-0.22.0-r1.ebuild 1260 BLAKE2B 6574500f71c0ce4db398759d9ece14d21b97d900cb4a240d5f3a6fb2a5ec07368f4e4507955e35e9d3098afdfb0a3d7870e73465b6663bb8ccfc6fdf372421ec SHA512 92eab46e1f11612bc46d749bb016b9b9d180412ff7e990d2614c9a6adef8610124a1782c8960535e90eee72eb0da7e65f82ed967a7aa85d4453e7d2c6262f6a9
+EBUILD pyudev-0.22.0-r1.ebuild 1327 BLAKE2B 1e1d8ad556f7c8348d037e8055fafc3d7799d11e978133ade6df952856fd05ce4db13c3147a40bcc3b84ef4eb61a19bc258b295ab4a311f80cd342af60303d41 SHA512 8557b7e5865518df3b150e996b74810c9af976740b2beb4b65254783d8fed4a9d8f0ea175dd48c31cc5871a3c33cdd48a416693cc8802db443ae24b83ab3d18d
 EBUILD pyudev-0.22.0.ebuild 1270 BLAKE2B 75c78e4b24b4f85af76edd0684a31d074a32f389569f7b8e66c56171d8661db2216bf4d3d9725cd9c05c2399d1b3697808b8940bea1f230f128ed034d51fd50b SHA512 01ec90457800da048f09f4edca75ca4b88075af8d5e4ea3cd2f1bb6c2425991091f957cb0a0cc1f26072d0dce9980f9ea7e447574fb9e4bdef4e5e35accf15bf
 MISC metadata.xml 594 BLAKE2B 5b620e46403b2c1a572c3a208669c2c64c166812031f139d1f6ffc15fc4aa094b2d3f02848e2893d6870942c89bc94434419921b6188903a2e7d80b2af8b8280 SHA512 575efd0013afd252bc9617995db85987ccd11712932c8b2b542db683864606eb5cd52c9b37fa2430b05182c16ba712dac1434fffc1fc405c4ef6dad41c4eb9f2
diff --git a/dev-python/pyudev/files/pyudev-0.22-fix-hypothesis.patch b/dev-python/pyudev/files/pyudev-0.22-fix-hypothesis.patch
deleted file mode 100644
index 5a6b27324d82..000000000000
--- a/dev-python/pyudev/files/pyudev-0.22-fix-hypothesis.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-diff --git a/tests/_device_tests/_attributes_tests.py b/tests/_device_tests/_attributes_tests.py
-index 23fa6da..7baf043 100644
---- a/tests/_device_tests/_attributes_tests.py
-+++ b/tests/_device_tests/_attributes_tests.py
-@@ -50,7 +50,7 @@ class TestAttributes(object):
-     """
- 
-     @given(_CONTEXT_STRATEGY, strategies.sampled_from(_DEVICE_DATA))
--    @settings(max_examples=5)
-+    @settings(max_examples=5, deadline=30000)
-     def test_getitem(self, a_context, device_datum):
-         """
-         Test that attribute value exists and is instance of bytes.
-@@ -60,7 +60,7 @@ def test_getitem(self, a_context, device_datum):
-            for key in device_datum.attributes.keys())
- 
-     @given(strategies.sampled_from(_DEVICES))
--    @settings(max_examples=5)
-+    @settings(max_examples=5, deadline=30000)
-     def test_getitem_nonexisting(self, a_device):
-         """
-         Test behavior when corresponding value is non-existant.
-@@ -87,7 +87,7 @@ def test_non_iterable(self, a_device):
-             a_device.attributes['key']
- 
-     @given(_CONTEXT_STRATEGY, strategies.sampled_from(_DEVICE_DATA))
--    @settings(max_examples=5)
-+    @settings(max_examples=5, deadline=30000)
-     def test_asstring(self, a_context, device_datum):
-         """
-         Test that attribute exists for actual device and is unicode.
-@@ -97,7 +97,7 @@ def test_asstring(self, a_context, device_datum):
-            for key in device_datum.attributes.keys())
- 
-     @given(_CONTEXT_STRATEGY, strategies.sampled_from(_DEVICE_DATA))
--    @settings(max_examples=10)
-+    @settings(max_examples=10, deadline=30000)
-     def test_asint(self, a_context, device_datum):
-         """
-         Test that integer result is an int or ValueError raised.
-@@ -111,7 +111,7 @@ def test_asint(self, a_context, device_datum):
-                     device.attributes.asint(key)
- 
-     @given(_CONTEXT_STRATEGY, strategies.sampled_from(_DEVICE_DATA))
--    @settings(max_examples=5)
-+    @settings(max_examples=5, deadline=30000)
-     def test_asbool(self, a_context, device_datum):
-         """
-         Test that bool result is a bool or ValueError raised.
-diff --git a/tests/_device_tests/_device_tests.py b/tests/_device_tests/_device_tests.py
-index b9a84c6..2ce6751 100644
---- a/tests/_device_tests/_device_tests.py
-+++ b/tests/_device_tests/_device_tests.py
-@@ -352,7 +352,7 @@ def test_key_subset(self, a_context, device_datum):
-            frozenset(device.properties.keys())
- 
-     @given(_CONTEXT_STRATEGY, strategies.sampled_from(_DEVICE_DATA))
--    @settings(max_examples=1)
-+    @settings(max_examples=1, deadline=30000)
-     def test_getitem(self, a_context, device_datum):
-         device = Devices.from_path(a_context, device_datum.device_path)
-         for prop in device_datum.properties:
-@@ -372,7 +372,7 @@ def test_getitem(self, a_context, device_datum):
-     @pytest.mark.skipif(
-         len(_device_data) == 0, reason='no device with a DEVNAME property')
-     @given(_CONTEXT_STRATEGY, strategies.sampled_from(_device_data))
--    @settings(max_examples=5)
-+    @settings(max_examples=5, deadline=30000)
-     def test_getitem_devname(self, a_context, device_datum):
-         device = Devices.from_path(a_context, device_datum.device_path)
-         data_devname = os.path.join(a_context.device_path,
-@@ -382,7 +382,7 @@ def test_getitem_devname(self, a_context, device_datum):
-         assert device_devname == data_devname
- 
-     @given(strategies.sampled_from(_DEVICES))
--    @settings(max_examples=5)
-+    @settings(max_examples=5, deadline=30000)
-     def test_getitem_nonexisting(self, a_device):
-         with pytest.raises(KeyError) as excinfo:
-             # pylint: disable=pointless-statement
-@@ -390,7 +390,7 @@ def test_getitem_nonexisting(self, a_device):
-         assert str(excinfo.value) == repr('a non-existing property')
- 
-     @given(_CONTEXT_STRATEGY, strategies.sampled_from(_DEVICE_DATA))
--    @settings(max_examples=5)
-+    @settings(max_examples=5, deadline=30000)
-     def test_asint(self, a_context, device_datum):
-         device = Devices.from_path(a_context, device_datum.device_path)
-         for prop, value in device_datum.properties.items():
-@@ -403,7 +403,7 @@ def test_asint(self, a_context, device_datum):
-                 assert device.properties.asint(prop) == value
- 
-     @given(_CONTEXT_STRATEGY, strategies.sampled_from(_DEVICE_DATA))
--    @settings(max_examples=5)
-+    @settings(max_examples=5, deadline=30000)
-     def test_asbool(self, a_context, device_datum):
-         """
-         Test that values of 1 and 0 get properly interpreted as bool
diff --git a/dev-python/pyudev/pyudev-0.22.0-r1.ebuild b/dev-python/pyudev/pyudev-0.22.0-r1.ebuild
index 622a38c9c9c9..b17a7837de83 100644
--- a/dev-python/pyudev/pyudev-0.22.0-r1.ebuild
+++ b/dev-python/pyudev/pyudev-0.22.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -30,10 +30,6 @@ DEPEND="${RDEPEND}
 
 DOCS=( CHANGES.rst README.rst )
 
-PATCHES=(
-	"${FILESDIR}/pyudev-0.22-fix-hypothesis.patch"
-)
-
 distutils_enable_tests pytest
 
 python_prepare_all() {
@@ -47,5 +43,8 @@ python_prepare_all() {
 	sed -i -e "s|== \('/run/udev'\)|in (\1,'/dev/.udev')|g" \
 		tests/test_core.py || die
 
+	# disable use hypothesis timeouts (too short)
+	sed -e '/@settings/s/(/(deadline=None,/' -i tests{,/_device_tests}/*.py || die
+
 	distutils-r1_python_prepare_all
 }