From fcc5224904648a8e6eb528d7603154160a20022f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 2 Feb 2022 01:39:05 +0000 Subject: gentoo resync : 02.02.2022 --- dev-python/pip/Manifest | 6 +- dev-python/pip/pip-21.3.1-r1.ebuild | 2 + dev-python/pip/pip-22.0.1.ebuild | 145 ++++++++++++++++++++++++++++++++++++ dev-python/pip/pip-22.0.2.ebuild | 145 ++++++++++++++++++++++++++++++++++++ 4 files changed, 297 insertions(+), 1 deletion(-) create mode 100644 dev-python/pip/pip-22.0.1.ebuild create mode 100644 dev-python/pip/pip-22.0.2.ebuild (limited to 'dev-python/pip') diff --git a/dev-python/pip/Manifest b/dev-python/pip/Manifest index 0c5ad306235b..a6034340df2d 100644 --- a/dev-python/pip/Manifest +++ b/dev-python/pip/Manifest @@ -2,8 +2,12 @@ AUX pip-20.0.2-disable-system-install.patch 1298 BLAKE2B a384ee2114e59b8bc719fc1 AUX pip-21.3-no-coverage.patch 1820 BLAKE2B f515e324f043fa8548f9add2fecf1f4d09c2487d695c429f870a6cd1ee9a228717c4fb152faa99a74d75d3b1998a5e7e93f710e2acd096f107f23091875f1f11 SHA512 b386e8116009f43013fe600d1f3928931a6595105bdd782266eeab85ba0f5a0743c7ccfbf2cab018d2ee0646b832573c56aad009e4b074dd805011d0a810348d 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 pip-22.0.1.tar.gz 9288984 BLAKE2B 11936d6baffb8ccf3715f1183ac007f93930c6188c9b8b7c063b1c42513658cf8de31ce98a73d7d94a0a5b28407c985fe419419a689fae2a43bfc5c2fcb0439e SHA512 64ee12c8bfa12e8df4d5160c24064f28805d14c215d9db2663ca069d49e1e3c7050084bd9059bfdb31f0901440b4c2711d4544440a937a94ca1b9fa7f213924d +DIST pip-22.0.2.tar.gz 9289498 BLAKE2B 4e23c9cf5410cbed77b631fc153c1a9a992a11e5f06c9e317a4e3018da19382f25208557d327447ee778d2a9ca585f08ffa2a3fd8bcdfcda7fd2ec195e99c135 SHA512 5cc649b1b64c731d3b47c2296d37c93d276393224e8183e6f8966e320b876122c3e89c163d3da5cba064f4279a5e1f2a92b349edaf834c33b69b77d593b7195f 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.3.1-r1.ebuild 4977 BLAKE2B 805a9a129b523b8359bfb0c2f6cae48bba39c7c352d435111fee65627660c0bcb35bb5de381d36404c4bb7246f0f93310b685802b134c49620dcafd86f93103e SHA512 ede7c0e28c6e1d3b5283613766cb4544d945dc71240f62cc5d909702284accb061a8e486bd9a203fd4467880f8c1c8c9e2571ee3eb6f3c82c85c0f121c96ac0c +EBUILD pip-21.3.1-r1.ebuild 5057 BLAKE2B 7961092eb77a28009c39e761aa8fb4863f99dfc3bc8d6dd6f7f598c7b9b98363ee9eac0357b9f2bb6f0f850529e71651a21aa6412be2657af2d18833307545f3 SHA512 9b50fca4bd96ef64f621acaa4fc04595ad26d849b9d60d85984e08c7928aeed845c053f58fdba3c63b7883b4a58caeefbd5e49364313ff0e22ea196e69f838fe +EBUILD pip-22.0.1.ebuild 5019 BLAKE2B 81d08f7b50d4cdd317c21a58b4689966babe602891a0e4da3550bcff3674acec051efdf0cc99713df1fe05c9a3be2bd20a662f4b80ebdd66ebcf89fc90143f3a SHA512 0fc680782a5b0dc03ad36aeeaf108bc68f51492cc0183214b11ee46ad1bc02189627d98a65007f7d1cd3e519be9c4c68e0748be75a84315f1357328e0ca82849 +EBUILD pip-22.0.2.ebuild 5019 BLAKE2B 81d08f7b50d4cdd317c21a58b4689966babe602891a0e4da3550bcff3674acec051efdf0cc99713df1fe05c9a3be2bd20a662f4b80ebdd66ebcf89fc90143f3a SHA512 0fc680782a5b0dc03ad36aeeaf108bc68f51492cc0183214b11ee46ad1bc02189627d98a65007f7d1cd3e519be9c4c68e0748be75a84315f1357328e0ca82849 MISC metadata.xml 392 BLAKE2B 94ea3de1220cb9ca64ae1186597789cc83a54adfe44695932c07dd5065df0e5f9ee5078a495e3a12563b36809d781d8ab86bb6c92c485c023199d92547b74f27 SHA512 603199f6547105f3bb64f4fcaf004e9ef62fa2e0f8ec6eab56078119684b0f5119161e0f164fe02b2cf6dd6b115588c9ef77d727eeb6d138e281f1cb0bcb5de9 diff --git a/dev-python/pip/pip-21.3.1-r1.ebuild b/dev-python/pip/pip-21.3.1-r1.ebuild index 3516e72b4f8a..8b39334f4fc3 100644 --- a/dev-python/pip/pip-21.3.1-r1.ebuild +++ b/dev-python/pip/pip-21.3.1-r1.ebuild @@ -113,6 +113,8 @@ python_test() { pushd "${WORKDIR}/virtualenv-${VENV_PV}" >/dev/null || die distutils_install_for_testing popd >/dev/null || die + # prevent it from being installed + rm -r "${BUILD_DIR}"/lib/virtualenv* || die local -x GENTOO_PIP_TESTING=1 \ PATH="${TEST_DIR}/scripts:${PATH}" \ diff --git a/dev-python/pip/pip-22.0.1.ebuild b/dev-python/pip/pip-22.0.1.ebuild new file mode 100644 index 000000000000..48c8736f6a40 --- /dev/null +++ b/dev-python/pip/pip-22.0.1.ebuild @@ -0,0 +1,145 @@ +# Copyright 1999-2022 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" +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" + ) + 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 + # prevent it from being installed + rm -r "${BUILD_DIR}"/lib/virtualenv* || 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"; __file__ = ""; from pip._internal.cli.main import main; sys.exit(main())' + + "${EPYTHON}" -c "${pipcmd}" completion --bash > "${COMPLETION}" || die + newbashcomp "${COMPLETION}" ${PN} + + "${EPYTHON}" -c "${pipcmd}" completion --zsh > "${COMPLETION}" || die + insinto /usr/share/zsh/site-functions + newins "${COMPLETION}" _pip +} diff --git a/dev-python/pip/pip-22.0.2.ebuild b/dev-python/pip/pip-22.0.2.ebuild new file mode 100644 index 000000000000..48c8736f6a40 --- /dev/null +++ b/dev-python/pip/pip-22.0.2.ebuild @@ -0,0 +1,145 @@ +# Copyright 1999-2022 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" +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" + ) + 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 + # prevent it from being installed + rm -r "${BUILD_DIR}"/lib/virtualenv* || 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"; __file__ = ""; from pip._internal.cli.main import main; sys.exit(main())' + + "${EPYTHON}" -c "${pipcmd}" completion --bash > "${COMPLETION}" || die + newbashcomp "${COMPLETION}" ${PN} + + "${EPYTHON}" -c "${pipcmd}" completion --zsh > "${COMPLETION}" || die + insinto /usr/share/zsh/site-functions + newins "${COMPLETION}" _pip +} -- cgit v1.2.3