[gentoo-commits] repo/gentoo:master commit in: dev-python/pytest/files/, dev-python/pytest/

["Lars Wendler" <polynomial-c@gentoo.org>]

commit:     7e7b61d2bd05a27f9334cba6eb58c07c6c09883f
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 30 18:21:46 2017 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Jan 30 18:56:10 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e7b61d2

dev-python/pytest: Removed old.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 dev-python/pytest/Manifest                         |   3 -
 .../files/pytest-2.8.3-skip-test-on-pypy.patch     |  96 ----
 .../files/pytest-2.8.7-skip-test-on-pypy.patch     | 550 ---------------------
 dev-python/pytest/pytest-2.8.2.ebuild              |  82 ---
 dev-python/pytest/pytest-2.8.7.ebuild              |  76 ---
 dev-python/pytest/pytest-3.0.4.ebuild              |  71 ---
 6 files changed, 878 deletions(-)

diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index c48b9aa..96b8078 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -1,8 +1,5 @@
 DIST pytest-2.7.2.tar.gz 532836 SHA256 b30457f735420d0000d10a44bbd478cf03f8bf20e25bd77248f9bab40f4fd6a4 SHA512 5474a4fe58437a4971fb21b1b37dad3c08e18e5d154931ff23e597f881100a3515bf0cf71d06b143465594ad2a91a96f84f4836d84c39691143c8d88ca7a4360 WHIRLPOOL 6ab7371f952109ac476774222883e1381fe5ee6a54d967f2d90765f6c59c90634a16c42e8e2e1661169db6a9cb1327242ff2281cf1caeabd86a4dacd24f4bb06
-DIST pytest-2.8.2.tar.gz 563955 SHA256 da2fc57320dd11f621d166634c52b989aa2291af1296c32a27a11777aa4128b9 SHA512 0df6e0421d1575e1efc0bb0550c5993f802777cb616ab1514bf12ed11eb5ec35a142dd837ff65659989268c36e441e18108369991cd3d458d357aac6ba433991 WHIRLPOOL ea917f4aaec444d6edc830b4ec66f7adb305031f11328e47d12a609ec92368a5c56e9cf8e24bd1a9a4a6a0746b43133f0d9821cf27d74c15ed2a83a705ee6030
-DIST pytest-2.8.7.tar.gz 564943 SHA256 fc4c86be54fce08e4b85b646a736efa18c6cde7599c1d2919f4f74629e018baf SHA512 c7f626ceb599811caeab4646389a2c489dd22d766c772d6ca686098cef9a11dca47ef41a4a4b811110f358bca1f1a678b549b2adfea48317ae70cf166289b371 WHIRLPOOL c3849f1a9f62c05c1ce20593f32ee513aee87853914be4099503cd47b068732df99605a0a4db9a3a7add4ef2a85f4d5376acf1a2e3f48f5d438433f200cb6196
 DIST pytest-3.0.2.tar.gz 727551 SHA256 64d8937626dd2a4bc15ef0edd307d26636a72a3f3f9664c424d78e40efb1e339 SHA512 38485c73f9df3c76b7b920b6957ffe4fbfd32ca0c46b73a53375a40586a482d270bf71b4457b68d48815d50ad173824b269ece255692ae0d1b13f0b1885ce54f WHIRLPOOL b6954a95e5f7d9b904c7543a09c2ef237c76c3a35bcd3e24c402a02aec3b35a19cdb952ac38af4ce43ae516cb5ac52023a0d91f2c587343265edd6d493145e8a
 DIST pytest-3.0.3.tar.gz 731934 SHA256 f213500a356800a483e8a146ff971ae14a8df3f2c0ae4145181aad96996abee7 SHA512 ec0b4a5f0d6673a339c5a70b402c004c23db7001005454329eeaea15d890f53b8f2740f6c6254499d0f915b9058bfdfa535d9f22847bb382a060d65204fce4af WHIRLPOOL 1883909fa23832e674cf912b1d88957dd435143dc124df5454c08ad02c8077473168f749ea94539c2c4b5cf08648a0bce7e90937bbdacd4bb69a4ccf15ecff23
