1 |
commit: 7e7b61d2bd05a27f9334cba6eb58c07c6c09883f |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jan 30 18:21:46 2017 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jan 30 18:56:10 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e7b61d2 |
7 |
|
8 |
dev-python/pytest: Removed old. |
9 |
|
10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
11 |
|
12 |
dev-python/pytest/Manifest | 3 - |
13 |
.../files/pytest-2.8.3-skip-test-on-pypy.patch | 96 ---- |
14 |
.../files/pytest-2.8.7-skip-test-on-pypy.patch | 550 --------------------- |
15 |
dev-python/pytest/pytest-2.8.2.ebuild | 82 --- |
16 |
dev-python/pytest/pytest-2.8.7.ebuild | 76 --- |
17 |
dev-python/pytest/pytest-3.0.4.ebuild | 71 --- |
18 |
6 files changed, 878 deletions(-) |
19 |
|
20 |
diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest |
21 |
index c48b9aa..96b8078 100644 |
22 |
--- a/dev-python/pytest/Manifest |
23 |
+++ b/dev-python/pytest/Manifest |
24 |
@@ -1,8 +1,5 @@ |
25 |
DIST pytest-2.7.2.tar.gz 532836 SHA256 b30457f735420d0000d10a44bbd478cf03f8bf20e25bd77248f9bab40f4fd6a4 SHA512 5474a4fe58437a4971fb21b1b37dad3c08e18e5d154931ff23e597f881100a3515bf0cf71d06b143465594ad2a91a96f84f4836d84c39691143c8d88ca7a4360 WHIRLPOOL 6ab7371f952109ac476774222883e1381fe5ee6a54d967f2d90765f6c59c90634a16c42e8e2e1661169db6a9cb1327242ff2281cf1caeabd86a4dacd24f4bb06 |
26 |
-DIST pytest-2.8.2.tar.gz 563955 SHA256 da2fc57320dd11f621d166634c52b989aa2291af1296c32a27a11777aa4128b9 SHA512 0df6e0421d1575e1efc0bb0550c5993f802777cb616ab1514bf12ed11eb5ec35a142dd837ff65659989268c36e441e18108369991cd3d458d357aac6ba433991 WHIRLPOOL ea917f4aaec444d6edc830b4ec66f7adb305031f11328e47d12a609ec92368a5c56e9cf8e24bd1a9a4a6a0746b43133f0d9821cf27d74c15ed2a83a705ee6030 |
27 |
-DIST pytest-2.8.7.tar.gz 564943 SHA256 fc4c86be54fce08e4b85b646a736efa18c6cde7599c1d2919f4f74629e018baf SHA512 c7f626ceb599811caeab4646389a2c489dd22d766c772d6ca686098cef9a11dca47ef41a4a4b811110f358bca1f1a678b549b2adfea48317ae70cf166289b371 WHIRLPOOL c3849f1a9f62c05c1ce20593f32ee513aee87853914be4099503cd47b068732df99605a0a4db9a3a7add4ef2a85f4d5376acf1a2e3f48f5d438433f200cb6196 |
28 |
DIST pytest-3.0.2.tar.gz 727551 SHA256 64d8937626dd2a4bc15ef0edd307d26636a72a3f3f9664c424d78e40efb1e339 SHA512 38485c73f9df3c76b7b920b6957ffe4fbfd32ca0c46b73a53375a40586a482d270bf71b4457b68d48815d50ad173824b269ece255692ae0d1b13f0b1885ce54f WHIRLPOOL b6954a95e5f7d9b904c7543a09c2ef237c76c3a35bcd3e24c402a02aec3b35a19cdb952ac38af4ce43ae516cb5ac52023a0d91f2c587343265edd6d493145e8a |
29 |
DIST pytest-3.0.3.tar.gz 731934 SHA256 f213500a356800a483e8a146ff971ae14a8df3f2c0ae4145181aad96996abee7 SHA512 ec0b4a5f0d6673a339c5a70b402c004c23db7001005454329eeaea15d890f53b8f2740f6c6254499d0f915b9058bfdfa535d9f22847bb382a060d65204fce4af WHIRLPOOL 1883909fa23832e674cf912b1d88957dd435143dc124df5454c08ad02c8077473168f749ea94539c2c4b5cf08648a0bce7e90937bbdacd4bb69a4ccf15ecff23 |
30 |
-DIST pytest-3.0.4.tar.gz 733339 SHA256 879fee2c1fdbaacd1bf2c0047677c6dd4aee05b9c1e64330b34d130a584fa40d SHA512 f8ee3eb84b564419beb0bb78abbe0ffe44920b35c60021d2c77b2bc3a5ec13245768f848ccb2a1864d46fc343cdc4b2bc4a33d9459bf388f64ea2aea0d9c337d WHIRLPOOL e48fc51e1de0fe38eaebd21ea4249dd915ffbf190d1955bd9aa77976b9c692bd0a2541d8802e9e100603af647279740e6329491b0ce09ef898d102e78984b2bb |
31 |
DIST pytest-3.0.5.tar.gz 740656 SHA256 4a003aa956f023ce91aa6e166b555e6f02a4b0aeb459ac61e14f64c0d39037fd SHA512 b01c6272703ec93b7e7eefa584688a3d00cd97ac9cf54bc9501b596d4c370f9f74e06ee2223829b60469ea1a32c3a3c30b29aeacfaab1f23404d5f8345544ca1 WHIRLPOOL 9b044222fc628dd138e9eaaf27a930b6389e74dff09ec25c07392c4d965c30890a79f5fb663db6de4f612dbabd6338049d2ed45679928835f8c7a278530d6c05 |
32 |
DIST pytest-3.0.6.tar.gz 748748 SHA256 643434a9f1a188271da35e20064cb8b6c5440976c5bb541dc7b5b0e3cf75d940 SHA512 0e983f1f52c18327537d20be30425f4c74037d1fbf6b4aedf2646cf21d450fa9b2b20625f26f5db759b4fe1fd28c6640cb1df88e667efaeea6642e7f02f01e06 WHIRLPOOL 708e5041135883ba31d9712880672f64bf05c0bf40a544061cb42fed4d2aec111bfdf82b63f10e8a87c2b76870e3ea364b396258f0674d2199e43fe93cf2922e |
33 |
|
34 |
diff --git a/dev-python/pytest/files/pytest-2.8.3-skip-test-on-pypy.patch b/dev-python/pytest/files/pytest-2.8.3-skip-test-on-pypy.patch |
35 |
deleted file mode 100644 |
36 |
index 81a7573..00000000 |
37 |
--- a/dev-python/pytest/files/pytest-2.8.3-skip-test-on-pypy.patch |
38 |
+++ /dev/null |
39 |
@@ -1,96 +0,0 @@ |
40 |
- testing/acceptance_test.py | 2 ++ |
41 |
- testing/python/collect.py | 1 + |
42 |
- testing/python/fixture.py | 1 + |
43 |
- testing/python/metafunc.py | 1 + |
44 |
- testing/test_capture.py | 3 ++- |
45 |
- testing/test_collection.py | 1 + |
46 |
- testing/test_junitxml.py | 1 + |
47 |
- 7 files changed, 9 insertions(+), 1 deletion(-) |
48 |
- |
49 |
-diff --git a/testing/acceptance_test.py b/testing/acceptance_test.py |
50 |
-index b9a3fa3..9db5017 100644 |
51 |
---- a/testing/acceptance_test.py |
52 |
-+++ b/testing/acceptance_test.py |
53 |
-@@ -209,6 +209,8 @@ class TestGeneralUsage: |
54 |
- result = testdir.runpython(p) |
55 |
- assert not result.ret |
56 |
- |
57 |
-+ # https://github.com/pytest-dev/pytest/issues/1162 |
58 |
-+ @pytest.mark.skipif('"__pypy__" in sys.modules') |
59 |
- def test_issue109_sibling_conftests_not_loaded(self, testdir): |
60 |
- sub1 = testdir.tmpdir.mkdir("sub1") |
61 |
- sub2 = testdir.tmpdir.mkdir("sub2") |
62 |
-diff --git a/testing/python/collect.py b/testing/python/collect.py |
63 |
-index 636f959..da9a291 100644 |
64 |
---- a/testing/python/collect.py |
65 |
-+++ b/testing/python/collect.py |
66 |
-@@ -659,6 +659,7 @@ class TestConftestCustomization: |
67 |
- l = modcol.collect() |
68 |
- assert '_hello' not in l |
69 |
- |
70 |
-+@×××××××××××.skipif('"__pypy__" in sys.modules') |
71 |
- def test_setup_only_available_in_subdir(testdir): |
72 |
- sub1 = testdir.mkpydir("sub1") |
73 |
- sub2 = testdir.mkpydir("sub2") |
74 |
-diff --git a/testing/python/fixture.py b/testing/python/fixture.py |
75 |
-index 2031764..f52cf85 100644 |
76 |
---- a/testing/python/fixture.py |
77 |
-+++ b/testing/python/fixture.py |
78 |
-@@ -83,6 +83,7 @@ class TestFillFixtures: |
79 |
- "*1 passed*" |
80 |
- ]) |
81 |
- |
82 |
-+ @pytest.mark.skipif('"__pypy__" in sys.modules') |
83 |
- def test_conftest_funcargs_only_available_in_subdir(self, testdir): |
84 |
- sub1 = testdir.mkpydir("sub1") |
85 |
- sub2 = testdir.mkpydir("sub2") |
86 |
-diff --git a/testing/python/metafunc.py b/testing/python/metafunc.py |
87 |
-index 111ca61..bc489fa 100644 |
88 |
---- a/testing/python/metafunc.py |
89 |
-+++ b/testing/python/metafunc.py |
90 |
-@@ -835,6 +835,7 @@ class TestMetafuncFunctional: |
91 |
- reprec = testdir.runpytest() |
92 |
- reprec.assert_outcomes(passed=1) |
93 |
- |
94 |
-+ @pytest.mark.skipif('"__pypy__" in sys.modules') |
95 |
- def test_generate_tests_only_done_in_subdir(self, testdir): |
96 |
- sub1 = testdir.mkpydir("sub1") |
97 |
- sub2 = testdir.mkpydir("sub2") |
98 |
-diff --git a/testing/test_capture.py b/testing/test_capture.py |
99 |
-index 5393335..d7448e1 100644 |
100 |
---- a/testing/test_capture.py |
101 |
-+++ b/testing/test_capture.py |
102 |
-@@ -478,7 +478,8 @@ class TestCaptureFixture: |
103 |
- result = testdir.runpytest_subprocess(p) |
104 |
- assert 'closed' not in result.stderr.str() |
105 |
- |
106 |
-- |
107 |
-+# https://github.com/pytest-dev/pytest/issues/1162 |
108 |
-+@×××××××××××.skipif('"__pypy__" in sys.modules') |
109 |
- def test_setup_failure_does_not_kill_capturing(testdir): |
110 |
- sub1 = testdir.mkpydir("sub1") |
111 |
- sub1.join("conftest.py").write(py.code.Source(""" |
112 |
-diff --git a/testing/test_collection.py b/testing/test_collection.py |
113 |
-index 749c5b7..65370a6 100644 |
114 |
---- a/testing/test_collection.py |
115 |
-+++ b/testing/test_collection.py |
116 |
-@@ -287,6 +287,7 @@ class TestCustomConftests: |
117 |
- "*test_x*" |
118 |
- ]) |
119 |
- |
120 |
-+ @pytest.mark.skipif('"__pypy__" in sys.modules') |
121 |
- def test_pytest_collect_file_from_sister_dir(self, testdir): |
122 |
- sub1 = testdir.mkpydir("sub1") |
123 |
- sub2 = testdir.mkpydir("sub2") |
124 |
-diff --git a/testing/test_junitxml.py b/testing/test_junitxml.py |
125 |
-index b25b6c7..3afd6f2 100644 |
126 |
---- a/testing/test_junitxml.py |
127 |
-+++ b/testing/test_junitxml.py |
128 |
-@@ -120,6 +120,7 @@ class TestPython: |
129 |
- classname="test_classname_instance.TestClass", |
130 |
- name="test_method") |
131 |
- |
132 |
-+ @pytest.mark.skipif('"__pypy__" in sys.modules') |
133 |
- def test_classname_nested_dir(self, testdir): |
134 |
- p = testdir.tmpdir.ensure("sub", "test_hello.py") |
135 |
- p.write("def test_func(): 0/0") |
136 |
|
137 |
diff --git a/dev-python/pytest/files/pytest-2.8.7-skip-test-on-pypy.patch b/dev-python/pytest/files/pytest-2.8.7-skip-test-on-pypy.patch |
138 |
deleted file mode 100644 |
139 |
index f82522f..00000000 |
140 |
--- a/dev-python/pytest/files/pytest-2.8.7-skip-test-on-pypy.patch |
141 |
+++ /dev/null |
142 |
@@ -1,550 +0,0 @@ |
143 |
- testing/acceptance_test.py | 5 +++++ |
144 |
- testing/python/collect.py | 3 +++ |
145 |
- testing/python/fixture.py | 14 ++++++++++++++ |
146 |
- testing/python/integration.py | 1 + |
147 |
- testing/python/metafunc.py | 3 +++ |
148 |
- testing/test_assertion.py | 5 +++++ |
149 |
- testing/test_assertrewrite.py | 3 +++ |
150 |
- testing/test_capture.py | 6 ++++++ |
151 |
- testing/test_collection.py | 1 + |
152 |
- testing/test_config.py | 3 +++ |
153 |
- testing/test_conftest.py | 3 +++ |
154 |
- testing/test_helpconfig.py | 1 + |
155 |
- testing/test_junitxml.py | 1 + |
156 |
- testing/test_mark.py | 1 + |
157 |
- testing/test_monkeypatch.py | 1 + |
158 |
- testing/test_skipping.py | 3 +++ |
159 |
- testing/test_terminal.py | 2 ++ |
160 |
- testing/test_unittest.py | 3 +++ |
161 |
- 18 files changed, 59 insertions(+) |
162 |
- |
163 |
-diff --git a/testing/acceptance_test.py b/testing/acceptance_test.py |
164 |
-index b9a3fa3..7875d94 100644 |
165 |
---- a/testing/acceptance_test.py |
166 |
-+++ b/testing/acceptance_test.py |
167 |
-@@ -127,6 +127,7 @@ class TestGeneralUsage: |
168 |
- "*ERROR: not found:*%s" %(p2.basename,) |
169 |
- ]) |
170 |
- |
171 |
-+ @pytest.mark.skipif('"__pypy__" in sys.modules') |
172 |
- def test_issue486_better_reporting_on_conftest_load_failure(self, testdir): |
173 |
- testdir.makepyfile("") |
174 |
- testdir.makeconftest("import qwerty") |
175 |
-@@ -209,6 +210,8 @@ class TestGeneralUsage: |
176 |
- result = testdir.runpython(p) |
177 |
- assert not result.ret |
178 |
- |
179 |
-+ # https://github.com/pytest-dev/pytest/issues/1162 |
180 |
-+ @pytest.mark.skipif('"__pypy__" in sys.modules') |
181 |
- def test_issue109_sibling_conftests_not_loaded(self, testdir): |
182 |
- sub1 = testdir.tmpdir.mkdir("sub1") |
183 |
- sub2 = testdir.tmpdir.mkdir("sub2") |
184 |
-@@ -350,6 +353,7 @@ class TestGeneralUsage: |
185 |
- res = testdir.runpytest(p.basename) |
186 |
- assert res.ret == 0 |
187 |
- |
188 |
-+ @pytest.mark.skipif('"__pypy__" in sys.modules') |
189 |
- def test_unknown_option(self, testdir): |
190 |
- result = testdir.runpytest("--qwlkej") |
191 |
- result.stderr.fnmatch_lines(""" |
192 |
-@@ -657,6 +661,7 @@ class TestDurations: |
193 |
- ]) |
194 |
- |
195 |
- |
196 |
-+@×××××××××××.skipif('"__pypy__" in sys.modules') |
197 |
- class TestDurationWithFixture: |
198 |
- source = """ |
199 |
- import time |
200 |
-diff --git a/testing/python/collect.py b/testing/python/collect.py |
201 |
-index bebc133..1cf0a80 100644 |
202 |
---- a/testing/python/collect.py |
203 |
-+++ b/testing/python/collect.py |
204 |
-@@ -27,6 +27,7 @@ class TestModule: |
205 |
- "*HINT*", |
206 |
- ]) |
207 |
- |
208 |
-+ @pytest.mark.skipif('"__pypy__" in sys.modules') |
209 |
- def test_import_prepend_append(self, testdir, monkeypatch): |
210 |
- syspath = list(sys.path) |
211 |
- monkeypatch.setattr(sys, "path", syspath) |
212 |
-@@ -57,6 +58,7 @@ class TestModule: |
213 |
- pytest.raises(ImportError, lambda: modcol.obj) |
214 |
- |
215 |
- class TestClass: |
216 |
-+ @pytest.mark.skipif('"__pypy__" in sys.modules') |
217 |
- def test_class_with_init_warning(self, testdir): |
218 |
- testdir.makepyfile(""" |
219 |
- class TestClass1: |
220 |
-@@ -659,6 +661,7 @@ class TestConftestCustomization: |
221 |
- l = modcol.collect() |
222 |
- assert '_hello' not in l |
223 |
- |
224 |
-+@×××××××××××.skipif('"__pypy__" in sys.modules') |
225 |
- def test_setup_only_available_in_subdir(testdir): |
226 |
- sub1 = testdir.mkpydir("sub1") |
227 |
- sub2 = testdir.mkpydir("sub2") |
228 |
-diff --git a/testing/python/fixture.py b/testing/python/fixture.py |
229 |
-index 2031764..22e620a 100644 |
230 |
---- a/testing/python/fixture.py |
231 |
-+++ b/testing/python/fixture.py |
232 |
-@@ -83,6 +83,7 @@ class TestFillFixtures: |
233 |
- "*1 passed*" |
234 |
- ]) |
235 |
- |
236 |
-+ @pytest.mark.skipif('"__pypy__" in sys.modules') |
237 |
- def test_conftest_funcargs_only_available_in_subdir(self, testdir): |
238 |
- sub1 = testdir.mkpydir("sub1") |
239 |
- sub2 = testdir.mkpydir("sub2") |
240 |
-@@ -606,6 +607,7 @@ class TestRequestBasic: |
241 |
- reprec = testdir.inline_run("-v") |
242 |
- reprec.assertoutcome(passed=3) |
243 |
- |
244 |
-+ @pytest.mark.skipif('"__pypy__" in sys.modules') |
245 |
- def test_fixtures_sub_subdir_normalize_sep(self, testdir): |
246 |
- # this tests that normalization of nodeids takes place |
247 |
- b = testdir.mkdir("tests").mkdir("unit") |
248 |
-@@ -953,6 +955,7 @@ class TestFixtureUsages: |
249 |
- "*2 passed*" |
250 |
- ]) |
251 |
- |
252 |
-+ @pytest.mark.skipif('"__pypy__" in sys.modules') |
253 |
- def test_factory_uses_unknown_funcarg_as_dependency_error(self, testdir): |
254 |
- testdir.makepyfile(""" |
255 |
- import pytest |
256 |
-@@ -1049,6 +1052,7 @@ class TestFixtureUsages: |
257 |
- reprec = testdir.inline_run() |
258 |
- reprec.assertoutcome(passed=2) |
259 |
- |
260 |
-+ @pytest.mark.skipif('"__pypy__" in sys.modules') |
261 |
- def test_usefixtures_seen_in_showmarkers(self, testdir): |
262 |
- result = testdir.runpytest("--markers") |
263 |
- result.stdout.fnmatch_lines(""" |
264 |
-@@ -1157,6 +1161,7 @@ class TestFixtureManagerParseFactories: |
265 |
- reprec = testdir.inline_run("-s") |
266 |
- reprec.assertoutcome(passed=1) |
267 |
- |
268 |
-+ @pytest.mark.skipif('"__pypy__" in sys.modules') |
269 |
- def test_parsefactories_relative_node_ids(self, testdir): |
270 |
- # example mostly taken from: |
271 |
- # https://mail.python.org/pipermail/pytest-dev/2014-September/002617.html |
272 |
-@@ -1305,6 +1310,7 @@ class TestAutouseDiscovery: |
273 |
- reprec = testdir.inline_run("-s") |
274 |
- reprec.assertoutcome(failed=0, passed=0) |
275 |
- |
276 |
-+ @pytest.mark.skipif('"__pypy__" in sys.modules') |
277 |
- def test_autouse_in_conftests(self, testdir): |
278 |
- a = testdir.mkdir("a") |
279 |
- b = testdir.mkdir("a1") |
280 |
-@@ -1890,6 +1896,7 @@ class TestFixtureMarker: |
281 |
- l = reprec.getcalls("pytest_runtest_call")[0].item.module.l |
282 |
- assert l == [1,1,2,2] |
283 |
- |
284 |
-+ @pytest.mark.skipif('"__pypy__" in sys.modules') |
285 |
- def test_module_parametrized_ordering(self, testdir): |
286 |
- testdir.makeconftest(""" |
287 |
- import pytest |
288 |
-@@ -1936,6 +1943,7 @@ class TestFixtureMarker: |
289 |
- test_mod1.py::test_func1[m2] PASSED |
290 |
- """) |
291 |
- |
292 |
-+ @pytest.mark.skipif('"__pypy__" in sys.modules') |
293 |
- def test_class_ordering(self, testdir): |
294 |
- testdir.makeconftest(""" |
295 |
- import pytest |
296 |
-@@ -1984,6 +1992,7 @@ class TestFixtureMarker: |
297 |
- test_class_ordering.py::TestClass::test_3[2-b] PASSED |
298 |
- """) |
299 |
- |
300 |
-+ @pytest.mark.skipif('"__pypy__" in sys.modules') |
301 |
- def test_parametrize_separated_order_higher_scope_first(self, testdir): |
302 |
- testdir.makepyfile(""" |
303 |
- import pytest |
304 |
-@@ -2028,6 +2037,7 @@ class TestFixtureMarker: |
305 |
- pprint.pprint(list(zip(l, expected))) |
306 |
- assert l == expected |
307 |
- |
308 |
-+ @pytest.mark.skipif('"__pypy__" in sys.modules') |
309 |
- def test_parametrized_fixture_teardown_order(self, testdir): |
310 |
- testdir.makepyfile(""" |
311 |
- import pytest |
312 |
-@@ -2065,6 +2075,7 @@ class TestFixtureMarker: |
313 |
- """) |
314 |
- assert "error" not in result.stdout.str() |
315 |
- |
316 |
-+ @pytest.mark.skipif('"__pypy__" in sys.modules') |
317 |
- def test_fixture_finalizer(self, testdir): |
318 |
- testdir.makeconftest(""" |
319 |
- import pytest |
320 |
-@@ -2385,6 +2396,7 @@ class TestErrors: |
321 |
- "*1 error*", |
322 |
- ]) |
323 |
- |
324 |
-+ @pytest.mark.skipif('"__pypy__" in sys.modules') |
325 |
- def test_issue498_fixture_finalizer_failing(self, testdir): |
326 |
- testdir.makepyfile(""" |
327 |
- import pytest |
328 |
-@@ -2431,6 +2443,7 @@ class TestErrors: |
329 |
- "*1 error*", |
330 |
- ]) |
331 |
- |
332 |
-+@×××××××××××.skipif('"__pypy__" in sys.modules') |
333 |
- class TestShowFixtures: |
334 |
- def test_funcarg_compat(self, testdir): |
335 |
- config = testdir.parseconfigure("--funcargs") |
336 |
-@@ -2561,6 +2574,7 @@ class TestShowFixtures: |
337 |
- """) |
338 |
- |
339 |
- |
340 |
-+@×××××××××××.skipif('"__pypy__" in sys.modules') |
341 |
- class TestContextManagerFixtureFuncs: |
342 |
- def test_simple(self, testdir): |
343 |
- testdir.makepyfile(""" |
344 |
-diff --git a/testing/python/integration.py b/testing/python/integration.py |
345 |
-index 0c436e3..1d0b4ee 100644 |
346 |
---- a/testing/python/integration.py |
347 |
-+++ b/testing/python/integration.py |
348 |
-@@ -202,6 +202,7 @@ class TestMockDecoration: |
349 |
- |
350 |
- |
351 |
- class TestReRunTests: |
352 |
-+ @pytest.mark.skipif('"__pypy__" in sys.modules') |
353 |
- def test_rerun(self, testdir): |
354 |
- testdir.makeconftest(""" |
355 |
- from _pytest.runner import runtestprotocol |
356 |
-diff --git a/testing/python/metafunc.py b/testing/python/metafunc.py |
357 |
-index 111ca61..cd2e86d 100644 |
358 |
---- a/testing/python/metafunc.py |
359 |
-+++ b/testing/python/metafunc.py |
360 |
-@@ -475,6 +475,7 @@ class TestMetafunc: |
361 |
- reprec = testdir.inline_run() |
362 |
- reprec.assertoutcome(passed=2) |
363 |
- |
364 |
-+ @pytest.mark.skipif('"__pypy__" in sys.modules') |
365 |
- def test_parametrize_class_scenarios(self, testdir): |
366 |
- testdir.makepyfile(""" |
367 |
- # same as doc/en/example/parametrize scenario example |
368 |
-@@ -766,6 +767,7 @@ class TestMetafuncFunctional: |
369 |
- "*test_function*advanced*FAILED", |
370 |
- ]) |
371 |
- |
372 |
-+ @pytest.mark.skipif('"__pypy__" in sys.modules') |
373 |
- def test_parametrize_without_ids(self, testdir): |
374 |
- testdir.makepyfile(""" |
375 |
- import pytest |
376 |
-@@ -835,6 +837,7 @@ class TestMetafuncFunctional: |
377 |
- reprec = testdir.runpytest() |
378 |
- reprec.assert_outcomes(passed=1) |
379 |
- |
380 |
-+ @pytest.mark.skipif('"__pypy__" in sys.modules') |
381 |
- def test_generate_tests_only_done_in_subdir(self, testdir): |
382 |
- sub1 = testdir.mkpydir("sub1") |
383 |
- sub2 = testdir.mkpydir("sub2") |
384 |
-diff --git a/testing/test_assertion.py b/testing/test_assertion.py |
385 |
-index 914fedd..fb0d0e2 100644 |
386 |
---- a/testing/test_assertion.py |
387 |
-+++ b/testing/test_assertion.py |
388 |
-@@ -120,6 +120,7 @@ class TestAssert_reprcompare: |
389 |
- """) |
390 |
- ] |
391 |
- ) |
392 |
-+ @pytest.mark.skipif('"__pypy__" in sys.modules') |
393 |
- def test_iterable_full_diff(self, left, right, expected): |
394 |
- """Test the full diff assertion failure explanation. |
395 |
- |
396 |
-@@ -348,6 +349,7 @@ class TestFormatExplanation: |
397 |
- assert util.format_explanation(expl) == res |
398 |
- |
399 |
- |
400 |
-+@×××××××××××.skipif('"__pypy__" in sys.modules') |
401 |
- def test_python25_compile_issue257(testdir): |
402 |
- testdir.makepyfile(""" |
403 |
- def test_rewritten(): |
404 |
-@@ -559,6 +561,7 @@ def test_warn_missing(testdir): |
405 |
- "*WARNING*assert statements are not executed*", |
406 |
- ]) |
407 |
- |
408 |
-+@×××××××××××.skipif('"__pypy__" in sys.modules') |
409 |
- def test_recursion_source_decode(testdir): |
410 |
- testdir.makepyfile(""" |
411 |
- def test_something(): |
412 |
-@@ -573,6 +576,7 @@ def test_recursion_source_decode(testdir): |
413 |
- <Module*> |
414 |
- """) |
415 |
- |
416 |
-+@×××××××××××.skipif('"__pypy__" in sys.modules') |
417 |
- def test_AssertionError_message(testdir): |
418 |
- testdir.makepyfile(""" |
419 |
- def test_hello(): |
420 |
-@@ -587,6 +591,7 @@ def test_AssertionError_message(testdir): |
421 |
- """) |
422 |
- |
423 |
- @pytest.mark.skipif(PY3, reason='This bug does not exist on PY3') |
424 |
-+@×××××××××××.skipif('"__pypy__" in sys.modules') |
425 |
- def test_set_with_unsortable_elements(): |
426 |
- # issue #718 |
427 |
- class UnsortableKey(object): |
428 |
-diff --git a/testing/test_assertrewrite.py b/testing/test_assertrewrite.py |
429 |
-index 544250a..9dad082 100644 |
430 |
---- a/testing/test_assertrewrite.py |
431 |
-+++ b/testing/test_assertrewrite.py |
432 |
-@@ -307,6 +307,7 @@ class TestAssertionRewrite: |
433 |
- assert g(**{x : 2}) |
434 |
- assert getmsg(f, ns) == """assert g(**{'a': 2})""" |
435 |
- |
436 |
-+ @pytest.mark.skipif('"__pypy__" in sys.modules') |
437 |
- def test_attribute(self): |
438 |
- class X(object): |
439 |
- g = 3 |
440 |
-@@ -343,6 +344,7 @@ class TestAssertionRewrite: |
441 |
- assert b < c |
442 |
- getmsg(f, must_pass=True) |
443 |
- |
444 |
-+ @pytest.mark.skipif('"__pypy__" in sys.modules') |
445 |
- def test_len(self): |
446 |
- def f(): |
447 |
- l = list(range(10)) |
448 |
-@@ -641,6 +643,7 @@ class TestAssertionRewriteHookDetails(object): |
449 |
- |
450 |
- assert _read_pyc(source, str(pyc)) is None # no error |
451 |
- |
452 |
-+ @pytest.mark.skipif('"__pypy__" in sys.modules') |
453 |
- def test_reload_is_same(self, testdir): |
454 |
- # A file that will be picked up during collecting. |
455 |
- testdir.tmpdir.join("file.py").ensure() |
456 |
-diff --git a/testing/test_capture.py b/testing/test_capture.py |
457 |
-index 5393335..0d2c238 100644 |
458 |
---- a/testing/test_capture.py |
459 |
-+++ b/testing/test_capture.py |
460 |
-@@ -479,6 +479,8 @@ class TestCaptureFixture: |
461 |
- assert 'closed' not in result.stderr.str() |
462 |
- |
463 |
- |
464 |
-+# https://github.com/pytest-dev/pytest/issues/1162 |
465 |
-+@×××××××××××.skipif('"__pypy__" in sys.modules') |
466 |
- def test_setup_failure_does_not_kill_capturing(testdir): |
467 |
- sub1 = testdir.mkpydir("sub1") |
468 |
- sub1.join("conftest.py").write(py.code.Source(""" |
469 |
-@@ -518,6 +520,7 @@ def test_capture_conftest_runtest_setup(testdir): |
470 |
- assert 'hello19' not in result.stdout.str() |
471 |
- |
472 |
- |
473 |
-+@×××××××××××.skipif('"__pypy__" in sys.modules') |
474 |
- def test_capture_badoutput_issue412(testdir): |
475 |
- testdir.makepyfile(""" |
476 |
- import os |
477 |
-@@ -897,6 +900,7 @@ class TestStdCaptureFD(TestStdCapture): |
478 |
- pytestmark = needsosdup |
479 |
- captureclass = staticmethod(StdCaptureFD) |
480 |
- |
481 |
-+ @pytest.mark.skipif('"__pypy__" in sys.modules') |
482 |
- def test_simple_only_fd(self, testdir): |
483 |
- testdir.makepyfile(""" |
484 |
- import os |
485 |
-@@ -981,6 +985,7 @@ def test_fdcapture_tmpfile_remains_the_same(tmpfile, use): |
486 |
- assert capfile2 == capfile |
487 |
- |
488 |
- @needsosdup |
489 |
-+@×××××××××××.skipif('"__pypy__" in sys.modules') |
490 |
- def test_close_and_capture_again(testdir): |
491 |
- testdir.makepyfile(""" |
492 |
- import os |
493 |
-@@ -1001,6 +1006,7 @@ def test_close_and_capture_again(testdir): |
494 |
- |
495 |
- |
496 |
- @pytest.mark.parametrize('method', ['SysCapture', 'FDCapture']) |
497 |
-+@×××××××××××.skipif('"__pypy__" in sys.modules') |
498 |
- def test_capturing_and_logging_fundamentals(testdir, method): |
499 |
- if method == "StdCaptureFD" and not hasattr(os, 'dup'): |
500 |
- pytest.skip("need os.dup") |
501 |
-diff --git a/testing/test_collection.py b/testing/test_collection.py |
502 |
-index 749c5b7..65370a6 100644 |
503 |
---- a/testing/test_collection.py |
504 |
-+++ b/testing/test_collection.py |
505 |
-@@ -287,6 +287,7 @@ class TestCustomConftests: |
506 |
- "*test_x*" |
507 |
- ]) |
508 |
- |
509 |
-+ @pytest.mark.skipif('"__pypy__" in sys.modules') |
510 |
- def test_pytest_collect_file_from_sister_dir(self, testdir): |
511 |
- sub1 = testdir.mkpydir("sub1") |
512 |
- sub2 = testdir.mkpydir("sub2") |
513 |
-diff --git a/testing/test_config.py b/testing/test_config.py |
514 |
-index d497200..2987072 100644 |
515 |
---- a/testing/test_config.py |
516 |
-+++ b/testing/test_config.py |
517 |
-@@ -47,6 +47,7 @@ class TestParseIni: |
518 |
- ]) |
519 |
- |
520 |
- @pytest.mark.parametrize("name", "setup.cfg tox.ini pytest.ini".split()) |
521 |
-+ @pytest.mark.skipif('"__pypy__" in sys.modules') |
522 |
- def test_ini_names(self, testdir, name): |
523 |
- testdir.tmpdir.join(name).write(py.std.textwrap.dedent(""" |
524 |
- [pytest] |
525 |
-@@ -55,6 +56,7 @@ class TestParseIni: |
526 |
- config = testdir.parseconfig() |
527 |
- assert config.getini("minversion") == "1.0" |
528 |
- |
529 |
-+ @pytest.mark.skipif('"__pypy__" in sys.modules') |
530 |
- def test_toxini_before_lower_pytestini(self, testdir): |
531 |
- sub = testdir.tmpdir.mkdir("sub") |
532 |
- sub.join("tox.ini").write(py.std.textwrap.dedent(""" |
533 |
-@@ -418,6 +420,7 @@ class TestWarning: |
534 |
- reprec = testdir.inline_run() |
535 |
- reprec.assertoutcome(passed=1) |
536 |
- |
537 |
-+ @pytest.mark.skipif('"__pypy__" in sys.modules') |
538 |
- def test_warn_on_test_item_from_request(self, testdir): |
539 |
- testdir.makepyfile(""" |
540 |
- import pytest |
541 |
-diff --git a/testing/test_conftest.py b/testing/test_conftest.py |
542 |
-index a0b77cf..3d07597 100644 |
543 |
---- a/testing/test_conftest.py |
544 |
-+++ b/testing/test_conftest.py |
545 |
-@@ -204,6 +204,7 @@ def test_conftest_import_order(testdir, monkeypatch): |
546 |
- assert conftest._getconftestmodules(sub) == [ct1, ct2] |
547 |
- |
548 |
- |
549 |
-+@×××××××××××.skipif('"__pypy__" in sys.modules') |
550 |
- def test_fixture_dependency(testdir, monkeypatch): |
551 |
- ct1 = testdir.makeconftest("") |
552 |
- ct1 = testdir.makepyfile("__init__.py") |
553 |
-@@ -241,6 +242,7 @@ def test_fixture_dependency(testdir, monkeypatch): |
554 |
- result.stdout.fnmatch_lines(["*1 passed*"]) |
555 |
- |
556 |
- |
557 |
-+@×××××××××××.skipif('"__pypy__" in sys.modules') |
558 |
- def test_conftest_found_with_double_dash(testdir): |
559 |
- sub = testdir.mkdir("sub") |
560 |
- sub.join("conftest.py").write(py.std.textwrap.dedent(""" |
561 |
-@@ -259,6 +261,7 @@ def test_conftest_found_with_double_dash(testdir): |
562 |
- """) |
563 |
- |
564 |
- |
565 |
-+@×××××××××××.skipif('"__pypy__" in sys.modules') |
566 |
- class TestConftestVisibility: |
567 |
- def _setup_tree(self, testdir): # for issue616 |
568 |
- # example mostly taken from: |
569 |
-diff --git a/testing/test_helpconfig.py b/testing/test_helpconfig.py |
570 |
-index 9f8d87b..2ecd20d 100644 |
571 |
---- a/testing/test_helpconfig.py |
572 |
-+++ b/testing/test_helpconfig.py |
573 |
-@@ -14,6 +14,7 @@ def test_version(testdir, pytestconfig): |
574 |
- "*at*", |
575 |
- ]) |
576 |
- |
577 |
-+@×××××××××××.skipif('"__pypy__" in sys.modules') |
578 |
- def test_help(testdir): |
579 |
- result = testdir.runpytest("--help") |
580 |
- assert result.ret == 0 |
581 |
-diff --git a/testing/test_junitxml.py b/testing/test_junitxml.py |
582 |
-index e6db810..1180ea7 100644 |
583 |
---- a/testing/test_junitxml.py |
584 |
-+++ b/testing/test_junitxml.py |
585 |
-@@ -175,6 +175,7 @@ class TestPython: |
586 |
- classname="test_classname_instance.TestClass", |
587 |
- name="test_method") |
588 |
- |
589 |
-+ @pytest.mark.skipif('"__pypy__" in sys.modules') |
590 |
- def test_classname_nested_dir(self, testdir): |
591 |
- p = testdir.tmpdir.ensure("sub", "test_hello.py") |
592 |
- p.write("def test_func(): 0/0") |
593 |
-diff --git a/testing/test_mark.py b/testing/test_mark.py |
594 |
-index 1aa3361..242a65d 100644 |
595 |
---- a/testing/test_mark.py |
596 |
-+++ b/testing/test_mark.py |
597 |
-@@ -133,6 +133,7 @@ def test_markers_option(testdir): |
598 |
- "*a1some*another marker", |
599 |
- ]) |
600 |
- |
601 |
-+@×××××××××××.skipif('"__pypy__" in sys.modules') |
602 |
- def test_markers_option_with_plugin_in_current_dir(testdir): |
603 |
- testdir.makeconftest('pytest_plugins = "flip_flop"') |
604 |
- testdir.makepyfile(flip_flop="""\ |
605 |
-diff --git a/testing/test_monkeypatch.py b/testing/test_monkeypatch.py |
606 |
-index 048c942..0c87b4e 100644 |
607 |
---- a/testing/test_monkeypatch.py |
608 |
-+++ b/testing/test_monkeypatch.py |
609 |
-@@ -256,6 +256,7 @@ def test_chdir_double_undo(mp, tmpdir): |
610 |
- assert os.getcwd() == tmpdir.strpath |
611 |
- |
612 |
- |
613 |
-+@×××××××××××.skipif('"__pypy__" in sys.modules') |
614 |
- def test_issue185_time_breaks(testdir): |
615 |
- testdir.makepyfile(""" |
616 |
- import time |
617 |
-diff --git a/testing/test_skipping.py b/testing/test_skipping.py |
618 |
-index 1048c94..ea5cf44 100644 |
619 |
---- a/testing/test_skipping.py |
620 |
-+++ b/testing/test_skipping.py |
621 |
-@@ -263,6 +263,7 @@ class TestXFail: |
622 |
- result = testdir.runpytest(p, "--runxfail") |
623 |
- result.stdout.fnmatch_lines("*1 pass*") |
624 |
- |
625 |
-+ @pytest.mark.skipif('"__pypy__" in sys.modules') |
626 |
- def test_xfail_imperative_in_setup_function(self, testdir): |
627 |
- p = testdir.makepyfile(""" |
628 |
- import pytest |
629 |
-@@ -671,6 +672,7 @@ def test_xfail_test_setup_exception(testdir): |
630 |
- assert 'xfailed' in result.stdout.str() |
631 |
- assert 'xpassed' not in result.stdout.str() |
632 |
- |
633 |
-+@×××××××××××.skipif('"__pypy__" in sys.modules') |
634 |
- def test_imperativeskip_on_xfail_test(testdir): |
635 |
- testdir.makepyfile(""" |
636 |
- import pytest |
637 |
-@@ -694,6 +696,7 @@ def test_imperativeskip_on_xfail_test(testdir): |
638 |
- *2 skipped* |
639 |
- """) |
640 |
- |
641 |
-+@×××××××××××.skipif('"__pypy__" in sys.modules') |
642 |
- class TestBooleanCondition: |
643 |
- def test_skipif(self, testdir): |
644 |
- testdir.makepyfile(""" |
645 |
-diff --git a/testing/test_terminal.py b/testing/test_terminal.py |
646 |
-index 305d60a..d503be8 100644 |
647 |
---- a/testing/test_terminal.py |
648 |
-+++ b/testing/test_terminal.py |
649 |
-@@ -264,6 +264,7 @@ class TestCollectonly: |
650 |
- "* <Function 'test_method'*>", |
651 |
- ]) |
652 |
- |
653 |
-+ @pytest.mark.skipif('"__pypy__" in sys.modules') |
654 |
- def test_collectonly_error(self, testdir): |
655 |
- p = testdir.makepyfile("import Errlkjqweqwe") |
656 |
- result = testdir.runpytest("--collect-only", p) |
657 |
-@@ -726,6 +727,7 @@ def test_tbstyle_native_setup_error(testdir): |
658 |
- '*File *test_tbstyle_native_setup_error.py", line *, in setup_error_fixture*' |
659 |
- ]) |
660 |
- |
661 |
-+@×××××××××××.skipif('"__pypy__" in sys.modules') |
662 |
- def test_terminal_summary(testdir): |
663 |
- testdir.makeconftest(""" |
664 |
- def pytest_terminal_summary(terminalreporter): |
665 |
-diff --git a/testing/test_unittest.py b/testing/test_unittest.py |
666 |
-index 53dde6e..52eeae0 100644 |
667 |
---- a/testing/test_unittest.py |
668 |
-+++ b/testing/test_unittest.py |
669 |
-@@ -14,6 +14,7 @@ def test_simple_unittest(testdir): |
670 |
- assert reprec.matchreport("testpassing").passed |
671 |
- assert reprec.matchreport("test_failing").failed |
672 |
- |
673 |
-+@×××××××××××.skipif('"__pypy__" in sys.modules') |
674 |
- def test_runTest_method(testdir): |
675 |
- testdir.makepyfile(""" |
676 |
- import unittest |
677 |
-@@ -705,6 +706,7 @@ def test_issue333_result_clearing(testdir): |
678 |
- reprec.assertoutcome(failed=1) |
679 |
- |
680 |
- @pytest.mark.skipif("sys.version_info < (2,7)") |
681 |
-+@×××××××××××.skipif('"__pypy__" in sys.modules') |
682 |
- def test_unittest_raise_skip_issue748(testdir): |
683 |
- testdir.makepyfile(test_foo=""" |
684 |
- import unittest |
685 |
-@@ -720,6 +722,7 @@ def test_unittest_raise_skip_issue748(testdir): |
686 |
- """) |
687 |
- |
688 |
- @pytest.mark.skipif("sys.version_info < (2,7)") |
689 |
-+@×××××××××××.skipif('"__pypy__" in sys.modules') |
690 |
- def test_unittest_skip_issue1169(testdir): |
691 |
- testdir.makepyfile(test_foo=""" |
692 |
- import unittest |
693 |
|
694 |
diff --git a/dev-python/pytest/pytest-2.8.2.ebuild b/dev-python/pytest/pytest-2.8.2.ebuild |
695 |
deleted file mode 100644 |
696 |
index 5ffa077..00000000 |
697 |
--- a/dev-python/pytest/pytest-2.8.2.ebuild |
698 |
+++ /dev/null |
699 |
@@ -1,82 +0,0 @@ |
700 |
-# Copyright 1999-2017 Gentoo Foundation |
701 |
-# Distributed under the terms of the GNU General Public License v2 |
702 |
-# $Id$ |
703 |
- |
704 |
-EAPI=5 |
705 |
- |
706 |
-PYTHON_COMPAT=( python2_7 python3_{4,5} pypy pypy3 ) |
707 |
- |
708 |
-inherit distutils-r1 |
709 |
- |
710 |
-DESCRIPTION="simple powerful testing with Python" |
711 |
-HOMEPAGE="http://pytest.org/ https://pypi.python.org/pypi/pytest" |
712 |
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
713 |
- |
714 |
-LICENSE="MIT" |
715 |
-SLOT="0" |
716 |
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" |
717 |
-IUSE="doc test" |
718 |
- |
719 |
-# When bumping, please check setup.py for the proper py version |
720 |
-PY_VER="1.4.29" |
721 |
-RDEPEND=">=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]" |
722 |
- |
723 |
-# dev-python/pluggy |
724 |
-# https://github.com/hpk42/pluggy |
725 |
-# See https://github.com/pytest-dev/pytest/issues/944 |
726 |
-# for why not now |
727 |
- |
728 |
-#pexpect dep based on https://bitbucket.org/hpk42/pytest/issue/386/tests-fail-with-pexpect-30 |
729 |
-DEPEND="${RDEPEND} |
730 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
731 |
- test? ( dev-python/pexpect[${PYTHON_USEDEP}] ) |
732 |
- doc? ( |
733 |
- >=dev-python/sphinx-1.2.3[${PYTHON_USEDEP}] |
734 |
- dev-python/pyyaml[${PYTHON_USEDEP}] |
735 |
- dev-python/regendoc[${PYTHON_USEDEP}] |
736 |
- )" |
737 |
- |
738 |
-PATCHES=( "${FILESDIR}"/${PN}-2.8.3-skip-test-on-pypy.patch ) |
739 |
- |
740 |
-python_prepare_all() { |
741 |
- chmod o-w *egg*/* || die |
742 |
- # Disable versioning of py.test script to avoid collision with |
743 |
- # versioning performed by the eclass. |
744 |
- sed -e "s/return points/return {'py.test': target}/" -i setup.py || die "sed failed" |
745 |
- grep -qF "py>=${PY_VER}" setup.py || die "Incorrect dev-python/py dependency" |
746 |
- |
747 |
- # Prevent un-needed d'loading |
748 |
- sed -e "s/'sphinx.ext.intersphinx', //" -i doc/en/conf.py || die |
749 |
- |
750 |
- # https://github.com/pytest-dev/pytest/issues/1162 |
751 |
- # https://github.com/pytest-dev/pytest/issues/1163 |
752 |
- sed \ |
753 |
- -e 's:test_logging_initialized_in_test:_&:g' \ |
754 |
- -i testing/test_capture.py || die |
755 |
- |
756 |
- distutils-r1_python_prepare_all |
757 |
-} |
758 |
- |
759 |
-python_compile_all() { |
760 |
- if use doc; then |
761 |
- mkdir doc/en/.build || die |
762 |
- emake -C doc/en html |
763 |
- fi |
764 |
-} |
765 |
- |
766 |
-python_test() { |
767 |
- # test_nose.py not written to suit py3.2 in pypy3 |
768 |
- if [[ "${EPYTHON}" == pypy3 ]]; then |
769 |
- "${PYTHON}" "${BUILD_DIR}"/lib/pytest.py -x -v \ |
770 |
- --ignore=testing/BUILD_nose.py \ |
771 |
- || die "tests failed with ${EPYTHON}" |
772 |
- else |
773 |
- "${PYTHON}" "${BUILD_DIR}"/lib/pytest.py -x -v --runpytest=subprocess \ |
774 |
- || die "tests failed with ${EPYTHON}" |
775 |
- fi |
776 |
-} |
777 |
- |
778 |
-python_install_all() { |
779 |
- use doc && HTML_DOCS=( doc/en/_build/html/. ) |
780 |
- distutils-r1_python_install_all |
781 |
-} |
782 |
|
783 |
diff --git a/dev-python/pytest/pytest-2.8.7.ebuild b/dev-python/pytest/pytest-2.8.7.ebuild |
784 |
deleted file mode 100644 |
785 |
index 2a86876..00000000 |
786 |
--- a/dev-python/pytest/pytest-2.8.7.ebuild |
787 |
+++ /dev/null |
788 |
@@ -1,76 +0,0 @@ |
789 |
-# Copyright 1999-2017 Gentoo Foundation |
790 |
-# Distributed under the terms of the GNU General Public License v2 |
791 |
-# $Id$ |
792 |
- |
793 |
-EAPI=5 |
794 |
- |
795 |
-PYTHON_COMPAT=( python2_7 python3_{4,5} pypy pypy3 ) |
796 |
- |
797 |
-inherit distutils-r1 |
798 |
- |
799 |
-DESCRIPTION="Simple powerful testing with Python" |
800 |
-HOMEPAGE="http://pytest.org/ https://pypi.python.org/pypi/pytest" |
801 |
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
802 |
- |
803 |
-LICENSE="MIT" |
804 |
-SLOT="0" |
805 |
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" |
806 |
-IUSE="doc test" |
807 |
- |
808 |
-# When bumping, please check setup.py for the proper py version |
809 |
-PY_VER="1.4.29" |
810 |
-RDEPEND=">=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]" |
811 |
- |
812 |
-# dev-python/pluggy |
813 |
-# https://github.com/hpk42/pluggy |
814 |
-# See https://github.com/pytest-dev/pytest/issues/944 |
815 |
-# for why not now |
816 |
- |
817 |
-#pexpect dep based on https://bitbucket.org/hpk42/pytest/issue/386/tests-fail-with-pexpect-30 |
818 |
-DEPEND="${RDEPEND} |
819 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
820 |
- test? ( dev-python/pexpect[${PYTHON_USEDEP}] ) |
821 |
- doc? ( |
822 |
- >=dev-python/sphinx-1.2.3[${PYTHON_USEDEP}] |
823 |
- dev-python/pyyaml[${PYTHON_USEDEP}] |
824 |
- dev-python/regendoc[${PYTHON_USEDEP}] |
825 |
- )" |
826 |
- |
827 |
-PATCHES=( "${FILESDIR}"/${P}-skip-test-on-pypy.patch ) |
828 |
- |
829 |
-python_prepare_all() { |
830 |
- chmod o-w *egg*/* || die |
831 |
- # Disable versioning of py.test script to avoid collision with |
832 |
- # versioning performed by the eclass. |
833 |
- sed -e "s/return points/return {'py.test': target}/" -i setup.py || die "sed failed" |
834 |
- grep -qF "py>=${PY_VER}" setup.py || die "Incorrect dev-python/py dependency" |
835 |
- |
836 |
- # Prevent un-needed d'loading |
837 |
- sed -e "s/'sphinx.ext.intersphinx', //" -i doc/en/conf.py || die |
838 |
- |
839 |
- distutils-r1_python_prepare_all |
840 |
-} |
841 |
- |
842 |
-python_compile_all() { |
843 |
- if use doc; then |
844 |
- mkdir doc/en/.build || die |
845 |
- emake -C doc/en html |
846 |
- fi |
847 |
-} |
848 |
- |
849 |
-python_test() { |
850 |
- # test_nose.py not written to suit py3.2 in pypy3 |
851 |
- if [[ "${EPYTHON}" == pypy3 ]]; then |
852 |
- "${PYTHON}" "${BUILD_DIR}"/lib/pytest.py -x -v \ |
853 |
- --ignore=testing/BUILD_nose.py \ |
854 |
- || die "tests failed with ${EPYTHON}" |
855 |
- else |
856 |
- "${PYTHON}" "${BUILD_DIR}"/lib/pytest.py -x -v --runpytest=subprocess \ |
857 |
- || die "tests failed with ${EPYTHON}" |
858 |
- fi |
859 |
-} |
860 |
- |
861 |
-python_install_all() { |
862 |
- use doc && HTML_DOCS=( doc/en/_build/html/. ) |
863 |
- distutils-r1_python_install_all |
864 |
-} |
865 |
|
866 |
diff --git a/dev-python/pytest/pytest-3.0.4.ebuild b/dev-python/pytest/pytest-3.0.4.ebuild |
867 |
deleted file mode 100644 |
868 |
index 6adecf1..00000000 |
869 |
--- a/dev-python/pytest/pytest-3.0.4.ebuild |
870 |
+++ /dev/null |
871 |
@@ -1,71 +0,0 @@ |
872 |
-# Copyright 1999-2017 Gentoo Foundation |
873 |
-# Distributed under the terms of the GNU General Public License v2 |
874 |
-# $Id$ |
875 |
- |
876 |
-EAPI=6 |
877 |
- |
878 |
-PYTHON_COMPAT=( python2_7 python3_{4,5} pypy ) |
879 |
- |
880 |
-inherit distutils-r1 |
881 |
- |
882 |
-DESCRIPTION="Simple powerful testing with Python" |
883 |
-HOMEPAGE="http://pytest.org/ https://pypi.python.org/pypi/pytest" |
884 |
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
885 |
- |
886 |
-LICENSE="MIT" |
887 |
-SLOT="0" |
888 |
-KEYWORDS="~amd64 ~hppa ~x86" |
889 |
-IUSE="doc test" |
890 |
- |
891 |
-# When bumping, please check setup.py for the proper py version |
892 |
-PY_VER="1.4.29" |
893 |
-COMMON_DEPEND=" |
894 |
- >=dev-python/py-${PY_VER}[${PYTHON_USEDEP}] |
895 |
- doc? ( |
896 |
- dev-python/pyyaml[${PYTHON_USEDEP}] |
897 |
- dev-python/sphinx[${PYTHON_USEDEP}] |
898 |
- ) |
899 |
-" |
900 |
-DEPEND="${COMMON_DEPEND} |
901 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
902 |
- test? ( |
903 |
- >=dev-python/hypothesis-3.5.2[${PYTHON_USEDEP}] |
904 |
- >dev-python/pytest-xdist-1.13[${PYTHON_USEDEP}] |
905 |
- dev-python/nose[${PYTHON_USEDEP}] |
906 |
- dev-python/mock[${PYTHON_USEDEP}] |
907 |
- dev-python/requests[${PYTHON_USEDEP}] |
908 |
- ) |
909 |
-" |
910 |
-RDEPEND="${COMMON_DEPEND} |
911 |
- !dev-python/logilab-common |
912 |
-" |
913 |
- |
914 |
-python_prepare_all() { |
915 |
- chmod o-w *egg*/* || die |
916 |
- # Disable versioning of py.test script to avoid collision with |
917 |
- # versioning performed by the eclass. |
918 |
- sed -e "s/return points/return {'py.test': target}/" -i setup.py || die "sed failed" |
919 |
- grep -qF "py>=${PY_VER}" setup.py || die "Incorrect dev-python/py dependency" |
920 |
- |
921 |
- distutils-r1_python_prepare_all |
922 |
-} |
923 |
- |
924 |
-python_test() { |
925 |
- # test_nose.py not written to suit py3.2 in pypy3 |
926 |
- if [[ "${EPYTHON}" == pypy3 ]]; then |
927 |
- "${PYTHON}" "${BUILD_DIR}"/lib/pytest.py -x -v \ |
928 |
- --ignore=testing/BUILD_nose.py \ |
929 |
- || die "tests failed with ${EPYTHON}" |
930 |
- else |
931 |
- "${PYTHON}" "${BUILD_DIR}"/lib/pytest.py -v testing || die "tests failed with ${EPYTHON}" |
932 |
- fi |
933 |
-} |
934 |
- |
935 |
-python_compile_all(){ |
936 |
- use doc && emake -C doc/en html |
937 |
-} |
938 |
- |
939 |
-python_install_all() { |
940 |
- use doc && HTML_DOCS=( doc/en/_build/html/. ) |
941 |
- distutils-r1_python_install_all |
942 |
-} |