1 |
commit: d6df2aeba6c0a5aa9b88e706a76b2c535832dc46 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Nov 27 12:31:47 2019 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Nov 27 13:17:11 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6df2aeb |
7 |
|
8 |
dev-python/pytest: Remove redudant version |
9 |
|
10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
11 |
|
12 |
dev-python/pytest/Manifest | 1 - |
13 |
.../files/pytest-5.0.1-test_xfail_rmdir.patch | 38 ------------ |
14 |
dev-python/pytest/pytest-5.0.1.ebuild | 68 ---------------------- |
15 |
3 files changed, 107 deletions(-) |
16 |
|
17 |
diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest |
18 |
index ae1fac75058..0a0234192f6 100644 |
19 |
--- a/dev-python/pytest/Manifest |
20 |
+++ b/dev-python/pytest/Manifest |
21 |
@@ -1,5 +1,4 @@ |
22 |
DIST pytest-3.10.1.tar.gz 892420 BLAKE2B 38849ae69bf4380bc1a99aa105cac04be078da4460373dfc16fa555238b2830fa2f5ae6c19de8aa2af9ac18d87c5d2705d62f7b2e67e4a62d843f6a28bbd76fd SHA512 30ff79c0fdcbeef68e1191ff400a20428e391717f06957f554b694b94baaaa565dca01346fe989c3e443c4402f3b2bdbd5564f6303a4447f933fb54cba45628f |
23 |
DIST pytest-4.5.0.tar.gz 943607 BLAKE2B 49a0e91fda7f4231fdd39f90eb2daa344d3034c10faff221330ea0ae7482a2a7d0fb9443a0a264db00f1d92568d5a6005cb73e07d8643b46906f7ecff831adcb SHA512 cbffc6216f83491b1de241058315c116697bfaa5206b5f558192a7f861d43dd036d30d0d689bedae7bdee4f0258dd19ef5827c356e11863dd596a5fabe8249fc |
24 |
DIST pytest-4.6.6.tar.gz 954899 BLAKE2B d3d76ec1fff18d343cc799f1acd0889489f303cdba72747881dfab8656599bc1865f01b5ad2754f0d05bda04aca4d7edf8c2071f2257fdf41506308d1bc0f623 SHA512 c5b6c21c352787eadce06be7529ecb6f6fd5f5eb193ec29e5a4cfff3d7e305f50c6f07aeac15bddce007d88077a35a8f59633111815321792ed3d9fa1011b684 |
25 |
-DIST pytest-5.0.1.tar.gz 949744 BLAKE2B c949f0fb6bc0d1430ec7c780537f8aee8ca1ebea5f89035d882434236c6af7d431a610774dbafa93552406e38852627a9f949a6f9198a792de9371efadb4f6ff SHA512 92f5feb263a8708ef6cb8f4565688620b6bfeaef23536cfd24b9bc09515e37fdecd7fa8bcaeeb0775c0be1d8e9dcbd9a56e52f97fb13dc98116efc0056f870db |
26 |
DIST pytest-5.3.0.tar.gz 992537 BLAKE2B 4386d1623bdc168313a75847dfa33413ab1b6a4de9380c67ae866a579dbeb62d8cd18da899bf0476827d6e4a76ddfc5fee7a2fdc652eff0c8848c0bd96045c47 SHA512 285d0b4f6b87b141d6d5dac368dc46eb80dd025d7ed4ad0db937fcc76efc1f8cf251ca9b0786ab1bdadd89c07ad8ddd74f2b3496f97326e9d7fccfd004b98aff |
27 |
|
28 |
diff --git a/dev-python/pytest/files/pytest-5.0.1-test_xfail_rmdir.patch b/dev-python/pytest/files/pytest-5.0.1-test_xfail_rmdir.patch |
29 |
deleted file mode 100644 |
30 |
index 5c6154cd92c..00000000000 |
31 |
--- a/dev-python/pytest/files/pytest-5.0.1-test_xfail_rmdir.patch |
32 |
+++ /dev/null |
33 |
@@ -1,38 +0,0 @@ |
34 |
-From ab39502c98f40c03a2956dcf6c6b9daf5ee41a63 Mon Sep 17 00:00:00 2001 |
35 |
-From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@×××××××.cz> |
36 |
-Date: Fri, 26 Jul 2019 02:23:14 +0200 |
37 |
-Subject: [PATCH] In test_xfail_handling, only remove __pycache__ if it exists |
38 |
- |
39 |
-Previously, the test failed when the directory was not present, |
40 |
-which could have been caused for example by invoking the tests |
41 |
-with PYTHONDONTWRITEBYTECODE=1. |
42 |
- |
43 |
-Fixes https://github.com/pytest-dev/pytest/issues/5664 |
44 |
---- |
45 |
- changelog/5664.trivial.rst | 2 ++ |
46 |
- testing/test_stepwise.py | 3 ++- |
47 |
- 2 files changed, 4 insertions(+), 1 deletion(-) |
48 |
- create mode 100644 changelog/5664.trivial.rst |
49 |
- |
50 |
-diff --git a/changelog/5664.trivial.rst b/changelog/5664.trivial.rst |
51 |
-new file mode 100644 |
52 |
-index 000000000..3928454ef |
53 |
---- /dev/null |
54 |
-+++ b/changelog/5664.trivial.rst |
55 |
-@@ -0,0 +1,2 @@ |
56 |
-+When invoking pytest's own testsuite with ``PYTHONDONTWRITEBYTECODE=1``, |
57 |
-+the ``test_xfail_handling`` test no longer fails. |
58 |
-diff --git a/testing/test_stepwise.py b/testing/test_stepwise.py |
59 |
-index 591d67b6c..f61425b6b 100644 |
60 |
---- a/testing/test_stepwise.py |
61 |
-+++ b/testing/test_stepwise.py |
62 |
-@@ -207,7 +207,8 @@ def test_d(): pass |
63 |
- |
64 |
- # because we are writing to the same file, mtime might not be affected enough to |
65 |
- # invalidate the cache, making this next run flaky |
66 |
-- testdir.tmpdir.join("__pycache__").remove() |
67 |
-+ if testdir.tmpdir.join("__pycache__").exists(): |
68 |
-+ testdir.tmpdir.join("__pycache__").remove() |
69 |
- testdir.makepyfile(contents.format(assert_value="0", strict="True")) |
70 |
- result = testdir.runpytest("--sw", "-v") |
71 |
- result.stdout.fnmatch_lines( |
72 |
|
73 |
diff --git a/dev-python/pytest/pytest-5.0.1.ebuild b/dev-python/pytest/pytest-5.0.1.ebuild |
74 |
deleted file mode 100644 |
75 |
index 15641dad00a..00000000000 |
76 |
--- a/dev-python/pytest/pytest-5.0.1.ebuild |
77 |
+++ /dev/null |
78 |
@@ -1,68 +0,0 @@ |
79 |
-# Copyright 1999-2019 Gentoo Authors |
80 |
-# Distributed under the terms of the GNU General Public License v2 |
81 |
- |
82 |
-EAPI=7 |
83 |
- |
84 |
-PYTHON_COMPAT=( python3_{5,6,7} pypy3 ) |
85 |
- |
86 |
-inherit distutils-r1 |
87 |
- |
88 |
-DESCRIPTION="Simple powerful testing with Python" |
89 |
-HOMEPAGE="http://pytest.org/" |
90 |
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
91 |
- |
92 |
-LICENSE="MIT" |
93 |
-SLOT="0" |
94 |
-KEYWORDS="~amd64 ~x86" |
95 |
-IUSE="test" |
96 |
-RESTRICT="!test? ( test )" |
97 |
- |
98 |
-# When bumping, please check setup.py for the proper py version |
99 |
-PY_VER="1.5.0" |
100 |
- |
101 |
-# pathlib2 has been added to stdlib before py3.6, but pytest needs __fspath__ |
102 |
-# support, which only came in py3.6. |
103 |
-RDEPEND=" |
104 |
- >=dev-python/atomicwrites-1.0[${PYTHON_USEDEP}] |
105 |
- >=dev-python/attrs-17.4.0[${PYTHON_USEDEP}] |
106 |
- dev-python/importlib_metadata[${PYTHON_USEDEP}] |
107 |
- >=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}] |
108 |
- dev-python/packaging[${PYTHON_USEDEP}] |
109 |
- $(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' python3_5 ) |
110 |
- >=dev-python/pluggy-0.12[${PYTHON_USEDEP}] |
111 |
- <dev-python/pluggy-1 |
112 |
- >=dev-python/py-${PY_VER}[${PYTHON_USEDEP}] |
113 |
- dev-python/six[${PYTHON_USEDEP}] |
114 |
- dev-python/wcwidth[${PYTHON_USEDEP}] |
115 |
- virtual/python-funcsigs[${PYTHON_USEDEP}]" |
116 |
- |
117 |
-# flake cause a number of tests to fail |
118 |
-DEPEND="${RDEPEND} |
119 |
- test? ( |
120 |
- >=dev-python/hypothesis-3.56[${PYTHON_USEDEP}] |
121 |
- dev-python/nose[${PYTHON_USEDEP}] |
122 |
- dev-python/mock[${PYTHON_USEDEP}] |
123 |
- dev-python/requests[${PYTHON_USEDEP}] |
124 |
- >=dev-python/setuptools-40[${PYTHON_USEDEP}] |
125 |
- !!dev-python/flaky |
126 |
- )" |
127 |
- |
128 |
-PATCHES=( |
129 |
- "${FILESDIR}/${PN}"-4.5.0-strip-setuptools_scm.patch |
130 |
- "${FILESDIR}/${PN}"-5.0.1-test_xfail_rmdir.patch |
131 |
-) |
132 |
- |
133 |
-python_prepare_all() { |
134 |
- grep -qF "py>=${PY_VER}" setup.py || die "Incorrect dev-python/py dependency" |
135 |
- |
136 |
- # Something in the ebuild environment causes this to hang/error. |
137 |
- # https://bugs.gentoo.org/598442 |
138 |
- rm testing/test_pdb.py || die |
139 |
- |
140 |
- distutils-r1_python_prepare_all |
141 |
-} |
142 |
- |
143 |
-python_test() { |
144 |
- "${EPYTHON}" "${BUILD_DIR}"/lib/pytest.py -vv --lsof -rfsxX \ |
145 |
- || die "tests failed with ${EPYTHON}" |
146 |
-} |