commit: 5654e58a6f91d33c53ab390ad9bf5b17a722f23a Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Thu Jul 21 16:50:34 2022 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Thu Jul 21 20:17:33 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5654e58a
dev-python/pip: Bump to 22.2 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> dev-python/pip/Manifest | 1 + dev-python/pip/files/pip-22.2-no-coverage.patch | 52 ++++++++++ dev-python/pip/pip-22.2.ebuild | 132 ++++++++++++++++++++++++ 3 files changed, 185 insertions(+) diff --git a/dev-python/pip/Manifest b/dev-python/pip/Manifest index 3bae51442e9f..bd7ad8308546 100644 --- a/dev-python/pip/Manifest +++ b/dev-python/pip/Manifest @@ -1,4 +1,5 @@ DIST pip-22.1.2.gh.tar.gz 9346675 BLAKE2B f709f8977d467d5a3170884bb75cd2f74a2f40801ae02a3725d442e18e4073f9c4a39cd1c9d2ce3949eb888be69d151f67d0cf2d0cbad7e2ec1ec6e78150b5c7 SHA512 7dd13150023f1cca8f5e01da7688ae418b5d0b36364efcfc15374a5147c7cabd46ff1d34e6499bc8e182dc0d34a366f5fe21d8ab4de4d112d269a97200401305 +DIST pip-22.2.gh.tar.gz 9278410 BLAKE2B e32fe63e81593a0ec9c0110af0f07f1a47ddd3d6c660c11e9eb9142c251b7f45e3a1cc343193b123364a6a3a69490add7d4ebb368aac027c448f00f7cd163d7c SHA512 2ff3f9c2dc84c65c14c978e8c58cd3cee6cfff9753655c726763d6d7780d147479f32c47873d402ad9e0821fef940b971a7df93fabd6b998f07dea5af1251c9b DIST setuptools-62.3.2-py3-none-any.whl 1225929 BLAKE2B 608952e201f749ebf557e3962ba9856d5bdcbc534f3a25598cab0d6c53282cfb3b9f007ba135497a8addf49db4c02bc4387c486d95a4529d01ce4114154ec28a SHA512 366d69dc44e326dd7549cdacd8dec481a14dce4feef4338adc38b9de5c4c338f04d61696e13ce8603be1315f2e8734100f92d3fe4b4b11843e19f550c9631978 DIST virtualenv-16.7.12.gh.tar.gz 8906590 BLAKE2B a1f206769e4e5797562906162e492e44c4a72720e4f88a0362dc802ce2df20c65aaab6a72dce2238445601a10fae59bd90cd362217994d30911f105afd71c5fa SHA512 0278b33fb19f6553e70ad3dcffa6ea1a455ff435b216ac9b4fadff216b2932714faa2bb6027af3058010111d8511a5c2fcd424f31c9645be361603971f111c8e DIST wheel-0.36.2-py2.py3-none-any.whl 35046 BLAKE2B bc4e8dab7c74eea34d3b4a813b7eaf6295a99a396a861b6cdd76f743043e89140bad132bdd13e385e8945ce02e0798e1d3ac73fc1b23bde5b2a83e4bb4dd5cdc SHA512 6bb5119b4d3704fe1e3c1eaaa3124edab13f61b46f8a0a8e75974fac4e5b25d8b53606071a03a8d8990ad1cfe2ab247ddea260098df2c0c35ae965be47080284 diff --git a/dev-python/pip/files/pip-22.2-no-coverage.patch b/dev-python/pip/files/pip-22.2-no-coverage.patch new file mode 100644 index 000000000000..20a5fa4beabf --- /dev/null +++ b/dev-python/pip/files/pip-22.2-no-coverage.patch @@ -0,0 +1,52 @@ +From 75292c12ee2062f7d035b326b652ba6cffb8480d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <[email protected]> +Date: Sat, 23 Oct 2021 08:11:11 +0200 +Subject: [PATCH] Disable coverage testing support inside test venvs + +--- + tests/conftest.py | 15 --------------- + 1 file changed, 15 deletions(-) + +diff --git a/tests/conftest.py b/tests/conftest.py +index 210ff0f4e..e5c0d2ef0 100644 +--- a/tests/conftest.py ++++ b/tests/conftest.py +@@ -382,13 +382,6 @@ def wheel_install(tmpdir_factory: pytest.TempPathFactory, common_wheels: Path) - + return _common_wheel_editable_install(tmpdir_factory, common_wheels, "wheel") + + [email protected](scope="session") +-def coverage_install( +- tmpdir_factory: pytest.TempPathFactory, common_wheels: Path +-) -> Path: +- return _common_wheel_editable_install(tmpdir_factory, common_wheels, "coverage") +- +- + def install_egg_link( + venv: VirtualEnvironment, project_name: str, egg_info_dir: Path + ) -> None: +@@ -404,7 +397,6 @@ def virtualenv_template( + tmpdir_factory: pytest.TempPathFactory, + pip_src: Path, + setuptools_install: Path, +- coverage_install: Path, + ) -> Iterator[VirtualEnvironment]: + + venv_type: VirtualEnvironmentType +@@ -431,13 +423,6 @@ def virtualenv_template( + [os.fspath(venv.bin / "python"), "setup.py", "-q", "develop"], cwd=pip_editable + ) + +- # Install coverage and pth file for executing it in any spawned processes +- # in this virtual environment. +- install_egg_link(venv, "coverage", coverage_install) +- # zz prefix ensures the file is after easy-install.pth. +- with open(venv.site / "zz-coverage-helper.pth", "a") as f: +- f.write("import coverage; coverage.process_startup()") +- + # Drop (non-relocatable) launchers. + for exe in os.listdir(venv.bin): + if not ( +-- +2.35.1 + diff --git a/dev-python/pip/pip-22.2.ebuild b/dev-python/pip/pip-22.2.ebuild new file mode 100644 index 000000000000..aca0d2742dac --- /dev/null +++ b/dev-python/pip/pip-22.2.ebuild @@ -0,0 +1,132 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_TESTED=( python3_{8..10} ) +PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" python3_11 pypy3 ) +PYTHON_REQ_USE="ssl(+),threads(+)" + +inherit bash-completion-r1 distutils-r1 multiprocessing + +# setuptools & wheel .whl files are required for testing, +# the exact version is not very important. +SETUPTOOLS_WHL="setuptools-62.3.2-py3-none-any.whl" +WHEEL_WHL="wheel-0.36.2-py2.py3-none-any.whl" +# upstream still requires virtualenv-16 for testing, we are now fetching +# it directly to avoid blockers with virtualenv-20 +VENV_PV=16.7.12 + +DESCRIPTION="The PyPA recommended tool for installing Python packages" +HOMEPAGE=" + https://pip.pypa.io/en/stable/ + https://pypi.org/project/pip/ + https://github.com/pypa/pip/ +" +SRC_URI=" + https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.gz + test? ( + https://files.pythonhosted.org/packages/py3/s/setuptools/${SETUPTOOLS_WHL} + https://files.pythonhosted.org/packages/py2.py3/w/wheel/${WHEEL_WHL} + https://github.com/pypa/virtualenv/archive/${VENV_PV}.tar.gz + -> virtualenv-${VENV_PV}.gh.tar.gz + ) +" + +LICENSE="MIT" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +SLOT="0" +IUSE="vanilla" + +RDEPEND=" + >=dev-python/setuptools-39.2.0[${PYTHON_USEDEP}] +" +BDEPEND=" + ${RDEPEND} + test? ( + $(python_gen_cond_dep ' + dev-python/freezegun[${PYTHON_USEDEP}] + dev-python/pretend[${PYTHON_USEDEP}] + dev-python/pytest-xdist[${PYTHON_USEDEP}] + dev-python/scripttest[${PYTHON_USEDEP}] + dev-python/tomli-w[${PYTHON_USEDEP}] + dev-python/werkzeug[${PYTHON_USEDEP}] + dev-python/wheel[${PYTHON_USEDEP}] + !alpha? ( !hppa? ( !ia64? ( + dev-python/cryptography[${PYTHON_USEDEP}] + ) ) ) + ' "${PYTHON_TESTED[@]}") + ) +" + +distutils_enable_tests pytest + +python_prepare_all() { + local PATCHES=( + "${FILESDIR}/pip-22.2-no-coverage.patch" + ) + if ! use vanilla; then + PATCHES+=( "${FILESDIR}/pip-20.0.2-disable-system-install.patch" ) + fi + + distutils-r1_python_prepare_all + + if use test; then + mkdir tests/data/common_wheels/ || die + cp "${DISTDIR}"/{${SETUPTOOLS_WHL},${WHEEL_WHL}} \ + tests/data/common_wheels/ || die + fi +} + +python_compile_all() { + # 'pip completion' command embeds full $0 into completion script, which confuses + # 'complete' and causes QA warning when running as "${PYTHON} -m pip". + # This trick sets correct $0 while still calling just installed pip. + local pipcmd='import sys; sys.argv[0] = "pip"; __file__ = ""; from pip._internal.cli.main import main; sys.exit(main())' + "${EPYTHON}" -c "${pipcmd}" completion --bash > completion.bash || die + "${EPYTHON}" -c "${pipcmd}" completion --zsh > completion.zsh || die +} + +python_test() { + if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then + einfo "Skipping tests on ${EPYTHON} since virtualenv-16 is broken" + return 0 + fi + + local EPYTEST_DESELECT=( + tests/functional/test_inspect.py::test_inspect_basic + tests/functional/test_install.py::test_double_install_fail + tests/functional/test_list.py::test_multiple_exclude_and_normalization + # Internet + tests/functional/test_install.py::test_install_dry_run + tests/functional/test_install.py::test_install_editable_with_prefix_setup_cfg + tests/functional/test_install.py::test_editable_install__local_dir_no_setup_py_with_pyproject + tests/functional/test_install.py::test_editable_install__local_dir_setup_requires_with_pyproject + ) + + if ! has_version "dev-python/cryptography[${PYTHON_USEDEP}]"; then + EPYTEST_DESELECT+=( + tests/functional/test_install.py::test_install_sends_client_cert + tests/functional/test_install_config.py::test_do_not_prompt_for_authentication + tests/functional/test_install_config.py::test_prompt_for_authentication + tests/functional/test_install_config.py::test_prompt_for_keyring_if_needed + ) + fi + + local -x GENTOO_PIP_TESTING=1 + local -x PYTHONPATH="${WORKDIR}/virtualenv-${VENV_PV}" + local -x SETUPTOOLS_USE_DISTUTILS=stdlib + local -x PIP_DISABLE_PIP_VERSION_CHECK=1 + epytest -m "not network" -n "$(makeopts_jobs)" +} + +python_install_all() { + local DOCS=( AUTHORS.txt docs/html/**/*.rst ) + distutils-r1_python_install_all + + newbashcomp completion.bash pip + + insinto /usr/share/zsh/site-functions + newins completion.zsh _pip +}