-DIST pytest-3.0.4.tar.gz 733339 SHA256 879fee2c1fdbaacd1bf2c0047677c6dd4aee05b9c1e64330b34d130a584fa40d SHA512 f8ee3eb84b564419beb0bb78abbe0ffe44920b35c60021d2c77b2bc3a5ec13245768f848ccb2a1864d46fc343cdc4b2bc4a33d9459bf388f64ea2aea0d9c337d WHIRLPOOL e48fc51e1de0fe38eaebd21ea4249dd915ffbf190d1955bd9aa77976b9c692bd0a2541d8802e9e100603af647279740e6329491b0ce09ef898d102e78984b2bb
 DIST pytest-3.0.5.tar.gz 740656 SHA256 4a003aa956f023ce91aa6e166b555e6f02a4b0aeb459ac61e14f64c0d39037fd SHA512 b01c6272703ec93b7e7eefa584688a3d00cd97ac9cf54bc9501b596d4c370f9f74e06ee2223829b60469ea1a32c3a3c30b29aeacfaab1f23404d5f8345544ca1 WHIRLPOOL 9b044222fc628dd138e9eaaf27a930b6389e74dff09ec25c07392c4d965c30890a79f5fb663db6de4f612dbabd6338049d2ed45679928835f8c7a278530d6c05
 DIST pytest-3.0.6.tar.gz 748748 SHA256 643434a9f1a188271da35e20064cb8b6c5440976c5bb541dc7b5b0e3cf75d940 SHA512 0e983f1f52c18327537d20be30425f4c74037d1fbf6b4aedf2646cf21d450fa9b2b20625f26f5db759b4fe1fd28c6640cb1df88e667efaeea6642e7f02f01e06 WHIRLPOOL 708e5041135883ba31d9712880672f64bf05c0bf40a544061cb42fed4d2aec111bfdf82b63f10e8a87c2b76870e3ea364b396258f0674d2199e43fe93cf2922e

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
deleted file mode 100644
index 81a7573..00000000
--- a/dev-python/pytest/files/pytest-2.8.3-skip-test-on-pypy.patch
+++ /dev/null
@@ -1,96 +0,0 @@
- testing/acceptance_test.py | 2 ++
- testing/python/collect.py  | 1 +
- testing/python/fixture.py  | 1 +
- testing/python/metafunc.py | 1 +
- testing/test_capture.py    | 3 ++-
- testing/test_collection.py | 1 +
- testing/test_junitxml.py   | 1 +
- 7 files changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/testing/acceptance_test.py b/testing/acceptance_test.py
-index b9a3fa3..9db5017 100644
---- a/testing/acceptance_test.py
-+++ b/testing/acceptance_test.py
-@@ -209,6 +209,8 @@ class TestGeneralUsage:
-         result = testdir.runpython(p)
-         assert not result.ret
- 
-+    # https://github.com/pytest-dev/pytest/issues/1162
-+    @pytest.mark.skipif('"__pypy__" in sys.modules')
-     def test_issue109_sibling_conftests_not_loaded(self, testdir):
-         sub1 = testdir.tmpdir.mkdir("sub1")
-         sub2 = testdir.tmpdir.mkdir("sub2")
-diff --git a/testing/python/collect.py b/testing/python/collect.py
-index 636f959..da9a291 100644
---- a/testing/python/collect.py
-+++ b/testing/python/collect.py
-@@ -659,6 +659,7 @@ class TestConftestCustomization:
-         l = modcol.collect()
-         assert '_hello' not in l
- 
-+@pytest.mark.skipif('"__pypy__" in sys.modules')
- def test_setup_only_available_in_subdir(testdir):
-     sub1 = testdir.mkpydir("sub1")
-     sub2 = testdir.mkpydir("sub2")
-diff --git a/testing/python/fixture.py b/testing/python/fixture.py
-index 2031764..f52cf85 100644
---- a/testing/python/fixture.py
-+++ b/testing/python/fixture.py
-@@ -83,6 +83,7 @@ class TestFillFixtures:
-             "*1 passed*"
-         ])
- 
-+    @pytest.mark.skipif('"__pypy__" in sys.modules')
-     def test_conftest_funcargs_only_available_in_subdir(self, testdir):
-         sub1 = testdir.mkpydir("sub1")
-         sub2 = testdir.mkpydir("sub2")
-diff --git a/testing/python/metafunc.py b/testing/python/metafunc.py
-index 111ca61..bc489fa 100644
---- a/testing/python/metafunc.py
-+++ b/testing/python/metafunc.py
-@@ -835,6 +835,7 @@ class TestMetafuncFunctional:
-         reprec = testdir.runpytest()
-         reprec.assert_outcomes(passed=1)
- 
-+    @pytest.mark.skipif('"__pypy__" in sys.modules')
-     def test_generate_tests_only_done_in_subdir(self, testdir):
-         sub1 = testdir.mkpydir("sub1")
-         sub2 = testdir.mkpydir("sub2")
-diff --git a/testing/test_capture.py b/testing/test_capture.py
-index 5393335..d7448e1 100644
---- a/testing/test_capture.py
-+++ b/testing/test_capture.py
-@@ -478,7 +478,8 @@ class TestCaptureFixture:
-         result = testdir.runpytest_subprocess(p)
-         assert 'closed' not in result.stderr.str()
- 
--
-+# https://github.com/pytest-dev/pytest/issues/1162
-+@pytest.mark.skipif('"__pypy__" in sys.modules')
- def test_setup_failure_does_not_kill_capturing(testdir):
-     sub1 = testdir.mkpydir("sub1")
-     sub1.join("conftest.py").write(py.code.Source("""
-diff --git a/testing/test_collection.py b/testing/test_collection.py
-index 749c5b7..65370a6 100644
---- a/testing/test_collection.py
-+++ b/testing/test_collection.py
-@@ -287,6 +287,7 @@ class TestCustomConftests:
-             "*test_x*"
-         ])
- 
-+    @pytest.mark.skipif('"__pypy__" in sys.modules')
-     def test_pytest_collect_file_from_sister_dir(self, testdir):
-         sub1 = testdir.mkpydir("sub1")
-         sub2 = testdir.mkpydir("sub2")
-diff --git a/testing/test_junitxml.py b/testing/test_junitxml.py
-index b25b6c7..3afd6f2 100644
---- a/testing/test_junitxml.py
-+++ b/testing/test_junitxml.py
-@@ -120,6 +120,7 @@ class TestPython:
-             classname="test_classname_instance.TestClass",
-             name="test_method")
- 
-+    @pytest.mark.skipif('"__pypy__" in sys.modules')
-     def test_classname_nested_dir(self, testdir):
-         p = testdir.tmpdir.ensure("sub", "test_hello.py")
-         p.write("def test_func(): 0/0")

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
deleted file mode 100644
index f82522f..00000000
--- a/dev-python/pytest/files/pytest-2.8.7-skip-test-on-pypy.patch
+++ /dev/null
@@ -1,550 +0,0 @@
- testing/acceptance_test.py    |  5 +++++
- testing/python/collect.py     |  3 +++
- testing/python/fixture.py     | 14 ++++++++++++++
- testing/python/integration.py |  1 +
- testing/python/metafunc.py    |  3 +++
- testing/test_assertion.py     |  5 +++++
- testing/test_assertrewrite.py |  3 +++
- testing/test_capture.py       |  6 ++++++
- testing/test_collection.py    |  1 +
- testing/test_config.py        |  3 +++
- testing/test_conftest.py      |  3 +++
- testing/test_helpconfig.py    |  1 +
- testing/test_junitxml.py      |  1 +
- testing/test_mark.py          |  1 +
- testing/test_monkeypatch.py   |  1 +
- testing/test_skipping.py      |  3 +++
- testing/test_terminal.py      |  2 ++
- testing/test_unittest.py      |  3 +++
- 18 files changed, 59 insertions(+)
-
-diff --git a/testing/acceptance_test.py b/testing/acceptance_test.py
-index b9a3fa3..7875d94 100644
---- a/testing/acceptance_test.py
-+++ b/testing/acceptance_test.py
-@@ -127,6 +127,7 @@ class TestGeneralUsage:
-             "*ERROR: not found:*%s" %(p2.basename,)
-         ])
- 
-+    @pytest.mark.skipif('"__pypy__" in sys.modules')
-     def test_issue486_better_reporting_on_conftest_load_failure(self, testdir):
-         testdir.makepyfile("")
-         testdir.makeconftest("import qwerty")
-@@ -209,6 +210,8 @@ class TestGeneralUsage:
-         result = testdir.runpython(p)
-         assert not result.ret
- 
-+    # https://github.com/pytest-dev/pytest/issues/1162
-+    @pytest.mark.skipif('"__pypy__" in sys.modules')
-     def test_issue109_sibling_conftests_not_loaded(self, testdir):
-         sub1 = testdir.tmpdir.mkdir("sub1")
-         sub2 = testdir.tmpdir.mkdir("sub2")
-@@ -350,6 +353,7 @@ class TestGeneralUsage:
-         res = testdir.runpytest(p.basename)
-         assert res.ret == 0
- 
-+    @pytest.mark.skipif('"__pypy__" in sys.modules')
-     def test_unknown_option(self, testdir):
-         result = testdir.runpytest("--qwlkej")
-         result.stderr.fnmatch_lines("""
-@@ -657,6 +661,7 @@ class TestDurations:
-         ])
- 
- 
-+@pytest.mark.skipif('"__pypy__" in sys.modules')
- class TestDurationWithFixture:
-     source = """
-         import time
-diff --git a/testing/python/collect.py b/testing/python/collect.py
-index bebc133..1cf0a80 100644
---- a/testing/python/collect.py
-+++ b/testing/python/collect.py
-@@ -27,6 +27,7 @@ class TestModule:
-             "*HINT*",
-         ])
- 
-+    @pytest.mark.skipif('"__pypy__" in sys.modules')
-     def test_import_prepend_append(self, testdir, monkeypatch):
-         syspath = list(sys.path)
-         monkeypatch.setattr(sys, "path", syspath)
-@@ -57,6 +58,7 @@ class TestModule:
-         pytest.raises(ImportError, lambda: modcol.obj)
- 
- class TestClass:
-+    @pytest.mark.skipif('"__pypy__" in sys.modules')
-     def test_class_with_init_warning(self, testdir):
-         testdir.makepyfile("""
-             class TestClass1:
-@@ -659,6 +661,7 @@ class TestConftestCustomization:
-         l = modcol.collect()
-         assert '_hello' not in l
- 
-+@pytest.mark.skipif('"__pypy__" in sys.modules')
- def test_setup_only_available_in_subdir(testdir):
-     sub1 = testdir.mkpydir("sub1")
-     sub2 = testdir.mkpydir("sub2")
-diff --git a/testing/python/fixture.py b/testing/python/fixture.py
-index 2031764..22e620a 100644
---- a/testing/python/fixture.py
-+++ b/testing/python/fixture.py
-@@ -83,6 +83,7 @@ class TestFillFixtures:
-             "*1 passed*"
-         ])
- 
-+    @pytest.mark.skipif('"__pypy__" in sys.modules')
-     def test_conftest_funcargs_only_available_in_subdir(self, testdir):
-         sub1 = testdir.mkpydir("sub1")
-         sub2 = testdir.mkpydir("sub2")
-@@ -606,6 +607,7 @@ class TestRequestBasic:
-         reprec = testdir.inline_run("-v")
-         reprec.assertoutcome(passed=3)
- 
-+    @pytest.mark.skipif('"__pypy__" in sys.modules')
-     def test_fixtures_sub_subdir_normalize_sep(self, testdir):
-         # this tests that normalization of nodeids takes place
-         b = testdir.mkdir("tests").mkdir("unit")
-@@ -953,6 +955,7 @@ class TestFixtureUsages:
-             "*2 passed*"
-         ])
- 
-+    @pytest.mark.skipif('"__pypy__" in sys.modules')
-     def test_factory_uses_unknown_funcarg_as_dependency_error(self, testdir):
-         testdir.makepyfile("""
-             import pytest
-@@ -1049,6 +1052,7 @@ class TestFixtureUsages:
-         reprec = testdir.inline_run()
-         reprec.assertoutcome(passed=2)
- 
-+    @pytest.mark.skipif('"__pypy__" in sys.modules')
-     def test_usefixtures_seen_in_showmarkers(self, testdir):
-         result = testdir.runpytest("--markers")
-         result.stdout.fnmatch_lines("""
-@@ -1157,6 +1161,7 @@ class TestFixtureManagerParseFactories:
-         reprec = testdir.inline_run("-s")
-         reprec.assertoutcome(passed=1)
- 
-+    @pytest.mark.skipif('"__pypy__" in sys.modules')
-     def test_parsefactories_relative_node_ids(self, testdir):
-         # example mostly taken from:
-         # https://mail.python.org/pipermail/pytest-dev/2014-September/002617.html
-@@ -1305,6 +1310,7 @@ class TestAutouseDiscovery:
-         reprec = testdir.inline_run("-s")
-         reprec.assertoutcome(failed=0, passed=0)
- 
-+    @pytest.mark.skipif('"__pypy__" in sys.modules')
-     def test_autouse_in_conftests(self, testdir):
-         a = testdir.mkdir("a")
-         b = testdir.mkdir("a1")
-@@ -1890,6 +1896,7 @@ class TestFixtureMarker:
-         l = reprec.getcalls("pytest_runtest_call")[0].item.module.l
-         assert l == [1,1,2,2]
- 
-+    @pytest.mark.skipif('"__pypy__" in sys.modules')
-     def test_module_parametrized_ordering(self, testdir):
-         testdir.makeconftest("""
-             import pytest
-@@ -1936,6 +1943,7 @@ class TestFixtureMarker:
-             test_mod1.py::test_func1[m2] PASSED
-         """)
- 
-+    @pytest.mark.skipif('"__pypy__" in sys.modules')
-     def test_class_ordering(self, testdir):
-         testdir.makeconftest("""
-             import pytest
-@@ -1984,6 +1992,7 @@ class TestFixtureMarker:
-             test_class_ordering.py::TestClass::test_3[2-b] PASSED
-         """)
- 
-+    @pytest.mark.skipif('"__pypy__" in sys.modules')
-     def test_parametrize_separated_order_higher_scope_first(self, testdir):
-         testdir.makepyfile("""
-             import pytest
-@@ -2028,6 +2037,7 @@ class TestFixtureMarker:
-         pprint.pprint(list(zip(l, expected)))
-         assert l == expected
- 
-+    @pytest.mark.skipif('"__pypy__" in sys.modules')
-     def test_parametrized_fixture_teardown_order(self, testdir):
-         testdir.makepyfile("""
-             import pytest
-@@ -2065,6 +2075,7 @@ class TestFixtureMarker:
-         """)
-         assert "error" not in result.stdout.str()
- 
-+    @pytest.mark.skipif('"__pypy__" in sys.modules')
-     def test_fixture_finalizer(self, testdir):
-         testdir.makeconftest("""
-             import pytest
-@@ -2385,6 +2396,7 @@ class TestErrors:
-             "*1 error*",
-         ])
- 
-+    @pytest.mark.skipif('"__pypy__" in sys.modules')
-     def test_issue498_fixture_finalizer_failing(self, testdir):
-         testdir.makepyfile("""
-             import pytest
-@@ -2431,6 +2443,7 @@ class TestErrors:
-             "*1 error*",
-         ])
- 
-+@pytest.mark.skipif('"__pypy__" in sys.modules')
- class TestShowFixtures:
-     def test_funcarg_compat(self, testdir):
-         config = testdir.parseconfigure("--funcargs")
-@@ -2561,6 +2574,7 @@ class TestShowFixtures:
-         """)
- 
- 
-+@pytest.mark.skipif('"__pypy__" in sys.modules')
- class TestContextManagerFixtureFuncs:
-     def test_simple(self, testdir):
-         testdir.makepyfile("""
-diff --git a/testing/python/integration.py b/testing/python/integration.py
-index 0c436e3..1d0b4ee 100644
---- a/testing/python/integration.py
-+++ b/testing/python/integration.py
-@@ -202,6 +202,7 @@ class TestMockDecoration:
- 
- 
- class TestReRunTests:
-+    @pytest.mark.skipif('"__pypy__" in sys.modules')
-     def test_rerun(self, testdir):
-         testdir.makeconftest("""
-             from _pytest.runner import runtestprotocol
-diff --git a/testing/python/metafunc.py b/testing/python/metafunc.py
-index 111ca61..cd2e86d 100644
---- a/testing/python/metafunc.py
-+++ b/testing/python/metafunc.py
-@@ -475,6 +475,7 @@ class TestMetafunc:
-         reprec = testdir.inline_run()
-         reprec.assertoutcome(passed=2)
- 
-+    @pytest.mark.skipif('"__pypy__" in sys.modules')
-     def test_parametrize_class_scenarios(self, testdir):
-         testdir.makepyfile("""
-         # same as doc/en/example/parametrize scenario example
-@@ -766,6 +767,7 @@ class TestMetafuncFunctional:
-             "*test_function*advanced*FAILED",
-         ])
- 
-+    @pytest.mark.skipif('"__pypy__" in sys.modules')
-     def test_parametrize_without_ids(self, testdir):
-         testdir.makepyfile("""
-             import pytest
-@@ -835,6 +837,7 @@ class TestMetafuncFunctional:
-         reprec = testdir.runpytest()
-         reprec.assert_outcomes(passed=1)
- 
-+    @pytest.mark.skipif('"__pypy__" in sys.modules')
-     def test_generate_tests_only_done_in_subdir(self, testdir):
-         sub1 = testdir.mkpydir("sub1")
-         sub2 = testdir.mkpydir("sub2")
-diff --git a/testing/test_assertion.py b/testing/test_assertion.py
-index 914fedd..fb0d0e2 100644
---- a/testing/test_assertion.py
-+++ b/testing/test_assertion.py
-@@ -120,6 +120,7 @@ class TestAssert_reprcompare:
-             """)
-         ]
-     )
-+    @pytest.mark.skipif('"__pypy__" in sys.modules')
-     def test_iterable_full_diff(self, left, right, expected):
-         """Test the full diff assertion failure explanation.
- 
-@@ -348,6 +349,7 @@ class TestFormatExplanation:
-         assert util.format_explanation(expl) == res
- 
- 
-+@pytest.mark.skipif('"__pypy__" in sys.modules')
- def test_python25_compile_issue257(testdir):
-     testdir.makepyfile("""
-         def test_rewritten():
-@@ -559,6 +561,7 @@ def test_warn_missing(testdir):
-         "*WARNING*assert statements are not executed*",
-     ])
- 
-+@pytest.mark.skipif('"__pypy__" in sys.modules')
- def test_recursion_source_decode(testdir):
-     testdir.makepyfile("""
-         def test_something():
-@@ -573,6 +576,7 @@ def test_recursion_source_decode(testdir):
-         <Module*>
-     """)
- 
-+@pytest.mark.skipif('"__pypy__" in sys.modules')
- def test_AssertionError_message(testdir):
-     testdir.makepyfile("""
-         def test_hello():
-@@ -587,6 +591,7 @@ def test_AssertionError_message(testdir):
-     """)
- 
- @pytest.mark.skipif(PY3, reason='This bug does not exist on PY3')
-+@pytest.mark.skipif('"__pypy__" in sys.modules')
- def test_set_with_unsortable_elements():
-     # issue #718
-     class UnsortableKey(object):
-diff --git a/testing/test_assertrewrite.py b/testing/test_assertrewrite.py
-index 544250a..9dad082 100644
---- a/testing/test_assertrewrite.py
-+++ b/testing/test_assertrewrite.py
-@@ -307,6 +307,7 @@ class TestAssertionRewrite:
-             assert g(**{x : 2})
-         assert getmsg(f, ns) == """assert g(**{'a': 2})"""
- 
-+    @pytest.mark.skipif('"__pypy__" in sys.modules')
-     def test_attribute(self):
-         class X(object):
-             g = 3
-@@ -343,6 +344,7 @@ class TestAssertionRewrite:
-             assert b < c
-         getmsg(f, must_pass=True)
- 
-+    @pytest.mark.skipif('"__pypy__" in sys.modules')
-     def test_len(self):
-         def f():
-             l = list(range(10))
-@@ -641,6 +643,7 @@ class TestAssertionRewriteHookDetails(object):
- 
-         assert _read_pyc(source, str(pyc)) is None  # no error
- 
-+    @pytest.mark.skipif('"__pypy__" in sys.modules')
-     def test_reload_is_same(self, testdir):
-         # A file that will be picked up during collecting.
-         testdir.tmpdir.join("file.py").ensure()
-diff --git a/testing/test_capture.py b/testing/test_capture.py
-index 5393335..0d2c238 100644
---- a/testing/test_capture.py
-+++ b/testing/test_capture.py
-@@ -479,6 +479,8 @@ class TestCaptureFixture:
-         assert 'closed' not in result.stderr.str()
- 
- 
-+# https://github.com/pytest-dev/pytest/issues/1162
-+@pytest.mark.skipif('"__pypy__" in sys.modules')
- def test_setup_failure_does_not_kill_capturing(testdir):
-     sub1 = testdir.mkpydir("sub1")
-     sub1.join("conftest.py").write(py.code.Source("""
-@@ -518,6 +520,7 @@ def test_capture_conftest_runtest_setup(testdir):
-     assert 'hello19' not in result.stdout.str()
- 
- 
-+@pytest.mark.skipif('"__pypy__" in sys.modules')
- def test_capture_badoutput_issue412(testdir):
-     testdir.makepyfile("""
-         import os
-@@ -897,6 +900,7 @@ class TestStdCaptureFD(TestStdCapture):
-     pytestmark = needsosdup
-     captureclass = staticmethod(StdCaptureFD)
- 
-+    @pytest.mark.skipif('"__pypy__" in sys.modules')
-     def test_simple_only_fd(self, testdir):
-         testdir.makepyfile("""
-             import os
-@@ -981,6 +985,7 @@ def test_fdcapture_tmpfile_remains_the_same(tmpfile, use):
-     assert capfile2 == capfile
- 
- @needsosdup
-+@pytest.mark.skipif('"__pypy__" in sys.modules')
- def test_close_and_capture_again(testdir):
-     testdir.makepyfile("""
-         import os
-@@ -1001,6 +1006,7 @@ def test_close_and_capture_again(testdir):
- 
- 
- @pytest.mark.parametrize('method', ['SysCapture', 'FDCapture'])
-+@pytest.mark.skipif('"__pypy__" in sys.modules')
- def test_capturing_and_logging_fundamentals(testdir, method):
-     if method == "StdCaptureFD" and not hasattr(os, 'dup'):
-         pytest.skip("need os.dup")
-diff --git a/testing/test_collection.py b/testing/test_collection.py
-index 749c5b7..65370a6 100644
---- a/testing/test_collection.py
-+++ b/testing/test_collection.py
-@@ -287,6 +287,7 @@ class TestCustomConftests:
-             "*test_x*"
-         ])
- 
-+    @pytest.mark.skipif('"__pypy__" in sys.modules')
-     def test_pytest_collect_file_from_sister_dir(self, testdir):
-         sub1 = testdir.mkpydir("sub1")
-         sub2 = testdir.mkpydir("sub2")
-diff --git a/testing/test_config.py b/testing/test_config.py
-index d497200..2987072 100644
---- a/testing/test_config.py
-+++ b/testing/test_config.py
-@@ -47,6 +47,7 @@ class TestParseIni:
-         ])
- 
-     @pytest.mark.parametrize("name", "setup.cfg tox.ini pytest.ini".split())
-+    @pytest.mark.skipif('"__pypy__" in sys.modules')
-     def test_ini_names(self, testdir, name):
-         testdir.tmpdir.join(name).write(py.std.textwrap.dedent("""
-             [pytest]
-@@ -55,6 +56,7 @@ class TestParseIni:
-         config = testdir.parseconfig()
-         assert config.getini("minversion") == "1.0"
- 
-+    @pytest.mark.skipif('"__pypy__" in sys.modules')
-     def test_toxini_before_lower_pytestini(self, testdir):
-         sub = testdir.tmpdir.mkdir("sub")
-         sub.join("tox.ini").write(py.std.textwrap.dedent("""
-@@ -418,6 +420,7 @@ class TestWarning:
-         reprec = testdir.inline_run()
-         reprec.assertoutcome(passed=1)
- 
-+    @pytest.mark.skipif('"__pypy__" in sys.modules')
-     def test_warn_on_test_item_from_request(self, testdir):
-         testdir.makepyfile("""
-             import pytest
-diff --git a/testing/test_conftest.py b/testing/test_conftest.py
-index a0b77cf..3d07597 100644
---- a/testing/test_conftest.py
-+++ b/testing/test_conftest.py
-@@ -204,6 +204,7 @@ def test_conftest_import_order(testdir, monkeypatch):
-     assert conftest._getconftestmodules(sub) == [ct1, ct2]
- 
- 
-+@pytest.mark.skipif('"__pypy__" in sys.modules')
- def test_fixture_dependency(testdir, monkeypatch):
-     ct1 = testdir.makeconftest("")
-     ct1 = testdir.makepyfile("__init__.py")
-@@ -241,6 +242,7 @@ def test_fixture_dependency(testdir, monkeypatch):
-     result.stdout.fnmatch_lines(["*1 passed*"])
- 
- 
-+@pytest.mark.skipif('"__pypy__" in sys.modules')
- def test_conftest_found_with_double_dash(testdir):
-     sub = testdir.mkdir("sub")
-     sub.join("conftest.py").write(py.std.textwrap.dedent("""
-@@ -259,6 +261,7 @@ def test_conftest_found_with_double_dash(testdir):
-     """)
- 
- 
-+@pytest.mark.skipif('"__pypy__" in sys.modules')
- class TestConftestVisibility:
-     def _setup_tree(self, testdir):  # for issue616
-         # example mostly taken from:
-diff --git a/testing/test_helpconfig.py b/testing/test_helpconfig.py
-index 9f8d87b..2ecd20d 100644
---- a/testing/test_helpconfig.py
-+++ b/testing/test_helpconfig.py
-@@ -14,6 +14,7 @@ def test_version(testdir, pytestconfig):
-             "*at*",
-         ])
- 
-+@pytest.mark.skipif('"__pypy__" in sys.modules')
- def test_help(testdir):
-     result = testdir.runpytest("--help")
-     assert result.ret == 0
-diff --git a/testing/test_junitxml.py b/testing/test_junitxml.py
-index e6db810..1180ea7 100644
---- a/testing/test_junitxml.py
-+++ b/testing/test_junitxml.py
-@@ -175,6 +175,7 @@ class TestPython:
-             classname="test_classname_instance.TestClass",
-             name="test_method")
- 
-+    @pytest.mark.skipif('"__pypy__" in sys.modules')
-     def test_classname_nested_dir(self, testdir):
-         p = testdir.tmpdir.ensure("sub", "test_hello.py")
-         p.write("def test_func(): 0/0")
-diff --git a/testing/test_mark.py b/testing/test_mark.py
-index 1aa3361..242a65d 100644
---- a/testing/test_mark.py
-+++ b/testing/test_mark.py
-@@ -133,6 +133,7 @@ def test_markers_option(testdir):
-         "*a1some*another marker",
-     ])
- 
-+@pytest.mark.skipif('"__pypy__" in sys.modules')
- def test_markers_option_with_plugin_in_current_dir(testdir):
-     testdir.makeconftest('pytest_plugins = "flip_flop"')
-     testdir.makepyfile(flip_flop="""\
-diff --git a/testing/test_monkeypatch.py b/testing/test_monkeypatch.py
-index 048c942..0c87b4e 100644
---- a/testing/test_monkeypatch.py
-+++ b/testing/test_monkeypatch.py
-@@ -256,6 +256,7 @@ def test_chdir_double_undo(mp, tmpdir):
-     assert os.getcwd() == tmpdir.strpath
- 
- 
-+@pytest.mark.skipif('"__pypy__" in sys.modules')
- def test_issue185_time_breaks(testdir):
-     testdir.makepyfile("""
-         import time
-diff --git a/testing/test_skipping.py b/testing/test_skipping.py
-index 1048c94..ea5cf44 100644
---- a/testing/test_skipping.py
-+++ b/testing/test_skipping.py
-@@ -263,6 +263,7 @@ class TestXFail:
-         result = testdir.runpytest(p, "--runxfail")
-         result.stdout.fnmatch_lines("*1 pass*")
- 
-+    @pytest.mark.skipif('"__pypy__" in sys.modules')
-     def test_xfail_imperative_in_setup_function(self, testdir):
-         p = testdir.makepyfile("""
-             import pytest
-@@ -671,6 +672,7 @@ def test_xfail_test_setup_exception(testdir):
-     assert 'xfailed' in result.stdout.str()
-     assert 'xpassed' not in result.stdout.str()
- 
-+@pytest.mark.skipif('"__pypy__" in sys.modules')
- def test_imperativeskip_on_xfail_test(testdir):
-     testdir.makepyfile("""
-         import pytest
-@@ -694,6 +696,7 @@ def test_imperativeskip_on_xfail_test(testdir):
-         *2 skipped*
-     """)
- 
-+@pytest.mark.skipif('"__pypy__" in sys.modules')
- class TestBooleanCondition:
-     def test_skipif(self, testdir):
-         testdir.makepyfile("""
-diff --git a/testing/test_terminal.py b/testing/test_terminal.py
-index 305d60a..d503be8 100644
---- a/testing/test_terminal.py
-+++ b/testing/test_terminal.py
-@@ -264,6 +264,7 @@ class TestCollectonly:
-             "*   <Function 'test_method'*>",
-         ])
- 
-+    @pytest.mark.skipif('"__pypy__" in sys.modules')
-     def test_collectonly_error(self, testdir):
-         p = testdir.makepyfile("import Errlkjqweqwe")
-         result = testdir.runpytest("--collect-only", p)
-@@ -726,6 +727,7 @@ def test_tbstyle_native_setup_error(testdir):
-             '*File *test_tbstyle_native_setup_error.py", line *, in setup_error_fixture*'
-             ])
- 
-+@pytest.mark.skipif('"__pypy__" in sys.modules')
- def test_terminal_summary(testdir):
-     testdir.makeconftest("""
-         def pytest_terminal_summary(terminalreporter):
-diff --git a/testing/test_unittest.py b/testing/test_unittest.py
-index 53dde6e..52eeae0 100644
---- a/testing/test_unittest.py
-+++ b/testing/test_unittest.py
-@@ -14,6 +14,7 @@ def test_simple_unittest(testdir):
-     assert reprec.matchreport("testpassing").passed
-     assert reprec.matchreport("test_failing").failed
- 
-+@pytest.mark.skipif('"__pypy__" in sys.modules')
- def test_runTest_method(testdir):
-     testdir.makepyfile("""
-         import unittest
-@@ -705,6 +706,7 @@ def test_issue333_result_clearing(testdir):
-     reprec.assertoutcome(failed=1)
- 
- @pytest.mark.skipif("sys.version_info < (2,7)")
-+@pytest.mark.skipif('"__pypy__" in sys.modules')
- def test_unittest_raise_skip_issue748(testdir):
-     testdir.makepyfile(test_foo="""
-         import unittest
-@@ -720,6 +722,7 @@ def test_unittest_raise_skip_issue748(testdir):
-     """)
- 
- @pytest.mark.skipif("sys.version_info < (2,7)")
-+@pytest.mark.skipif('"__pypy__" in sys.modules')
- def test_unittest_skip_issue1169(testdir):
-     testdir.makepyfile(test_foo="""
-         import unittest

diff --git a/dev-python/pytest/pytest-2.8.2.ebuild b/dev-python/pytest/pytest-2.8.2.ebuild
deleted file mode 100644
index 5ffa077..00000000
--- a/dev-python/pytest/pytest-2.8.2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="simple powerful testing with Python"
-HOMEPAGE="http://pytest.org/ https://pypi.python.org/pypi/pytest"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-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"
-IUSE="doc test"
-
-# When bumping, please check setup.py for the proper py version
-PY_VER="1.4.29"
-RDEPEND=">=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]"
-
-# dev-python/pluggy
-# https://github.com/hpk42/pluggy
-# See https://github.com/pytest-dev/pytest/issues/944
-# for why not now
-
-#pexpect dep based on https://bitbucket.org/hpk42/pytest/issue/386/tests-fail-with-pexpect-30
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (	dev-python/pexpect[${PYTHON_USEDEP}] )
-	doc? (
-		>=dev-python/sphinx-1.2.3[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/regendoc[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=( "${FILESDIR}"/${PN}-2.8.3-skip-test-on-pypy.patch )
-
-python_prepare_all() {
-	chmod o-w *egg*/* || die
-	# Disable versioning of py.test script to avoid collision with
-	# versioning performed by the eclass.
-	sed -e "s/return points/return {'py.test': target}/" -i setup.py || die "sed failed"
-	grep -qF "py>=${PY_VER}" setup.py || die "Incorrect dev-python/py dependency"
-
-	# Prevent un-needed d'loading
-	sed -e "s/'sphinx.ext.intersphinx', //" -i doc/en/conf.py || die
-
-	# https://github.com/pytest-dev/pytest/issues/1162
-	# https://github.com/pytest-dev/pytest/issues/1163
-	sed \
-		-e 's:test_logging_initialized_in_test:_&:g' \
-		-i testing/test_capture.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		mkdir doc/en/.build || die
-		emake -C doc/en html
-	fi
-}
-
-python_test() {
-	# test_nose.py not written to suit py3.2 in pypy3
-	if [[ "${EPYTHON}" == pypy3 ]]; then
-		"${PYTHON}" "${BUILD_DIR}"/lib/pytest.py -x -v \
-			--ignore=testing/BUILD_nose.py \
-			|| die "tests failed with ${EPYTHON}"
-	else
-		"${PYTHON}" "${BUILD_DIR}"/lib/pytest.py -x -v --runpytest=subprocess \
-			|| die "tests failed with ${EPYTHON}"
-	fi
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( doc/en/_build/html/. )
-	distutils-r1_python_install_all
-}

diff --git a/dev-python/pytest/pytest-2.8.7.ebuild b/dev-python/pytest/pytest-2.8.7.ebuild
deleted file mode 100644
index 2a86876..00000000
--- a/dev-python/pytest/pytest-2.8.7.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple powerful testing with Python"
-HOMEPAGE="http://pytest.org/ https://pypi.python.org/pypi/pytest"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-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"
-IUSE="doc test"
-
-# When bumping, please check setup.py for the proper py version
-PY_VER="1.4.29"
-RDEPEND=">=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]"
-
-# dev-python/pluggy
-# https://github.com/hpk42/pluggy
-# See https://github.com/pytest-dev/pytest/issues/944
-# for why not now
-
-#pexpect dep based on https://bitbucket.org/hpk42/pytest/issue/386/tests-fail-with-pexpect-30
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (	dev-python/pexpect[${PYTHON_USEDEP}] )
-	doc? (
-		>=dev-python/sphinx-1.2.3[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/regendoc[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=( "${FILESDIR}"/${P}-skip-test-on-pypy.patch )
-
-python_prepare_all() {
-	chmod o-w *egg*/* || die
-	# Disable versioning of py.test script to avoid collision with
-	# versioning performed by the eclass.
-	sed -e "s/return points/return {'py.test': target}/" -i setup.py || die "sed failed"
-	grep -qF "py>=${PY_VER}" setup.py || die "Incorrect dev-python/py dependency"
-
-	# Prevent un-needed d'loading
-	sed -e "s/'sphinx.ext.intersphinx', //" -i doc/en/conf.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		mkdir doc/en/.build || die
-		emake -C doc/en html
-	fi
-}
-
-python_test() {
-	# test_nose.py not written to suit py3.2 in pypy3
-	if [[ "${EPYTHON}" == pypy3 ]]; then
-		"${PYTHON}" "${BUILD_DIR}"/lib/pytest.py -x -v \
-			--ignore=testing/BUILD_nose.py \
-			|| die "tests failed with ${EPYTHON}"
-	else
-		"${PYTHON}" "${BUILD_DIR}"/lib/pytest.py -x -v --runpytest=subprocess \
-			|| die "tests failed with ${EPYTHON}"
-	fi
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( doc/en/_build/html/. )
-	distutils-r1_python_install_all
-}

diff --git a/dev-python/pytest/pytest-3.0.4.ebuild b/dev-python/pytest/pytest-3.0.4.ebuild
deleted file mode 100644
index 6adecf1..00000000
--- a/dev-python/pytest/pytest-3.0.4.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple powerful testing with Python"
-HOMEPAGE="http://pytest.org/ https://pypi.python.org/pypi/pytest"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
-IUSE="doc test"
-
-# When bumping, please check setup.py for the proper py version
-PY_VER="1.4.29"
-COMMON_DEPEND="
-	>=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/hypothesis-3.5.2[${PYTHON_USEDEP}]
-		>dev-python/pytest-xdist-1.13[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	!dev-python/logilab-common
-"
-
-python_prepare_all() {
-	chmod o-w *egg*/* || die
-	# Disable versioning of py.test script to avoid collision with
-	# versioning performed by the eclass.
-	sed -e "s/return points/return {'py.test': target}/" -i setup.py || die "sed failed"
-	grep -qF "py>=${PY_VER}" setup.py || die "Incorrect dev-python/py dependency"
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# test_nose.py not written to suit py3.2 in pypy3
-	if [[ "${EPYTHON}" == pypy3 ]]; then
-		"${PYTHON}" "${BUILD_DIR}"/lib/pytest.py -x -v \
-			--ignore=testing/BUILD_nose.py \
-			|| die "tests failed with ${EPYTHON}"
-	else
-		"${PYTHON}" "${BUILD_DIR}"/lib/pytest.py -v testing || die "tests failed with ${EPYTHON}"
-	fi
-}
-
-python_compile_all(){
-	use doc && emake -C doc/en html
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( doc/en/_build/html/. )
-	distutils-r1_python_install_all
-}