1 |
commit: 607ec0ecc7bcaeda13ad50a37cb22c32d3abf60b |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Mar 28 21:13:57 2020 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Mar 28 21:24:47 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=607ec0ec |
7 |
|
8 |
dev-python/pyudev: Remove redundant versions |
9 |
|
10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
11 |
|
12 |
dev-python/pyudev/Manifest | 1 - |
13 |
...pyudev-0.19.0-skip-non-deterministic-test.patch | 78 ---------------------- |
14 |
dev-python/pyudev/pyudev-0.21.0.ebuild | 55 --------------- |
15 |
3 files changed, 134 deletions(-) |
16 |
|
17 |
diff --git a/dev-python/pyudev/Manifest b/dev-python/pyudev/Manifest |
18 |
index e888f4c61e9..ed167c9a1c1 100644 |
19 |
--- a/dev-python/pyudev/Manifest |
20 |
+++ b/dev-python/pyudev/Manifest |
21 |
@@ -1,2 +1 @@ |
22 |
-DIST pyudev-0.21.0.tar.gz 89469 BLAKE2B 3bf9ac46442c5948d131932c7b62a59ef979755f2d55bcd0165fc1b69b865268051fdeab7605c8a1cb0694ce0f4b88f31a1e6a1893900a7300ddf6439734712e SHA512 ba5b6156768b65b9655d809b14378b01173643781b9c4017271e880cdfed442c44ac49eb26c970e4275b820e01678e3001870591fccf88dc713ec941e2b85d11 |
23 |
DIST pyudev-0.22.0.tar.gz 85077 BLAKE2B 66c78aa4d3bea5ceae3660a93e5bd1733629bb5228d67d8e647abb8c237a2786c1061b07e034be5467f5bcab58d95ba30f91d74bdc54cd8253dff69be3ad4a80 SHA512 a09ed479a54a1772a6af68cb975fef792068c2de3655e20223905bc3f574fd32bd3dbe6b97062eee3ab5f08a8b041ad3ea86dfb68c839ea44e29d65ec1686670 |
24 |
|
25 |
diff --git a/dev-python/pyudev/files/pyudev-0.19.0-skip-non-deterministic-test.patch b/dev-python/pyudev/files/pyudev-0.19.0-skip-non-deterministic-test.patch |
26 |
deleted file mode 100644 |
27 |
index 268d2bdf1b4..00000000000 |
28 |
--- a/dev-python/pyudev/files/pyudev-0.19.0-skip-non-deterministic-test.patch |
29 |
+++ /dev/null |
30 |
@@ -1,78 +0,0 @@ |
31 |
-diff --git a/tests/_device_tests/_attributes_tests.py b/tests/_device_tests/_attributes_tests.py |
32 |
-index 54d8ae6..84e26c3 100644 |
33 |
---- a/tests/_device_tests/_attributes_tests.py |
34 |
-+++ b/tests/_device_tests/_attributes_tests.py |
35 |
-@@ -88,6 +88,7 @@ def test_non_iterable(self, a_device): |
36 |
- with pytest.raises(TypeError): |
37 |
- a_device.attributes['key'] |
38 |
- |
39 |
-+ @pytest.mark.skipif(True, reason='Non-deterministic') |
40 |
- @given(_CONTEXT_STRATEGY, strategies.sampled_from(_DEVICE_DATA)) |
41 |
- @settings(max_examples=5) |
42 |
- def test_asstring(self, a_context, device_datum): |
43 |
-@@ -99,6 +100,7 @@ def test_asstring(self, a_context, device_datum): |
44 |
- assert is_unicode_string(device.attributes.asstring(key)) |
45 |
- assert device.attributes.asstring(key) == value |
46 |
- |
47 |
-+ @pytest.mark.skipif(True, reason='Non-deterministic') |
48 |
- @given(_CONTEXT_STRATEGY, strategies.sampled_from(_DEVICE_DATA)) |
49 |
- @settings(max_examples=5) |
50 |
- def test_asint(self, a_context, device_datum): |
51 |
-@@ -115,6 +117,7 @@ def test_asint(self, a_context, device_datum): |
52 |
- else: |
53 |
- assert device.attributes.asint(key) == value |
54 |
- |
55 |
-+ @pytest.mark.skipif(True, reason='Non-deterministic') |
56 |
- @given(_CONTEXT_STRATEGY, strategies.sampled_from(_DEVICE_DATA)) |
57 |
- @settings(max_examples=5) |
58 |
- def test_asbool(self, a_context, device_datum): |
59 |
-diff --git a/tests/_device_tests/_device_tests.py b/tests/_device_tests/_device_tests.py |
60 |
-index 92a767d..175c611 100644 |
61 |
---- a/tests/_device_tests/_device_tests.py |
62 |
-+++ b/tests/_device_tests/_device_tests.py |
63 |
-@@ -378,6 +378,7 @@ def test_getitem_nonexisting(self, a_device): |
64 |
- a_device['a non-existing property'] |
65 |
- assert str(excinfo.value) == repr('a non-existing property') |
66 |
- |
67 |
-+ @pytest.mark.skipif(True, reason='Non-deterministic') |
68 |
- @given(_CONTEXT_STRATEGY, strategies.sampled_from(_DEVICE_DATA)) |
69 |
- @settings(max_examples=5) |
70 |
- def test_asint(self, a_context, device_datum): |
71 |
-@@ -391,6 +392,7 @@ def test_asint(self, a_context, device_datum): |
72 |
- else: |
73 |
- assert device.asint(property) == value |
74 |
- |
75 |
-+ @pytest.mark.skipif(True, reason='Non-deterministic') |
76 |
- @given(_CONTEXT_STRATEGY, strategies.sampled_from(_DEVICE_DATA)) |
77 |
- @settings(max_examples=5) |
78 |
- def test_asbool(self, a_context, device_datum): |
79 |
-diff --git a/tests/_device_tests/_devices_tests.py b/tests/_device_tests/_devices_tests.py |
80 |
-index 8eb8069..b80e550 100644 |
81 |
---- a/tests/_device_tests/_devices_tests.py |
82 |
-+++ b/tests/_device_tests/_devices_tests.py |
83 |
-@@ -189,8 +189,8 @@ def test_from_device_file(self, a_context, device_datum): |
84 |
- |
85 |
- _device_data = [d for d in _DEVICE_DATA if list(d.device_links)] |
86 |
- @pytest.mark.skipif( |
87 |
-- len(_device_data) == 0, |
88 |
-- reason='no device with a device node' |
89 |
-+ True, |
90 |
-+ reason='non deterministic' |
91 |
- ) |
92 |
- @given(_CONTEXT_STRATEGY, strategies.sampled_from(_device_data)) |
93 |
- @settings(max_examples=5, min_satisfying_examples=1) |
94 |
-diff --git a/tests/test_discover.py b/tests/test_discover.py |
95 |
-index dd336d5..c410a64 100644 |
96 |
---- a/tests/test_discover.py |
97 |
-+++ b/tests/test_discover.py |
98 |
-@@ -155,8 +155,8 @@ def test_name(self, a_device): |
99 |
- |
100 |
- _devices = [d for d in _DEVICES if list(d.device_links)] |
101 |
- @pytest.mark.skipif( |
102 |
-- len(_devices) == 0, |
103 |
-- reason="no device with device links" |
104 |
-+ True, |
105 |
-+ reason='Non-deterministic' |
106 |
- ) |
107 |
- @given(strategies.sampled_from(_devices)) |
108 |
- @settings(max_examples=NUM_TESTS, min_satisfying_examples=1) |
109 |
|
110 |
diff --git a/dev-python/pyudev/pyudev-0.21.0.ebuild b/dev-python/pyudev/pyudev-0.21.0.ebuild |
111 |
deleted file mode 100644 |
112 |
index 684711ee05c..00000000000 |
113 |
--- a/dev-python/pyudev/pyudev-0.21.0.ebuild |
114 |
+++ /dev/null |
115 |
@@ -1,55 +0,0 @@ |
116 |
-# Copyright 1999-2020 Gentoo Authors |
117 |
-# Distributed under the terms of the GNU General Public License v2 |
118 |
- |
119 |
-EAPI=6 |
120 |
-PYTHON_COMPAT=( python{3_6,3_7} ) |
121 |
- |
122 |
-inherit distutils-r1 |
123 |
- |
124 |
-DESCRIPTION="Python binding to libudev" |
125 |
-HOMEPAGE="https://pyudev.readthedocs.io/en/latest/ https://github.com/pyudev/pyudev" |
126 |
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
127 |
- |
128 |
-LICENSE="LGPL-2.1" |
129 |
-SLOT="0" |
130 |
-KEYWORDS="amd64 arm ~arm64 ~mips x86" |
131 |
-IUSE="qt5 test" |
132 |
-RESTRICT="!test? ( test )" |
133 |
- |
134 |
-RDEPEND=" |
135 |
- dev-python/six[${PYTHON_USEDEP}] |
136 |
- virtual/udev |
137 |
- qt5? ( dev-python/PyQt5[${PYTHON_USEDEP}] ) |
138 |
-" |
139 |
-DEPEND="${RDEPEND} |
140 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
141 |
- test? ( |
142 |
- dev-python/docutils[${PYTHON_USEDEP}] |
143 |
- dev-python/hypothesis[${PYTHON_USEDEP}] |
144 |
- dev-python/mock[${PYTHON_USEDEP}] |
145 |
- >=dev-python/pytest-2.8[${PYTHON_USEDEP}] |
146 |
- )" |
147 |
- |
148 |
-DOCS=( CHANGES.rst README.rst ) |
149 |
- |
150 |
-PATCHES=( |
151 |
- "${FILESDIR}/${PN}-0.19.0-skip-non-deterministic-test.patch" |
152 |
-) |
153 |
- |
154 |
-python_prepare_all() { |
155 |
- if use test; then |
156 |
- ewarn "If your PORTAGE_TMPDIR is longer in length then '/var/tmp/'," |
157 |
- ewarn "change it to /var/tmp to ensure tests will pass." |
158 |
- fi |
159 |
- |
160 |
- # tests are known to pass then fail on alternate runs |
161 |
- # tests: fix run_path |
162 |
- sed -i -e "s|== \('/run/udev'\)|in (\1,'/dev/.udev')|g" \ |
163 |
- tests/test_core.py || die |
164 |
- |
165 |
- distutils-r1_python_prepare_all |
166 |
-} |
167 |
- |
168 |
-python_test() { |
169 |
- py.test -v || die "Tests fail with ${EPYTHON}" |
170 |
-} |