1 |
commit: 50d7900dc9b214cef8df98d39ad597a251172686 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jan 30 05:56:17 2020 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jan 30 07:18:07 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50d7900d |
7 |
|
8 |
dev-python/pytest: Remove redundant versions |
9 |
|
10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
11 |
|
12 |
dev-python/pytest/Manifest | 3 -- |
13 |
dev-python/pytest/pytest-4.6.8.ebuild | 75 ----------------------------------- |
14 |
dev-python/pytest/pytest-5.3.2.ebuild | 66 ------------------------------ |
15 |
dev-python/pytest/pytest-5.3.3.ebuild | 66 ------------------------------ |
16 |
4 files changed, 210 deletions(-) |
17 |
|
18 |
diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest |
19 |
index 27b5c204512..aa00dd106f7 100644 |
20 |
--- a/dev-python/pytest/Manifest |
21 |
+++ b/dev-python/pytest/Manifest |
22 |
@@ -1,7 +1,4 @@ |
23 |
DIST pytest-3.10.1.tar.gz 892420 BLAKE2B 38849ae69bf4380bc1a99aa105cac04be078da4460373dfc16fa555238b2830fa2f5ae6c19de8aa2af9ac18d87c5d2705d62f7b2e67e4a62d843f6a28bbd76fd SHA512 30ff79c0fdcbeef68e1191ff400a20428e391717f06957f554b694b94baaaa565dca01346fe989c3e443c4402f3b2bdbd5564f6303a4447f933fb54cba45628f |
24 |
DIST pytest-4.5.0.tar.gz 943607 BLAKE2B 49a0e91fda7f4231fdd39f90eb2daa344d3034c10faff221330ea0ae7482a2a7d0fb9443a0a264db00f1d92568d5a6005cb73e07d8643b46906f7ecff831adcb SHA512 cbffc6216f83491b1de241058315c116697bfaa5206b5f558192a7f861d43dd036d30d0d689bedae7bdee4f0258dd19ef5827c356e11863dd596a5fabe8249fc |
25 |
-DIST pytest-4.6.8.tar.gz 956062 BLAKE2B f28e3226c7dfe4188168cfdf9623c96d0b274a2476f0d3132c24367e4566abd2e0b496114f229b6f26ae53a67d1ea1f9cb64795f4f9710fc9fe0852991467aef SHA512 b396b200a8a13ec9df8dbc4dd64bb05638b26af9ad6b24cbea3c3de4d806665b63a1488c7359b12c5634d014d45b43c8c208f0e329c62266882a87c492e80b58 |
26 |
DIST pytest-4.6.9.tar.gz 956816 BLAKE2B 7eaeaa0d47c17836a35d9cdc97663f8ef65253099b21d60a7ffc3655d8bd93c6b4e33045caa6c8ab9bb8b920b93e596ba86d8eac4ab07b3b7a5989b38312f4fc SHA512 ab45a8662aa798a6ae224ad2cd68e043c605e4830c76cb6c6aca3cfccef232c024cbbb6c48c9bae19148099c339abfef3270a2208cc7e5c37a10b34b0aa6ba79 |
27 |
-DIST pytest-5.3.2.tar.gz 995560 BLAKE2B aaea9d89e884a82056eeea3068c70604c73d50c96b8d78c6ee14c67bbe066f0e6d882c1b8f95539a2338d6739e047680d901a9db108b1923fa4d3d03dc3f2115 SHA512 2ab39973848d2d4693edd1dbd7ab2798b574026c9277bddd4a18e57aec65b3d93de201e87f58eb26030183b5c71818e6e56bcc1cda8c50892546cb1c04d6984a |
28 |
-DIST pytest-5.3.3.tar.gz 990948 BLAKE2B fed1d9386aeec587134ac2057348cf59cf554a0fb3d4ff7251917662eb52e914021d17890adc58fb40f06382e770f0e22c2db8abdd0d27a2005f187daf1eaa7f SHA512 79ac431f6a965d00431d3fa8353c756166d88628acfc254225f495bae9ca5f9e78a0282156a1e523b044a18da5fec9925a1a2aab5fcda3bac39cdaf2dee7be36 |
29 |
DIST pytest-5.3.4.tar.gz 990897 BLAKE2B dd6f0a277352dd72e6348e89813a7df50aabf9ee134afd69412100b87a7898128ec6b17bf29082c88554b66ba5622b7e0b9a1338d6b740795f33055a9279cfdc SHA512 562966d74d2ff12715ececa46acdd49de67f5e792687d52b3f53589f6dc6105aed09bd4c5098989d70b8a69e6bb4cfb9c0b1ee7e9cfc8e8252e3ba6b4d39e4bc |
30 |
|
31 |
diff --git a/dev-python/pytest/pytest-4.6.8.ebuild b/dev-python/pytest/pytest-4.6.8.ebuild |
32 |
deleted file mode 100644 |
33 |
index 5267018ca93..00000000000 |
34 |
--- a/dev-python/pytest/pytest-4.6.8.ebuild |
35 |
+++ /dev/null |
36 |
@@ -1,75 +0,0 @@ |
37 |
-# Copyright 1999-2020 Gentoo Authors |
38 |
-# Distributed under the terms of the GNU General Public License v2 |
39 |
- |
40 |
-EAPI=7 |
41 |
- |
42 |
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 ) |
43 |
- |
44 |
-inherit distutils-r1 |
45 |
- |
46 |
-DESCRIPTION="Simple powerful testing with Python" |
47 |
-HOMEPAGE="http://pytest.org/" |
48 |
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
49 |
- |
50 |
-LICENSE="MIT" |
51 |
-SLOT="0" |
52 |
-KEYWORDS="~amd64 ~x86" |
53 |
-IUSE="test" |
54 |
-RESTRICT="!test? ( test )" |
55 |
- |
56 |
-# When bumping, please check setup.py for the proper py version |
57 |
-PY_VER="1.5.0" |
58 |
- |
59 |
-# pathlib2 has been added to stdlib before py3.6, but pytest needs __fspath__ |
60 |
-# support, which only came in py3.6. |
61 |
-RDEPEND=" |
62 |
- >=dev-python/atomicwrites-1.0[${PYTHON_USEDEP}] |
63 |
- >=dev-python/attrs-17.4.0[${PYTHON_USEDEP}] |
64 |
- >=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}] |
65 |
- $(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' \ |
66 |
- -2 python3_{5,6,7} pypy3) |
67 |
- $(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' -2) |
68 |
- >=dev-python/pluggy-0.12[${PYTHON_USEDEP}] |
69 |
- <dev-python/pluggy-1 |
70 |
- >=dev-python/py-${PY_VER}[${PYTHON_USEDEP}] |
71 |
- dev-python/packaging[${PYTHON_USEDEP}] |
72 |
- dev-python/six[${PYTHON_USEDEP}] |
73 |
- dev-python/wcwidth[${PYTHON_USEDEP}] |
74 |
- virtual/python-funcsigs[${PYTHON_USEDEP}]" |
75 |
- |
76 |
-# flake cause a number of tests to fail |
77 |
-DEPEND=" |
78 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
79 |
- test? ( |
80 |
- ${RDEPEND} |
81 |
- dev-python/argcomplete[${PYTHON_USEDEP}] |
82 |
- >=dev-python/hypothesis-3.56[${PYTHON_USEDEP}] |
83 |
- dev-python/nose[${PYTHON_USEDEP}] |
84 |
- $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' -2) |
85 |
- dev-python/pexpect[${PYTHON_USEDEP}] |
86 |
- dev-python/pytest-xdist[${PYTHON_USEDEP}] |
87 |
- dev-python/requests[${PYTHON_USEDEP}] |
88 |
- !!dev-python/flaky |
89 |
- )" |
90 |
- |
91 |
-PATCHES=( |
92 |
- "${FILESDIR}/${PN}-4.5.0-strip-setuptools_scm.patch" |
93 |
-) |
94 |
- |
95 |
-python_prepare_all() { |
96 |
- grep -qF "py>=${PY_VER}" setup.py || die "Incorrect dev-python/py dependency" |
97 |
- |
98 |
- # Something in the ebuild environment causes this to hang/error. |
99 |
- # https://bugs.gentoo.org/598442 |
100 |
- rm testing/test_pdb.py || die |
101 |
- |
102 |
- distutils-r1_python_prepare_all |
103 |
-} |
104 |
- |
105 |
-python_test() { |
106 |
- # In v4.1.1, pytest started being picky about its own verbosity options. |
107 |
- # running pytest on itself with -vv made 3 tests fail. This is why we don't |
108 |
- # have it below. |
109 |
- "${EPYTHON}" "${BUILD_DIR}"/lib/pytest.py --lsof -rfsxX \ |
110 |
- || die "tests failed with ${EPYTHON}" |
111 |
-} |
112 |
|
113 |
diff --git a/dev-python/pytest/pytest-5.3.2.ebuild b/dev-python/pytest/pytest-5.3.2.ebuild |
114 |
deleted file mode 100644 |
115 |
index 3d6a7a5ab18..00000000000 |
116 |
--- a/dev-python/pytest/pytest-5.3.2.ebuild |
117 |
+++ /dev/null |
118 |
@@ -1,66 +0,0 @@ |
119 |
-# Copyright 1999-2020 Gentoo Authors |
120 |
-# Distributed under the terms of the GNU General Public License v2 |
121 |
- |
122 |
-EAPI=7 |
123 |
- |
124 |
-PYTHON_COMPAT=( python3_{6,7,8} ) |
125 |
- |
126 |
-inherit distutils-r1 |
127 |
- |
128 |
-DESCRIPTION="Simple powerful testing with Python" |
129 |
-HOMEPAGE="https://pytest.org/" |
130 |
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
131 |
- |
132 |
-LICENSE="MIT" |
133 |
-SLOT="0" |
134 |
-KEYWORDS="~amd64 ~x86" |
135 |
-IUSE="test" |
136 |
-RESTRICT="!test? ( test )" |
137 |
- |
138 |
-# When bumping, please check setup.py for the proper py version |
139 |
-PY_VER="1.5.0" |
140 |
- |
141 |
-# pathlib2 has been added to stdlib before py3.6, but pytest needs __fspath__ |
142 |
-# support, which only came in py3.6. |
143 |
-RDEPEND=" |
144 |
- >=dev-python/attrs-17.4.0[${PYTHON_USEDEP}] |
145 |
- dev-python/importlib_metadata[${PYTHON_USEDEP}] |
146 |
- >=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}] |
147 |
- dev-python/packaging[${PYTHON_USEDEP}] |
148 |
- >=dev-python/pluggy-0.12[${PYTHON_USEDEP}] |
149 |
- <dev-python/pluggy-1 |
150 |
- >=dev-python/py-${PY_VER}[${PYTHON_USEDEP}] |
151 |
- dev-python/six[${PYTHON_USEDEP}] |
152 |
- dev-python/wcwidth[${PYTHON_USEDEP}] |
153 |
- virtual/python-funcsigs[${PYTHON_USEDEP}]" |
154 |
- |
155 |
-# flake cause a number of tests to fail |
156 |
-DEPEND="${RDEPEND} |
157 |
- test? ( |
158 |
- >=dev-python/hypothesis-3.56[${PYTHON_USEDEP}] |
159 |
- dev-python/nose[${PYTHON_USEDEP}] |
160 |
- dev-python/mock[${PYTHON_USEDEP}] |
161 |
- dev-python/requests[${PYTHON_USEDEP}] |
162 |
- >=dev-python/setuptools-40[${PYTHON_USEDEP}] |
163 |
- dev-python/xmlschema[${PYTHON_USEDEP}] |
164 |
- !!dev-python/flaky |
165 |
- )" |
166 |
- |
167 |
-PATCHES=( |
168 |
- "${FILESDIR}/${PN}"-4.5.0-strip-setuptools_scm.patch |
169 |
-) |
170 |
- |
171 |
-python_prepare_all() { |
172 |
- grep -qF "py>=${PY_VER}" setup.py || die "Incorrect dev-python/py dependency" |
173 |
- |
174 |
- # Something in the ebuild environment causes this to hang/error. |
175 |
- # https://bugs.gentoo.org/598442 |
176 |
- rm testing/test_pdb.py || die |
177 |
- |
178 |
- distutils-r1_python_prepare_all |
179 |
-} |
180 |
- |
181 |
-python_test() { |
182 |
- "${EPYTHON}" -m pytest -vv --lsof -rfsxX \ |
183 |
- || die "tests failed with ${EPYTHON}" |
184 |
-} |
185 |
|
186 |
diff --git a/dev-python/pytest/pytest-5.3.3.ebuild b/dev-python/pytest/pytest-5.3.3.ebuild |
187 |
deleted file mode 100644 |
188 |
index 1be7d663ccd..00000000000 |
189 |
--- a/dev-python/pytest/pytest-5.3.3.ebuild |
190 |
+++ /dev/null |
191 |
@@ -1,66 +0,0 @@ |
192 |
-# Copyright 1999-2020 Gentoo Authors |
193 |
-# Distributed under the terms of the GNU General Public License v2 |
194 |
- |
195 |
-EAPI=7 |
196 |
- |
197 |
-DISTUTILS_USE_SETUPTOOLS=rdepend |
198 |
-PYTHON_COMPAT=( python3_{6,7,8} ) |
199 |
- |
200 |
-inherit distutils-r1 |
201 |
- |
202 |
-DESCRIPTION="Simple powerful testing with Python" |
203 |
-HOMEPAGE="https://pytest.org/" |
204 |
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
205 |
- |
206 |
-LICENSE="MIT" |
207 |
-SLOT="0" |
208 |
-KEYWORDS="~amd64 ~x86" |
209 |
-IUSE="test" |
210 |
-RESTRICT="!test? ( test )" |
211 |
- |
212 |
-# When bumping, please check setup.py for the proper py version |
213 |
-PY_VER="1.5.0" |
214 |
- |
215 |
-# pathlib2 has been added to stdlib before py3.6, but pytest needs __fspath__ |
216 |
-# support, which only came in py3.6. |
217 |
-RDEPEND=" |
218 |
- >=dev-python/attrs-17.4.0[${PYTHON_USEDEP}] |
219 |
- dev-python/importlib_metadata[${PYTHON_USEDEP}] |
220 |
- >=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}] |
221 |
- dev-python/packaging[${PYTHON_USEDEP}] |
222 |
- >=dev-python/pluggy-0.12[${PYTHON_USEDEP}] |
223 |
- <dev-python/pluggy-1 |
224 |
- >=dev-python/py-${PY_VER}[${PYTHON_USEDEP}] |
225 |
- dev-python/six[${PYTHON_USEDEP}] |
226 |
- dev-python/wcwidth[${PYTHON_USEDEP}] |
227 |
- virtual/python-funcsigs[${PYTHON_USEDEP}]" |
228 |
- |
229 |
-# flake cause a number of tests to fail |
230 |
-DEPEND="${RDEPEND} |
231 |
- test? ( |
232 |
- >=dev-python/hypothesis-3.56[${PYTHON_USEDEP}] |
233 |
- dev-python/nose[${PYTHON_USEDEP}] |
234 |
- dev-python/mock[${PYTHON_USEDEP}] |
235 |
- dev-python/requests[${PYTHON_USEDEP}] |
236 |
- dev-python/xmlschema[${PYTHON_USEDEP}] |
237 |
- !!dev-python/flaky |
238 |
- )" |
239 |
- |
240 |
-PATCHES=( |
241 |
- "${FILESDIR}/${PN}"-4.5.0-strip-setuptools_scm.patch |
242 |
-) |
243 |
- |
244 |
-python_prepare_all() { |
245 |
- grep -qF "py>=${PY_VER}" setup.py || die "Incorrect dev-python/py dependency" |
246 |
- |
247 |
- # Something in the ebuild environment causes this to hang/error. |
248 |
- # https://bugs.gentoo.org/598442 |
249 |
- rm testing/test_pdb.py || die |
250 |
- |
251 |
- distutils-r1_python_prepare_all |
252 |
-} |
253 |
- |
254 |
-python_test() { |
255 |
- "${EPYTHON}" -m pytest -vv --lsof -rfsxX \ |
256 |
- || die "tests failed with ${EPYTHON}" |
257 |
-} |