From 2771f79232c273bc2a57d23bf335dd81ccf6af28 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 5 Dec 2021 02:47:11 +0000 Subject: gentoo resync : 05.12.2021 --- dev-python/pip/Manifest | 7 +- dev-python/pip/files/pip-21.1-no-coverage.patch | 51 -------- .../pip/files/pip-21.3.1-cryptography-tests.patch | 39 ++++++ dev-python/pip/pip-21.2.4.ebuild | 129 ------------------ dev-python/pip/pip-21.3.1-r1.ebuild | 144 +++++++++++++++++++++ dev-python/pip/pip-21.3.1.ebuild | 28 +++- 6 files changed, 209 insertions(+), 189 deletions(-) delete mode 100644 dev-python/pip/files/pip-21.1-no-coverage.patch create mode 100644 dev-python/pip/files/pip-21.3.1-cryptography-tests.patch delete mode 100644 dev-python/pip/pip-21.2.4.ebuild create mode 100644 dev-python/pip/pip-21.3.1-r1.ebuild (limited to 'dev-python/pip') diff --git a/dev-python/pip/Manifest b/dev-python/pip/Manifest index 0604b5d7d858..cc93deb17682 100644 --- a/dev-python/pip/Manifest +++ b/dev-python/pip/Manifest @@ -1,11 +1,10 @@ AUX pip-20.0.2-disable-system-install.patch 1298 BLAKE2B a384ee2114e59b8bc719fc14270cf6efbe8914854c404395beb1126db3278683b940e8fcfee83423d78e2aed6521e0bc57566ab0f5618f473262bbd9b7b0bffa SHA512 d2772105d4f4f880606e1e8ab3381af6768a96604a5fdcaa155dd42f8eea731c3a1b733b027d3e591d81f962ba14758b19da4a2c6c12946cd9a9d77c51ca4e78 -AUX pip-21.1-no-coverage.patch 1905 BLAKE2B d09ebb459bd3f0d7d1f5194c635489aa162d5ed4f3fb75e1352eb80f96a49aef51e7d5e72859321f1558b6a6df9bd0000acdf653dd301a839891078e4a26dd16 SHA512 46afc9f5f290e3547bc18f104fae515a06163f622fd43f7b1e49ae47c720e4aa4fd01c97f171cab24305eddd71f5083ba1d3109a67f2f84e46e5320f4ab7f0bf AUX pip-21.3-no-coverage.patch 1820 BLAKE2B f515e324f043fa8548f9add2fecf1f4d09c2487d695c429f870a6cd1ee9a228717c4fb152faa99a74d75d3b1998a5e7e93f710e2acd096f107f23091875f1f11 SHA512 b386e8116009f43013fe600d1f3928931a6595105bdd782266eeab85ba0f5a0743c7ccfbf2cab018d2ee0646b832573c56aad009e4b074dd805011d0a810348d -DIST pip-21.2.4.tar.gz 8786693 BLAKE2B 02d4cdd3d9feda2d4daaf7552bf86e068d2f040ef9836a128c8dfc36697594d6a7d830cc58dc4f2d42c22fec0230f3055ab8b5b204bfd1fb0b9429e2dd44f537 SHA512 3c018601bca60d865032962deaf0ba4943fc6c3f3d8d69dab65f987737daf7fa91492c8250ab36988d1fa5f22b20608ada88ac1ffde914a7d72485bf5164b45f +AUX pip-21.3.1-cryptography-tests.patch 1699 BLAKE2B bbc589c47c125b562238deb7352f4c186111cb32cf659f1cccbe84b465312a8b810792be80209d80aa63f2c55f51c95f94e48ee767011ab4639d45da3ad3677f SHA512 cc314a0d64b51beb3f300e24e192880d6a633f6ac29d1d13ee282f97f3c23880aa712de3efb990820d0c4203d0cf64c05503d93a09622b54ed85f41eaa7cb9bf DIST pip-21.3.1.tar.gz 8961896 BLAKE2B f694956854cfd26f9b043fc28994448d2b2efff04080808f4e89ba15905887b432efb02d1c81370f75bd42e5c615a5a2360af63437967bc2fef63a85d59906a7 SHA512 2f50f95fe36cffc18821a70824f5b28d03598894f9ea5b02acc4921d16fc7739131814828a2159bcd577331cc780c7776a3669fa1ca2d4690c861add10a16f00 DIST setuptools-57.4.0-py3-none-any.whl 819017 BLAKE2B afba86cf9aeea58ee869fdc11bbb192abbf2f89710e468b90dc291fec228ca16202483e36195a5ad4e2b8d210326bc83e2be6ec696ab413d94ffaeb05bb9c030 SHA512 9bf230f4e0e72acab07ab372a6ca05adb3d175a8079d2f73d327c632f3d27b8ee10442d3e60f4c94a6e61d5ba2212fc78187ca6e1717e15bb570bdce4263fd0b DIST virtualenv-16.7.11.tar.gz 8134533 BLAKE2B ea81e11c210d911bf9576edf7b1754721b270adcc5d9633415d33b8f659149d64932fe2d366200121ec00c266c25dae380e248add438fc357477114eba4dfb4e SHA512 82d0d2a964508511e8e1686703581ff543f65791dc2449d9741d46ea57c4c89673947d2477ba374176f05fcea2a5ca572aa650c61c4f3271c4d73d1ff9d9ff42 DIST wheel-0.36.2-py2.py3-none-any.whl 35046 BLAKE2B bc4e8dab7c74eea34d3b4a813b7eaf6295a99a396a861b6cdd76f743043e89140bad132bdd13e385e8945ce02e0798e1d3ac73fc1b23bde5b2a83e4bb4dd5cdc SHA512 6bb5119b4d3704fe1e3c1eaaa3124edab13f61b46f8a0a8e75974fac4e5b25d8b53606071a03a8d8990ad1cfe2ab247ddea260098df2c0c35ae965be47080284 -EBUILD pip-21.2.4.ebuild 4259 BLAKE2B d02c6560081fff5ebc816230070cbcb809bab306ba6ec532311a722a0b1238f56f8660e140c0b0b3b029f27d9aa8bb80cc9594d0579b53c4c4d745e32a1e72e0 SHA512 9f6652ebddd0e5529adf527d3fc4946745fe77197ad9385b41a9ca519212bd6b97361250f7b711f619053ca43453f8c58d518280674794c945dc80606293a64a -EBUILD pip-21.3.1.ebuild 4462 BLAKE2B cbd00ed892144ddbc54055e3d07e0b0a7b3073c7df66e689b854eb52b73ab9d744ad6597e87e5b3ead4ae3831fca14369ea673083cd075636bb7677274ad293a SHA512 11e172d77104ed1069ec1860087cba07c895e6b067c2be6ad714aad89e8c1907e2d934d77377011b350a78c68e620efbeaeeec6a22c65d678567745885ff2214 +EBUILD pip-21.3.1-r1.ebuild 4951 BLAKE2B 2cf16db1fce25dd9b2e6c020d400e44778fa72bf78b0497098771479bad73d2e985d848cbdc4b27ae6b29ee08ac2eef24873441dbab5f9b8223b17b48b57a260 SHA512 9a8ee29e51f8853be563d5f8ac6023891edb2467337b6a39e021fd1929788b096877777a4c6f88e30a94d97fe53c10ca71cd763185ec47e265acd6b07794d143 +EBUILD pip-21.3.1.ebuild 5086 BLAKE2B fb28ecdcc8efe3ff881f853071f3d588bde8f32dc415919e39b0ac8f2e004c4b50ebe4c23a369ac9df8bca620578b8c7498ea44d9ce3012ed954b44645e948d3 SHA512 8bb100dcb2a996d09c5ddc500fc610646c3b8fdc00af49cc39bbc1bf399db761284392e1a2958a54a230498fedec16fcf4494c7e8017a51b71c2446d82484234 MISC metadata.xml 392 BLAKE2B 94ea3de1220cb9ca64ae1186597789cc83a54adfe44695932c07dd5065df0e5f9ee5078a495e3a12563b36809d781d8ab86bb6c92c485c023199d92547b74f27 SHA512 603199f6547105f3bb64f4fcaf004e9ef62fa2e0f8ec6eab56078119684b0f5119161e0f164fe02b2cf6dd6b115588c9ef77d727eeb6d138e281f1cb0bcb5de9 diff --git a/dev-python/pip/files/pip-21.1-no-coverage.patch b/dev-python/pip/files/pip-21.1-no-coverage.patch deleted file mode 100644 index 5f9c836d32ea..000000000000 --- a/dev-python/pip/files/pip-21.1-no-coverage.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 66ca1e64ce3fb971ec30d5f8b2a0bda49721bc2d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= -Date: Wed, 29 Jul 2020 07:42:25 +0200 -Subject: [PATCH] Disable coverage testing support inside test venvs - ---- - tests/conftest.py | 14 +------------- - 1 file changed, 1 insertion(+), 13 deletions(-) - -diff --git a/tests/conftest.py b/tests/conftest.py -index a53e0c4f7..c91d1e1ae 100644 ---- a/tests/conftest.py -+++ b/tests/conftest.py -@@ -315,11 +315,6 @@ def wheel_install(tmpdir_factory, common_wheels): - return _common_wheel_editable_install(tmpdir_factory, common_wheels, "wheel") - - --@pytest.fixture(scope="session") --def coverage_install(tmpdir_factory, common_wheels): -- return _common_wheel_editable_install(tmpdir_factory, common_wheels, "coverage") -- -- - def install_egg_link(venv, project_name, egg_info_dir): - with open(venv.site / "easy-install.pth", "a") as fp: - fp.write(str(egg_info_dir.resolve()) + "\n") -@@ -329,7 +324,7 @@ def install_egg_link(venv, project_name, egg_info_dir): - - @pytest.fixture(scope="session") - def virtualenv_template( -- request, tmpdir_factory, pip_src, setuptools_install, coverage_install -+ request, tmpdir_factory, pip_src, setuptools_install - ): - - if request.config.getoption("--use-venv"): -@@ -355,13 +350,6 @@ def virtualenv_template( - [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.31.1 - diff --git a/dev-python/pip/files/pip-21.3.1-cryptography-tests.patch b/dev-python/pip/files/pip-21.3.1-cryptography-tests.patch new file mode 100644 index 000000000000..1505d487ad40 --- /dev/null +++ b/dev-python/pip/files/pip-21.3.1-cryptography-tests.patch @@ -0,0 +1,39 @@ +From 8fa5d719a3c902ca9b6c9198229b7a67fecf8b8e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= +Date: Fri, 26 Nov 2021 16:12:16 +0100 +Subject: [PATCH] Move cryptography-based imports into the fixture + +Move the imports that require cryptography into the cert_factory +fixture. This makes it possible to deselect these tests on systems +where cryptography cannot be installed. +--- + tests/conftest.py | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/tests/conftest.py b/tests/conftest.py +index 076aeaf19..bab6ab3f5 100644 +--- a/tests/conftest.py ++++ b/tests/conftest.py +@@ -27,7 +27,6 @@ from pip._internal.cli.main import main as pip_entry_point + from pip._internal.locations import _USE_SYSCONFIG + from pip._internal.utils.temp_dir import global_tempdir_manager + from tests.lib import DATA_DIR, SRC_DIR, PipTestEnvironment, TestData +-from tests.lib.certs import make_tls_cert, serialize_cert, serialize_key + from tests.lib.path import Path + from tests.lib.server import MockServer as _MockServer + from tests.lib.server import make_mock_server, server_running +@@ -535,6 +534,11 @@ def deprecated_python() -> bool: + + @pytest.fixture(scope="session") + def cert_factory(tmpdir_factory: pytest.TempdirFactory) -> Callable[[], str]: ++ # Delay the import requiring cryptography in order to make it possible ++ # to deselect relevant tests on systems where cryptography cannot ++ # be installed. ++ from tests.lib.certs import make_tls_cert, serialize_cert, serialize_key ++ + def factory() -> str: + """Returns path to cert/key file.""" + output_path = Path(str(tmpdir_factory.mktemp("certs"))) / "cert.pem" +-- +2.34.1 + diff --git a/dev-python/pip/pip-21.2.4.ebuild b/dev-python/pip/pip-21.2.4.ebuild deleted file mode 100644 index 791ed303685d..000000000000 --- a/dev-python/pip/pip-21.2.4.ebuild +++ /dev/null @@ -1,129 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..10} pypy3 ) -PYTHON_REQ_USE="ssl(+),threads(+)" - -inherit bash-completion-r1 distutils-r1 - -# setuptools & wheel .whl files are required for testing, -# the exact version is not very important. -SETUPTOOLS_WHL="setuptools-57.4.0-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.11 - -DESCRIPTION="Installs python packages -- replacement for easy_install" -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}.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}.tar.gz - ) -" - -LICENSE="MIT" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos" -SLOT="0" -IUSE="test vanilla" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-python/setuptools-39.2.0[${PYTHON_USEDEP}] -" -BDEPEND=" - ${RDEPEND} - test? ( - dev-python/cryptography[${PYTHON_USEDEP}] - dev-python/freezegun[${PYTHON_USEDEP}] - dev-python/pretend[${PYTHON_USEDEP}] - dev-python/pytest[${PYTHON_USEDEP}] - dev-python/scripttest[${PYTHON_USEDEP}] - dev-python/werkzeug[${PYTHON_USEDEP}] - dev-python/wheel[${PYTHON_USEDEP}] - ) -" - -python_prepare_all() { - local PATCHES=( - "${FILESDIR}/${PN}-21.1-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_test() { - if [[ ${EPYTHON} == pypy* ]]; then - ewarn "Skipping tests on ${EPYTHON} since they are very broken" - return 0 - fi - - local deselect=( - tests/functional/test_install.py::test_double_install_fail - tests/functional/test_list.py::test_multiple_exclude_and_normalization - 'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-download]' - 'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-install]' - 'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-list]' - 'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-wheel]' - tests/functional/test_install.py::test_install_pip_does_not_modify_pip_when_satisfied - # Internet - tests/functional/test_install.py::test_install_editable_with_prefix_setup_cfg - ) - - [[ ${EPYTHON} == python3.10 ]] && deselect+=( - tests/lib/test_lib.py::test_correct_pip_version - # uses vendored packaging that uses deprecated distutils - tests/functional/test_warning.py::test_pip_works_with_warnings_as_errors - ) - - distutils_install_for_testing - pushd "${WORKDIR}/virtualenv-${VENV_PV}" >/dev/null || die - distutils_install_for_testing - popd >/dev/null || die - - local -x GENTOO_PIP_TESTING=1 \ - PATH="${TEST_DIR}/scripts:${PATH}" \ - PYTHONPATH="${TEST_DIR}/lib:${BUILD_DIR}/lib" - epytest ${deselect[@]/#/--deselect } -m "not network" -} - -python_install_all() { - # Prevent dbus auto-launch - # https://bugs.gentoo.org/692178 - export DBUS_SESSION_BUS_ADDRESS="disabled:" - - local DOCS=( AUTHORS.txt docs/html/**/*.rst ) - distutils-r1_python_install_all - - COMPLETION="${T}"/completion.tmp - - # '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"; from pip._internal.cli.main import main; sys.exit(main())' - - ${PYTHON} -c "${pipcmd}" completion --bash > "${COMPLETION}" || die - newbashcomp "${COMPLETION}" ${PN} - - ${PYTHON} -c "${pipcmd}" completion --zsh > "${COMPLETION}" || die - insinto /usr/share/zsh/site-functions - newins "${COMPLETION}" _pip -} diff --git a/dev-python/pip/pip-21.3.1-r1.ebuild b/dev-python/pip/pip-21.3.1-r1.ebuild new file mode 100644 index 000000000000..e56b30120dfd --- /dev/null +++ b/dev-python/pip/pip-21.3.1-r1.ebuild @@ -0,0 +1,144 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..10} pypy3 ) +PYTHON_REQ_USE="ssl(+),threads(+)" + +inherit bash-completion-r1 distutils-r1 + +# setuptools & wheel .whl files are required for testing, +# the exact version is not very important. +SETUPTOOLS_WHL="setuptools-57.4.0-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.11 + +DESCRIPTION="Installs python packages -- replacement for easy_install" +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}.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}.tar.gz + ) +" + +LICENSE="MIT" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86" +SLOT="0" +IUSE="test vanilla" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-python/setuptools-39.2.0[${PYTHON_USEDEP}] +" +BDEPEND=" + ${RDEPEND} + test? ( + dev-python/freezegun[${PYTHON_USEDEP}] + dev-python/pretend[${PYTHON_USEDEP}] + dev-python/pytest[${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_prepare_all() { + local PATCHES=( + "${FILESDIR}/${PN}-21.3-no-coverage.patch" + "${FILESDIR}/${P}-cryptography-tests.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_test() { + if [[ ${EPYTHON} == pypy* ]]; then + ewarn "Skipping tests on ${EPYTHON} since they are very broken" + return 0 + fi + + local EPYTEST_DESELECT=( + tests/functional/test_install.py::test_double_install_fail + tests/functional/test_list.py::test_multiple_exclude_and_normalization + 'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-download]' + 'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-install]' + 'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-list]' + 'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-wheel]' + tests/functional/test_install.py::test_install_pip_does_not_modify_pip_when_satisfied + # Internet + 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 + ) + + [[ ${EPYTHON} == python3.10 ]] && EPYTEST_DESELECT+=( + tests/lib/test_lib.py::test_correct_pip_version + # uses vendored packaging that uses deprecated distutils + tests/functional/test_warning.py::test_pip_works_with_warnings_as_errors + ) + + 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 + + distutils_install_for_testing + pushd "${WORKDIR}/virtualenv-${VENV_PV}" >/dev/null || die + distutils_install_for_testing + popd >/dev/null || die + + local -x GENTOO_PIP_TESTING=1 \ + PATH="${TEST_DIR}/scripts:${PATH}" \ + PYTHONPATH="${TEST_DIR}/lib:${BUILD_DIR}/lib" + epytest -m "not network" +} + +python_install_all() { + # Prevent dbus auto-launch + # https://bugs.gentoo.org/692178 + export DBUS_SESSION_BUS_ADDRESS="disabled:" + + local DOCS=( AUTHORS.txt docs/html/**/*.rst ) + distutils-r1_python_install_all + + COMPLETION="${T}"/completion.tmp + + # '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"; from pip._internal.cli.main import main; sys.exit(main())' + + ${PYTHON} -c "${pipcmd}" completion --bash > "${COMPLETION}" || die + newbashcomp "${COMPLETION}" ${PN} + + ${PYTHON} -c "${pipcmd}" completion --zsh > "${COMPLETION}" || die + insinto /usr/share/zsh/site-functions + newins "${COMPLETION}" _pip +} diff --git a/dev-python/pip/pip-21.3.1.ebuild b/dev-python/pip/pip-21.3.1.ebuild index f29173c59434..deed1e87f702 100644 --- a/dev-python/pip/pip-21.3.1.ebuild +++ b/dev-python/pip/pip-21.3.1.ebuild @@ -32,7 +32,7 @@ SRC_URI=" " LICENSE="MIT" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos" SLOT="0" IUSE="test vanilla" RESTRICT="!test? ( test )" @@ -43,19 +43,22 @@ RDEPEND=" BDEPEND=" ${RDEPEND} test? ( - dev-python/cryptography[${PYTHON_USEDEP}] dev-python/freezegun[${PYTHON_USEDEP}] dev-python/pretend[${PYTHON_USEDEP}] dev-python/pytest[${PYTHON_USEDEP}] dev-python/scripttest[${PYTHON_USEDEP}] dev-python/werkzeug[${PYTHON_USEDEP}] dev-python/wheel[${PYTHON_USEDEP}] + !alpha? ( !hppa? ( !ia64? ( + dev-python/cryptography[${PYTHON_USEDEP}] + ) ) ) ) " python_prepare_all() { local PATCHES=( "${FILESDIR}/${PN}-21.3-no-coverage.patch" + "${FILESDIR}/${P}-cryptography-tests.patch" ) if ! use vanilla; then PATCHES+=( "${FILESDIR}/pip-20.0.2-disable-system-install.patch" ) @@ -76,7 +79,7 @@ python_test() { return 0 fi - local deselect=( + local EPYTEST_DESELECT=( tests/functional/test_install.py::test_double_install_fail tests/functional/test_list.py::test_multiple_exclude_and_normalization 'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-download]' @@ -90,12 +93,27 @@ python_test() { tests/functional/test_install.py::test_editable_install__local_dir_setup_requires_with_pyproject ) - [[ ${EPYTHON} == python3.10 ]] && deselect+=( + local EPYTEST_IGNORE=( + # require tomli-w that needs to be keyworded (added in -r1) + tests/functional/test_pep517.py + tests/functional/test_pep660.py + ) + + [[ ${EPYTHON} == python3.10 ]] && EPYTEST_DESELECT+=( tests/lib/test_lib.py::test_correct_pip_version # uses vendored packaging that uses deprecated distutils tests/functional/test_warning.py::test_pip_works_with_warnings_as_errors ) + 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 + distutils_install_for_testing pushd "${WORKDIR}/virtualenv-${VENV_PV}" >/dev/null || die distutils_install_for_testing @@ -104,7 +122,7 @@ python_test() { local -x GENTOO_PIP_TESTING=1 \ PATH="${TEST_DIR}/scripts:${PATH}" \ PYTHONPATH="${TEST_DIR}/lib:${BUILD_DIR}/lib" - epytest ${deselect[@]/#/--deselect } -m "not network" + epytest -m "not network" } python_install_all() { -- cgit v1.2.3