1 |
commit: c9ec7571f9abe6d942eec8c3899e7c099cb9b74f |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jun 9 18:19:43 2021 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jun 9 20:17:12 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9ec7571 |
7 |
|
8 |
dev-python/pip: Use local virtualenv-16 for testing |
9 |
|
10 |
Fetch and use a local copy of virtualenv-16 instead of using the system |
11 |
package. This removes the for upgrade to virtualenv-20, and it should |
12 |
make maintenance much less painful. |
13 |
|
14 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
15 |
|
16 |
dev-python/pip/Manifest | 1 + |
17 |
.../pip/files/virtualenv-16.7.10-py310.patch | 84 +++++++++++++ |
18 |
dev-python/pip/pip-21.1.2-r1.ebuild | 133 +++++++++++++++++++++ |
19 |
3 files changed, 218 insertions(+) |
20 |
|
21 |
diff --git a/dev-python/pip/Manifest b/dev-python/pip/Manifest |
22 |
index d25199fe58c..e47711af1e9 100644 |
23 |
--- a/dev-python/pip/Manifest |
24 |
+++ b/dev-python/pip/Manifest |
25 |
@@ -1,4 +1,5 @@ |
26 |
DIST pip-21.1.1.tar.gz 8771867 BLAKE2B 1cb920ab52510e816a7c3b8b6d1b47576a27cf1b208ab8fefa102ff36c09eb4e99b34f213a043550a9e6fb37bb8b6306f9e939371661ff7f23ba03f21b4a643b SHA512 05157ed586597f16948afdad43d98cc095803d2d22b1427ac1028ca2a73a26d65e597446808194343ed36f9eb7cb910ac89e73a6a9a90ee868ec822fdbe641c5 |
27 |
DIST pip-21.1.2.tar.gz 8772481 BLAKE2B 23dbcc5dd7e7f66934282b9c93958267eb367d418b6c814032b7b89e0d94c73c143626781b8df081394019d2e575030b7a2fd61bb5221992ce2060cf069e8b04 SHA512 54a2b6074fcb2640868dedcabb5087b79a53a8ad57ec4ab5acf2862b8037403d8f156c2853ab60c2f10c6af999a0a90774f0bc3eca2978a82590935d37af167f |
28 |
DIST setuptools-56.0.0-py3-none-any.whl 784941 BLAKE2B 136352bcaeeb803f94983db2e0f9ec79dacc23a6742a2f6f1b4bdd2b29a104f4965d78f9b4adf1a501c7bf39d4ed85a6786b03489f90872661afbf5e674fd3f9 SHA512 32405236e9c2936cde137bc4d4d07b548391336ce0511cd5677dcd1f85c7a142b0947e03cdceaeb37067874f5aa71daacaa1a6af95ae9fe3ad8af264f61e10f4 |
29 |
+DIST virtualenv-16.7.10.tar.gz 5116776 BLAKE2B 42f0a4b4330850b504f8febd991ef6ecdcbb0821efdd94ca324a8cc34a68a760a8a98de97f0cb2384d8e6cbb0ce8f261995c6433886444e29b75ba0ce09ca12c SHA512 f06d7c354ce1910f04dbcbe1a77e60392653bbe4f638bafbe9284454db2c0e5d63cf9159201d0916fc01aaba91d45fb733b63096c38517fcd83fd00ed8b26d28 |
30 |
DIST wheel-0.36.2-py2.py3-none-any.whl 35046 BLAKE2B bc4e8dab7c74eea34d3b4a813b7eaf6295a99a396a861b6cdd76f743043e89140bad132bdd13e385e8945ce02e0798e1d3ac73fc1b23bde5b2a83e4bb4dd5cdc SHA512 6bb5119b4d3704fe1e3c1eaaa3124edab13f61b46f8a0a8e75974fac4e5b25d8b53606071a03a8d8990ad1cfe2ab247ddea260098df2c0c35ae965be47080284 |
31 |
|
32 |
diff --git a/dev-python/pip/files/virtualenv-16.7.10-py310.patch b/dev-python/pip/files/virtualenv-16.7.10-py310.patch |
33 |
new file mode 100644 |
34 |
index 00000000000..27c17a07445 |
35 |
--- /dev/null |
36 |
+++ b/dev-python/pip/files/virtualenv-16.7.10-py310.patch |
37 |
@@ -0,0 +1,84 @@ |
38 |
+From b4aef0a53ba63c34e45413754705af4e438ef5df Mon Sep 17 00:00:00 2001 |
39 |
+From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@×××××××.cz> |
40 |
+Date: Wed, 5 May 2021 10:59:02 +0200 |
41 |
+Subject: [PATCH] Legacy: Use sysconfig.get_default_scheme() where available |
42 |
+ (#2109) |
43 |
+ |
44 |
+--- |
45 |
+ .pre-commit-config.yaml | 43 ------------------------------------ |
46 |
+ docs/changelog/2109.misc.rst | 1 + |
47 |
+ virtualenv.py | 3 ++- |
48 |
+ 3 files changed, 3 insertions(+), 44 deletions(-) |
49 |
+ delete mode 100644 .pre-commit-config.yaml |
50 |
+ create mode 100644 docs/changelog/2109.misc.rst |
51 |
+ |
52 |
+diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml |
53 |
+deleted file mode 100644 |
54 |
+index 0b8234b7d..000000000 |
55 |
+--- a/.pre-commit-config.yaml |
56 |
++++ /dev/null |
57 |
+@@ -1,43 +0,0 @@ |
58 |
+-repos: |
59 |
+-- repo: https://github.com/ambv/black |
60 |
+- rev: 19.10b0 |
61 |
+- hooks: |
62 |
+- - id: black |
63 |
+- args: [--safe] |
64 |
+- language_version: python3.8 |
65 |
+-- repo: https://github.com/asottile/blacken-docs |
66 |
+- rev: v1.3.0 |
67 |
+- hooks: |
68 |
+- - id: blacken-docs |
69 |
+- additional_dependencies: [black==19.3b0] |
70 |
+- language_version: python3.8 |
71 |
+-- repo: https://github.com/asottile/seed-isort-config |
72 |
+- rev: v1.9.3 |
73 |
+- hooks: |
74 |
+- - id: seed-isort-config |
75 |
+- args: [--application-directories, '.'] |
76 |
+-- repo: https://github.com/pre-commit/mirrors-isort |
77 |
+- rev: v4.3.21 |
78 |
+- hooks: |
79 |
+- - id: isort |
80 |
+-- repo: https://github.com/pre-commit/pre-commit-hooks |
81 |
+- rev: v2.4.0 |
82 |
+- hooks: |
83 |
+- - id: trailing-whitespace |
84 |
+- - id: end-of-file-fixer |
85 |
+- - id: check-yaml |
86 |
+- - id: debug-statements |
87 |
+- - id: check-merge-conflict |
88 |
+- - id: trailing-whitespace |
89 |
+- - id: check-docstring-first |
90 |
+- - id: flake8 |
91 |
+- additional_dependencies: ["flake8-bugbear == 19.8.0"] |
92 |
+- language_version: python3.8 |
93 |
+-- repo: https://github.com/asottile/pyupgrade |
94 |
+- rev: v1.25.1 |
95 |
+- hooks: |
96 |
+- - id: pyupgrade |
97 |
+-- repo: https://github.com/pre-commit/pygrep-hooks |
98 |
+- rev: v1.4.2 |
99 |
+- hooks: |
100 |
+- - id: rst-backticks |
101 |
+diff --git a/docs/changelog/2109.misc.rst b/docs/changelog/2109.misc.rst |
102 |
+new file mode 100644 |
103 |
+index 000000000..985f955df |
104 |
+--- /dev/null |
105 |
++++ b/docs/changelog/2109.misc.rst |
106 |
+@@ -0,0 +1 @@ |
107 |
++Preserve compatibility with Python 3.10 - by ``hroncok`` |
108 |
+diff --git a/virtualenv.py b/virtualenv.py |
109 |
+index 3085d1d18..86aa65674 100755 |
110 |
+--- a/virtualenv.py |
111 |
++++ b/virtualenv.py |
112 |
+@@ -1809,7 +1809,8 @@ def fix_local_scheme(home_dir, symlink=True): |
113 |
+ pass |
114 |
+ else: |
115 |
+ # noinspection PyProtectedMember |
116 |
+- if sysconfig._get_default_scheme() == "posix_local": |
117 |
++ get_scheme = getattr(sysconfig, "get_default_scheme", None) or sysconfig._get_default_scheme |
118 |
++ if get_scheme() == "posix_local": |
119 |
+ local_path = os.path.join(home_dir, "local") |
120 |
+ if not os.path.exists(local_path): |
121 |
+ os.mkdir(local_path) |
122 |
|
123 |
diff --git a/dev-python/pip/pip-21.1.2-r1.ebuild b/dev-python/pip/pip-21.1.2-r1.ebuild |
124 |
new file mode 100644 |
125 |
index 00000000000..69f4adb26c5 |
126 |
--- /dev/null |
127 |
+++ b/dev-python/pip/pip-21.1.2-r1.ebuild |
128 |
@@ -0,0 +1,133 @@ |
129 |
+# Copyright 1999-2021 Gentoo Authors |
130 |
+# Distributed under the terms of the GNU General Public License v2 |
131 |
+ |
132 |
+EAPI=7 |
133 |
+ |
134 |
+PYTHON_COMPAT=( python3_{8..10} pypy3 ) |
135 |
+PYTHON_REQ_USE="ssl(+),threads(+)" |
136 |
+ |
137 |
+inherit bash-completion-r1 distutils-r1 |
138 |
+ |
139 |
+# setuptools & wheel .whl files are required for testing, |
140 |
+# the exact version is not very important. |
141 |
+SETUPTOOLS_WHL="setuptools-56.0.0-py3-none-any.whl" |
142 |
+WHEEL_WHL="wheel-0.36.2-py2.py3-none-any.whl" |
143 |
+# upstream still requires virtualenv-16 for testing, we are now fetching |
144 |
+# it directly to avoid blockers with virtualenv-20 |
145 |
+VENV_PV=16.7.10 |
146 |
+ |
147 |
+DESCRIPTION="Installs python packages -- replacement for easy_install" |
148 |
+HOMEPAGE=" |
149 |
+ https://pip.pypa.io/en/stable/ |
150 |
+ https://pypi.org/project/pip/ |
151 |
+ https://github.com/pypa/pip/" |
152 |
+SRC_URI=" |
153 |
+ https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz |
154 |
+ test? ( |
155 |
+ https://files.pythonhosted.org/packages/py3/s/setuptools/${SETUPTOOLS_WHL} |
156 |
+ https://files.pythonhosted.org/packages/py2.py3/w/wheel/${WHEEL_WHL} |
157 |
+ https://github.com/pypa/virtualenv/archive/${VENV_PV}.tar.gz |
158 |
+ -> virtualenv-${VENV_PV}.tar.gz |
159 |
+ ) |
160 |
+" |
161 |
+ |
162 |
+LICENSE="MIT" |
163 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos" |
164 |
+SLOT="0" |
165 |
+IUSE="test vanilla" |
166 |
+RESTRICT="!test? ( test )" |
167 |
+ |
168 |
+RDEPEND=" |
169 |
+ >=dev-python/setuptools-39.2.0[${PYTHON_USEDEP}] |
170 |
+" |
171 |
+BDEPEND=" |
172 |
+ ${RDEPEND} |
173 |
+ test? ( |
174 |
+ dev-python/cryptography[${PYTHON_USEDEP}] |
175 |
+ dev-python/freezegun[${PYTHON_USEDEP}] |
176 |
+ dev-python/pretend[${PYTHON_USEDEP}] |
177 |
+ dev-python/pytest[${PYTHON_USEDEP}] |
178 |
+ dev-python/scripttest[${PYTHON_USEDEP}] |
179 |
+ dev-python/werkzeug[${PYTHON_USEDEP}] |
180 |
+ dev-python/wheel[${PYTHON_USEDEP}] |
181 |
+ ) |
182 |
+" |
183 |
+ |
184 |
+python_prepare_all() { |
185 |
+ local PATCHES=( |
186 |
+ "${FILESDIR}/${PN}-21.1-no-coverage.patch" |
187 |
+ ) |
188 |
+ if ! use vanilla; then |
189 |
+ PATCHES+=( "${FILESDIR}/pip-20.0.2-disable-system-install.patch" ) |
190 |
+ fi |
191 |
+ |
192 |
+ distutils-r1_python_prepare_all |
193 |
+ |
194 |
+ if use test; then |
195 |
+ mkdir tests/data/common_wheels/ || die |
196 |
+ cp "${DISTDIR}"/{${SETUPTOOLS_WHL},${WHEEL_WHL}} \ |
197 |
+ tests/data/common_wheels/ || die |
198 |
+ |
199 |
+ pushd "${WORKDIR}/virtualenv-${VENV_PV}" 2>/dev/null || die |
200 |
+ eapply "${FILESDIR}/virtualenv-${VENV_PV}-py310.patch" |
201 |
+ popd 2>/dev/null || die |
202 |
+ fi |
203 |
+} |
204 |
+ |
205 |
+python_test() { |
206 |
+ if [[ ${EPYTHON} == pypy* ]]; then |
207 |
+ ewarn "Skipping tests on ${EPYTHON} since they are very broken" |
208 |
+ return 0 |
209 |
+ fi |
210 |
+ |
211 |
+ local deselect=( |
212 |
+ tests/functional/test_install.py::test_double_install_fail |
213 |
+ tests/functional/test_list.py::test_multiple_exclude_and_normalization |
214 |
+ 'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-download]' |
215 |
+ 'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-install]' |
216 |
+ 'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-list]' |
217 |
+ 'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-wheel]' |
218 |
+ tests/functional/test_install.py::test_install_pip_does_not_modify_pip_when_satisfied |
219 |
+ # Internet |
220 |
+ tests/functional/test_install.py::test_install_editable_with_prefix_setup_cfg |
221 |
+ ) |
222 |
+ |
223 |
+ [[ ${EPYTHON} == python3.10 ]] && deselect+=( |
224 |
+ tests/lib/test_lib.py::test_correct_pip_version |
225 |
+ # uses vendored packaging that uses deprecated distutils |
226 |
+ tests/functional/test_warning.py::test_pip_works_with_warnings_as_errors |
227 |
+ ) |
228 |
+ |
229 |
+ distutils_install_for_testing |
230 |
+ pushd "${WORKDIR}/virtualenv-${VENV_PV}" 2>/dev/null || die |
231 |
+ distutils_install_for_testing |
232 |
+ popd 2>/dev/null || die |
233 |
+ |
234 |
+ local -x GENTOO_PIP_TESTING=1 \ |
235 |
+ PATH="${TEST_DIR}/scripts:${PATH}" \ |
236 |
+ PYTHONPATH="${TEST_DIR}/lib:${BUILD_DIR}/lib" |
237 |
+ epytest ${deselect[@]/#/--deselect } -m "not network" |
238 |
+} |
239 |
+ |
240 |
+python_install_all() { |
241 |
+ # Prevent dbus auto-launch |
242 |
+ # https://bugs.gentoo.org/692178 |
243 |
+ export DBUS_SESSION_BUS_ADDRESS="disabled:" |
244 |
+ |
245 |
+ local DOCS=( AUTHORS.txt docs/html/**/*.rst ) |
246 |
+ distutils-r1_python_install_all |
247 |
+ |
248 |
+ COMPLETION="${T}"/completion.tmp |
249 |
+ |
250 |
+ # 'pip completion' command embeds full $0 into completion script, which confuses |
251 |
+ # 'complete' and causes QA warning when running as "${PYTHON} -m pip". |
252 |
+ # This trick sets correct $0 while still calling just installed pip. |
253 |
+ local pipcmd='import sys; sys.argv[0] = "pip"; from pip._internal.cli.main import main; sys.exit(main())' |
254 |
+ |
255 |
+ ${PYTHON} -c "${pipcmd}" completion --bash > "${COMPLETION}" || die |
256 |
+ newbashcomp "${COMPLETION}" ${PN} |
257 |
+ |
258 |
+ ${PYTHON} -c "${pipcmd}" completion --zsh > "${COMPLETION}" || die |
259 |
+ insinto /usr/share/zsh/site-functions |
260 |
+ newins "${COMPLETION}" _pip |
261 |
+} |