1 |
commit: 77eebc053692f00806261bdd31338ec0c084eb13 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Oct 3 19:24:01 2021 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Oct 3 19:24:01 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77eebc05 |
7 |
|
8 |
dev-python/pytest: Remove old |
9 |
|
10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
11 |
|
12 |
dev-python/pytest/Manifest | 2 - |
13 |
dev-python/pytest/files/pytest-6.2.4-py310.patch | 34 ------------- |
14 |
dev-python/pytest/pytest-6.1.2.ebuild | 62 ----------------------- |
15 |
dev-python/pytest/pytest-6.2.4-r1.ebuild | 64 ------------------------ |
16 |
4 files changed, 162 deletions(-) |
17 |
|
18 |
diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest |
19 |
index 2c7f84ba17c..8341a16b4b5 100644 |
20 |
--- a/dev-python/pytest/Manifest |
21 |
+++ b/dev-python/pytest/Manifest |
22 |
@@ -1,4 +1,2 @@ |
23 |
DIST pytest-5.4.3.tar.gz 1022353 BLAKE2B 70d4f23cbbfc4c4ce63c512ee0a01556973761a6d3ebb71a6d9ed4fb4a4a21531e1b151ed0e4c5e56e5dd3243a1a272441f17c4c2c4e3b0b19c24654b74e8e52 SHA512 0a07d4f4f791969c6f21961a0ba0f8c6670e5870c6cc1cebf93766587bb9cb3e10db8e57f0bd33dd22b275f3aad7aa674949f124ac80e0ccca64e35be4beee4e |
24 |
-DIST pytest-6.1.2.tar.gz 1084943 BLAKE2B cbdf29c54118b5daf699f11fb674d37d5972a163a7a53f42f6ddf9224e2d8d9e84b9a88106d5a77e70f470ccbffb15c2cf9a939be69bc0a2cab1fc4c76054562 SHA512 6335e994c5273881c8d1c334fe6bfa9cd0a3e5c251f3d6a9332f7f7c1427e6560ff48d8f235b307ea5eb53491072daf30c41f566bb67b304354fd88d286c61b1 |
25 |
-DIST pytest-6.2.4.tar.gz 1118084 BLAKE2B 611db50e7432dfb6f8d212621a3803871fd8f6c05ec3cdefeb3958d0886f754326fc358a9a67bdb3f516388aab901b169c951471bf304adfb78fe457dc59d6c5 SHA512 43adc9a78e16a05f07e689e4557b63f2e0f4de5a1cdea6f24272b6a658a6b0a18721713cf46b5102cf2726ddbc4ffe131c39e652bd2511d285f40cbfcccc2289 |
26 |
DIST pytest-6.2.5.tar.gz 1118720 BLAKE2B 9dfc87279617be58353566009325f929e6fa53d54fd4c665a75f3b359ab5415972d745a680eb85ab21ca9eaec84450bc1decd50566b0ccdf90d7551f3d03ee70 SHA512 7624563a9d967da4cbf82cfff90bae8c0cca07b32e291dc7c5efa787725ed1a255edd066bf0d5fbd89b8cbed8cf5b619fe7c7017f44a7f8a014e3310c06bdbf9 |
27 |
|
28 |
diff --git a/dev-python/pytest/files/pytest-6.2.4-py310.patch b/dev-python/pytest/files/pytest-6.2.4-py310.patch |
29 |
deleted file mode 100644 |
30 |
index 88c8f703f08..00000000000 |
31 |
--- a/dev-python/pytest/files/pytest-6.2.4-py310.patch |
32 |
+++ /dev/null |
33 |
@@ -1,34 +0,0 @@ |
34 |
-From 78fb97105f38dc286353bbc331a243b6e753fe3c Mon Sep 17 00:00:00 2001 |
35 |
-From: Petr Viktorin <encukou@×××××.com> |
36 |
-Date: Wed, 6 Jan 2021 13:33:33 +0100 |
37 |
-Subject: [PATCH] Make code.FormattedExcinfo.get_source more defensive |
38 |
- |
39 |
-When line_index was a large negative number, get_source failed |
40 |
-on `source.lines[line_index]`. |
41 |
-Use the same dummy Source as with a large positive line_index. |
42 |
---- |
43 |
- src/_pytest/_code/code.py | 6 +++--- |
44 |
- 1 file changed, 3 insertions(+), 3 deletions(-) |
45 |
- |
46 |
-diff --git a/src/_pytest/_code/code.py b/src/_pytest/_code/code.py |
47 |
-index b85217560..af3bdf056 100644 |
48 |
---- a/src/_pytest/_code/code.py |
49 |
-+++ b/src/_pytest/_code/code.py |
50 |
-@@ -721,11 +721,11 @@ class FormattedExcinfo: |
51 |
- ) -> List[str]: |
52 |
- """Return formatted and marked up source lines.""" |
53 |
- lines = [] |
54 |
-- if source is None or line_index >= len(source.lines): |
55 |
-+ if source is not None and line_index < 0: |
56 |
-+ line_index += len(source.lines) |
57 |
-+ if source is None or line_index >= len(source.lines) or line_index < 0: |
58 |
- source = Source("???") |
59 |
- line_index = 0 |
60 |
-- if line_index < 0: |
61 |
-- line_index += len(source) |
62 |
- space_prefix = " " |
63 |
- if short: |
64 |
- lines.append(space_prefix + source.lines[line_index].strip()) |
65 |
--- |
66 |
-2.31.1 |
67 |
- |
68 |
|
69 |
diff --git a/dev-python/pytest/pytest-6.1.2.ebuild b/dev-python/pytest/pytest-6.1.2.ebuild |
70 |
deleted file mode 100644 |
71 |
index 21b4753e5aa..00000000000 |
72 |
--- a/dev-python/pytest/pytest-6.1.2.ebuild |
73 |
+++ /dev/null |
74 |
@@ -1,62 +0,0 @@ |
75 |
-# Copyright 1999-2020 Gentoo Authors |
76 |
-# Distributed under the terms of the GNU General Public License v2 |
77 |
- |
78 |
-EAPI=7 |
79 |
- |
80 |
-DISTUTILS_USE_SETUPTOOLS=rdepend |
81 |
-PYTHON_COMPAT=( python3_{7..9} pypy3 ) |
82 |
- |
83 |
-inherit distutils-r1 |
84 |
- |
85 |
-DESCRIPTION="Simple powerful testing with Python" |
86 |
-HOMEPAGE="https://pytest.org/" |
87 |
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
88 |
- |
89 |
-LICENSE="MIT" |
90 |
-SLOT="0" |
91 |
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos" |
92 |
-IUSE="test" |
93 |
-RESTRICT="!test? ( test )" |
94 |
- |
95 |
-RDEPEND=" |
96 |
- >=dev-python/attrs-17.4.0[${PYTHON_USEDEP}] |
97 |
- $(python_gen_cond_dep ' |
98 |
- dev-python/importlib_metadata[${PYTHON_USEDEP}] |
99 |
- ' python3_{6,7} pypy3) |
100 |
- dev-python/iniconfig[${PYTHON_USEDEP}] |
101 |
- >=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}] |
102 |
- dev-python/packaging[${PYTHON_USEDEP}] |
103 |
- >=dev-python/pluggy-0.12[${PYTHON_USEDEP}] |
104 |
- <dev-python/pluggy-1 |
105 |
- >=dev-python/py-1.8.2[${PYTHON_USEDEP}] |
106 |
- dev-python/toml[${PYTHON_USEDEP}] |
107 |
-" |
108 |
-# flake cause a number of tests to fail |
109 |
-DEPEND=" |
110 |
- dev-python/setuptools_scm[${PYTHON_USEDEP}] |
111 |
- test? ( |
112 |
- ${RDEPEND} |
113 |
- dev-python/argcomplete[${PYTHON_USEDEP}] |
114 |
- >=dev-python/hypothesis-3.56[${PYTHON_USEDEP}] |
115 |
- dev-python/mock[${PYTHON_USEDEP}] |
116 |
- dev-python/nose[${PYTHON_USEDEP}] |
117 |
- dev-python/requests[${PYTHON_USEDEP}] |
118 |
- dev-python/xmlschema[${PYTHON_USEDEP}] |
119 |
- !!dev-python/flaky |
120 |
- )" |
121 |
- |
122 |
-python_prepare_all() { |
123 |
- # fragile to warnings from other packages (setuptools) |
124 |
- # little value for us to run it |
125 |
- sed -i -e 's:test_no_warnings:_&:' \ |
126 |
- testing/test_meta.py || die |
127 |
- |
128 |
- distutils-r1_python_prepare_all |
129 |
-} |
130 |
- |
131 |
-python_test() { |
132 |
- distutils_install_for_testing |
133 |
- |
134 |
- "${EPYTHON}" -m pytest -vv --lsof -rfsxX || |
135 |
- die "Tests failed with ${EPYTHON}" |
136 |
-} |
137 |
|
138 |
diff --git a/dev-python/pytest/pytest-6.2.4-r1.ebuild b/dev-python/pytest/pytest-6.2.4-r1.ebuild |
139 |
deleted file mode 100644 |
140 |
index ac093bcc4d5..00000000000 |
141 |
--- a/dev-python/pytest/pytest-6.2.4-r1.ebuild |
142 |
+++ /dev/null |
143 |
@@ -1,64 +0,0 @@ |
144 |
-# Copyright 1999-2021 Gentoo Authors |
145 |
-# Distributed under the terms of the GNU General Public License v2 |
146 |
- |
147 |
-EAPI=7 |
148 |
- |
149 |
-PYTHON_COMPAT=( python3_{7..10} pypy3 ) |
150 |
-inherit distutils-r1 |
151 |
- |
152 |
-DESCRIPTION="Simple powerful testing with Python" |
153 |
-HOMEPAGE="https://pytest.org/" |
154 |
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
155 |
- |
156 |
-LICENSE="MIT" |
157 |
-SLOT="0" |
158 |
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos" |
159 |
-IUSE="test" |
160 |
-RESTRICT="!test? ( test )" |
161 |
- |
162 |
-RDEPEND=" |
163 |
- >=dev-python/attrs-19.2.0[${PYTHON_USEDEP}] |
164 |
- $(python_gen_cond_dep ' |
165 |
- dev-python/importlib_metadata[${PYTHON_USEDEP}] |
166 |
- ' python3_7 pypy3) |
167 |
- dev-python/iniconfig[${PYTHON_USEDEP}] |
168 |
- >=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}] |
169 |
- dev-python/packaging[${PYTHON_USEDEP}] |
170 |
- >=dev-python/pluggy-0.12[${PYTHON_USEDEP}] |
171 |
- <dev-python/pluggy-1 |
172 |
- >=dev-python/py-1.8.2[${PYTHON_USEDEP}] |
173 |
- dev-python/toml[${PYTHON_USEDEP}] |
174 |
-" |
175 |
-BDEPEND=" |
176 |
- >=dev-python/setuptools_scm-3.4[${PYTHON_USEDEP}] |
177 |
- test? ( |
178 |
- ${RDEPEND} |
179 |
- $(python_gen_cond_dep ' |
180 |
- dev-python/argcomplete[${PYTHON_USEDEP}] |
181 |
- >=dev-python/hypothesis-3.56[${PYTHON_USEDEP}] |
182 |
- dev-python/mock[${PYTHON_USEDEP}] |
183 |
- dev-python/nose[${PYTHON_USEDEP}] |
184 |
- dev-python/requests[${PYTHON_USEDEP}] |
185 |
- dev-python/xmlschema[${PYTHON_USEDEP}] |
186 |
- ' python3_{7..9} pypy3) |
187 |
- )" |
188 |
- |
189 |
-PATCHES=( |
190 |
- "${FILESDIR}"/${P}-py310.patch |
191 |
-) |
192 |
- |
193 |
-src_test() { |
194 |
- # workaround new readline defaults |
195 |
- echo "set enable-bracketed-paste off" > "${T}"/inputrc || die |
196 |
- local -x INPUTRC="${T}"/inputrc |
197 |
- distutils-r1_src_test |
198 |
-} |
199 |
- |
200 |
-python_test() { |
201 |
- [[ ${EPYTHON} == python3.10 ]] && return |
202 |
- |
203 |
- distutils_install_for_testing --via-root |
204 |
- |
205 |
- "${EPYTHON}" -m pytest -vv --lsof -rfsxX -p no:pkgcore -p no:flaky || |
206 |
- die "Tests failed with ${EPYTHON}" |
207 |
-} |