summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Heiko Becker <heirecka@exherbo.org> 2018-07-17 18:24:39 +0200
committerAvatar Heiko Becker <heirecka@exherbo.org> 2018-07-17 23:18:14 +0200
commit744c04169313fadb3bbc9447f2d0f5cd08cb60fe (patch)
tree0d8d5983d268db2daafac04e075653f1a1eae78b
parenta5eb8e0caf77e06e32ebaea734629a883ac3538d (diff)
downloadpython-master.tar.gz
python-master.tar.xz
pytest: Version bump to 3.6.3HEADmaster
-rw-r--r--packages/dev-python/pytest/files/remove-failing-test.patch33
-rw-r--r--packages/dev-python/pytest/pytest-3.6.3.exheres-0 (renamed from packages/dev-python/pytest/pytest-3.6.0.exheres-0)6
2 files changed, 1 insertions, 38 deletions
diff --git a/packages/dev-python/pytest/files/remove-failing-test.patch b/packages/dev-python/pytest/files/remove-failing-test.patch
deleted file mode 100644
index a423956..0000000
--- a/packages/dev-python/pytest/files/remove-failing-test.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Author: Rasmus Thomsen <cogitri@exherbo.org>
-Reason: Remove failing tests, see:
-https://github.com/pytest-dev/pytest/issues/2294
-https://bugs.gentoo.org/593902
-Upstream: No, wants us to use tox for testing https://github.com/pytest-dev/pytest/issues/2294
-diff --git a/testing/python/integration.py b/testing/python/integration.py
-index aade04f..8302ee9 100644
---- a/testing/python/integration.py
-+++ b/testing/python/integration.py
-@@ -96,23 +96,6 @@ class TestMockDecoration(object):
- values = getfuncargnames(f)
- assert values == ("x",)
-
-- def test_wrapped_getfuncargnames_patching(self):
-- from _pytest.compat import getfuncargnames
--
-- def wrap(f):
-- def func():
-- pass
-- func.__wrapped__ = f
-- func.patchings = ["qwe"]
-- return func
--
-- @wrap
-- def f(x, y, z):
-- pass
--
-- values = getfuncargnames(f)
-- assert values == ("y", "z")
--
- def test_unittest_mock(self, testdir):
- pytest.importorskip("unittest.mock")
- testdir.makepyfile("""
diff --git a/packages/dev-python/pytest/pytest-3.6.0.exheres-0 b/packages/dev-python/pytest/pytest-3.6.3.exheres-0
index 657a31d..35a40c6 100644
--- a/packages/dev-python/pytest/pytest-3.6.0.exheres-0
+++ b/packages/dev-python/pytest/pytest-3.6.3.exheres-0
@@ -51,12 +51,8 @@ DEPENDENCIES="
]]
"
-DEFAULT_SRC_PREPARE_PATCHES=(
- "${FILES}"/remove-failing-test.patch
-)
-
test_one_multibuild() {
- PYTHONPATH=$(echo $(pwd)/build/lib*) edo ${PYTHON} pytest.py testing
+ PYTHONPATH=$(echo $(pwd)/build/lib*) edo ${PYTHON} src/pytest.py testing
}
install_one_multibuild() {