diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-05-12 16:42:50 +0300 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-05-12 16:42:50 +0300 |
commit | 752d6256e5204b958b0ef7905675a940b5e9172f (patch) | |
tree | 330d16e6362a49cbed8875a777fe641a43376cd3 /dev-python/pip | |
parent | 0c100b7dd2b30e75b799d806df4ef899fd98e1ea (diff) |
gentoo resync : 12.05.2022
Diffstat (limited to 'dev-python/pip')
-rw-r--r-- | dev-python/pip/Manifest | 7 | ||||
-rw-r--r-- | dev-python/pip/pip-22.0.4-r1.ebuild (renamed from dev-python/pip/pip-22.0.3.ebuild) | 99 | ||||
-rw-r--r-- | dev-python/pip/pip-22.0.4.ebuild | 2 |
3 files changed, 46 insertions, 62 deletions
diff --git a/dev-python/pip/Manifest b/dev-python/pip/Manifest index 1243555c534b..5e2536b520d1 100644 --- a/dev-python/pip/Manifest +++ b/dev-python/pip/Manifest @@ -1,10 +1,11 @@ AUX pip-20.0.2-disable-system-install.patch 1298 BLAKE2B a384ee2114e59b8bc719fc14270cf6efbe8914854c404395beb1126db3278683b940e8fcfee83423d78e2aed6521e0bc57566ab0f5618f473262bbd9b7b0bffa SHA512 d2772105d4f4f880606e1e8ab3381af6768a96604a5fdcaa155dd42f8eea731c3a1b733b027d3e591d81f962ba14758b19da4a2c6c12946cd9a9d77c51ca4e78 AUX pip-21.3-no-coverage.patch 1820 BLAKE2B f515e324f043fa8548f9add2fecf1f4d09c2487d695c429f870a6cd1ee9a228717c4fb152faa99a74d75d3b1998a5e7e93f710e2acd096f107f23091875f1f11 SHA512 b386e8116009f43013fe600d1f3928931a6595105bdd782266eeab85ba0f5a0743c7ccfbf2cab018d2ee0646b832573c56aad009e4b074dd805011d0a810348d -DIST pip-22.0.3.tar.gz 9290286 BLAKE2B f81140fbff5d16e8a38d21047dd790be2287b664b130d43e71c7d4f23d6a7cd5c8b2e58f988cc18dc4d08b83b0fcb3eac6b6ec001421e83e35db74f15d6c557e SHA512 05f0807b298c2136842ad1cae3b003f81d85ca79103f12171e4c8d020d6add076848c1acfb6442c4ae2da6b834de0e87dffaec7bd24dfc403372cead94949326 DIST pip-22.0.4.tar.gz 9325766 BLAKE2B 9ce5a25e6fb9aedc39e2cddab2a8af3b47dbaaaf8bd22c39f8301b784e6e9f5434f63d5ef467f4d819b15bcd5cf8d3da52db34b3514c7b4a15823f77cb47e1c1 SHA512 af6d1787b4fe97f2eec9c2e3e3f0f756efca8cb83f6ecdae797986fb6050ee60d872a8a8eb7502a32c4334fc0c7af8cf3c58ce980407d0e9f89eec28a4290093 DIST setuptools-57.4.0-py3-none-any.whl 819017 BLAKE2B afba86cf9aeea58ee869fdc11bbb192abbf2f89710e468b90dc291fec228ca16202483e36195a5ad4e2b8d210326bc83e2be6ec696ab413d94ffaeb05bb9c030 SHA512 9bf230f4e0e72acab07ab372a6ca05adb3d175a8079d2f73d327c632f3d27b8ee10442d3e60f4c94a6e61d5ba2212fc78187ca6e1717e15bb570bdce4263fd0b +DIST setuptools-62.2.0-py3-none-any.whl 1143965 BLAKE2B 42bf650892d2e5810f18f8002fc6318b5abf890d04b2a3050784b93da88d806af5118eee65ed89b06e1cb908e4c7f6aa50222fba4b8617ab36923cfb624528ae SHA512 496593580b5537fb142bc775d060d01ef3c9069fc06564b5e9cb8e2a56e8f264c1dc7438d38a17f8b7e20d509a6b4f62cdfaf290c4ed82e071a1cc10a297b8b8 DIST virtualenv-16.7.11.tar.gz 8134533 BLAKE2B ea81e11c210d911bf9576edf7b1754721b270adcc5d9633415d33b8f659149d64932fe2d366200121ec00c266c25dae380e248add438fc357477114eba4dfb4e SHA512 82d0d2a964508511e8e1686703581ff543f65791dc2449d9741d46ea57c4c89673947d2477ba374176f05fcea2a5ca572aa650c61c4f3271c4d73d1ff9d9ff42 +DIST virtualenv-16.7.12.tar.gz 8906590 BLAKE2B a1f206769e4e5797562906162e492e44c4a72720e4f88a0362dc802ce2df20c65aaab6a72dce2238445601a10fae59bd90cd362217994d30911f105afd71c5fa SHA512 0278b33fb19f6553e70ad3dcffa6ea1a455ff435b216ac9b4fadff216b2932714faa2bb6027af3058010111d8511a5c2fcd424f31c9645be361603971f111c8e DIST wheel-0.36.2-py2.py3-none-any.whl 35046 BLAKE2B bc4e8dab7c74eea34d3b4a813b7eaf6295a99a396a861b6cdd76f743043e89140bad132bdd13e385e8945ce02e0798e1d3ac73fc1b23bde5b2a83e4bb4dd5cdc SHA512 6bb5119b4d3704fe1e3c1eaaa3124edab13f61b46f8a0a8e75974fac4e5b25d8b53606071a03a8d8990ad1cfe2ab247ddea260098df2c0c35ae965be47080284 -EBUILD pip-22.0.3.ebuild 5011 BLAKE2B 32ffa04f1a4f3cc313d6d84872da4f47ace13b1c6a99d6feeb6cd6e69c5014e1410695e7dc8b54f25cac7fd808c20cb442c0db3e2f437f30691ab8abc04b6cac SHA512 3de09b75d1215413c6e8fe941c941463457ddcde9a41e53bd95eb6bb9e5c5899691820b56cde80903f9f514667d69fa9ce70144b6f7202f2e4ab8cc72e1fff2b -EBUILD pip-22.0.4.ebuild 5019 BLAKE2B 81d08f7b50d4cdd317c21a58b4689966babe602891a0e4da3550bcff3674acec051efdf0cc99713df1fe05c9a3be2bd20a662f4b80ebdd66ebcf89fc90143f3a SHA512 0fc680782a5b0dc03ad36aeeaf108bc68f51492cc0183214b11ee46ad1bc02189627d98a65007f7d1cd3e519be9c4c68e0748be75a84315f1357328e0ca82849 +EBUILD pip-22.0.4-r1.ebuild 4109 BLAKE2B 3c3922ee76d09b71f7c21d4259c523a866177ad753c9c17cea3b5aec8a9ef877d12fcde9dfd925e92025e325239bf6adaa759add6e5fd622046de0092d50d4f1 SHA512 6666e4a5a2cb4c200297b318e5cbb6ec30c8a108726dbc169b0b05ecbfacd0f5452da46751d2f5475ae8f55f53d6905419810a0a296ae1195f14192298e9059f +EBUILD pip-22.0.4.ebuild 5024 BLAKE2B c6f7a13f8b64c6c8992fd5a602662c624a4601ee75ff4d2b18e0191318f6c892305d4914d3f2f8728a4626f3850a00daae5b7587bf05da3c9f9515d72355e764 SHA512 21de587fd903b2e0fa74cbfba01f5a23317e905a30a14ef86edd9345a4d43e97c7a0a3ddcd29776963f92e6a17231c5b1affa2ca06b38d99a72efc609f500c26 MISC metadata.xml 392 BLAKE2B 94ea3de1220cb9ca64ae1186597789cc83a54adfe44695932c07dd5065df0e5f9ee5078a495e3a12563b36809d781d8ab86bb6c92c485c023199d92547b74f27 SHA512 603199f6547105f3bb64f4fcaf004e9ef62fa2e0f8ec6eab56078119684b0f5119161e0f164fe02b2cf6dd6b115588c9ef77d727eeb6d138e281f1cb0bcb5de9 diff --git a/dev-python/pip/pip-22.0.3.ebuild b/dev-python/pip/pip-22.0.4-r1.ebuild index 1e7e51ed6bd0..b199d1693021 100644 --- a/dev-python/pip/pip-22.0.3.ebuild +++ b/dev-python/pip/pip-22.0.4-r1.ebuild @@ -3,24 +3,26 @@ EAPI=8 -PYTHON_COMPAT=( python3_{8..10} pypy3 ) +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{8..11} pypy3 ) PYTHON_REQ_USE="ssl(+),threads(+)" -inherit bash-completion-r1 distutils-r1 +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-57.4.0-py3-none-any.whl" +SETUPTOOLS_WHL="setuptools-62.2.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 +VENV_PV=16.7.12 -DESCRIPTION="Installs python packages -- replacement for easy_install" +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/" + https://github.com/pypa/pip/ +" SRC_URI=" https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz test? ( @@ -32,10 +34,9 @@ SRC_URI=" " LICENSE="MIT" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" SLOT="0" -IUSE="test vanilla" -RESTRICT="!test? ( test )" +IUSE="vanilla" RDEPEND=" >=dev-python/setuptools-39.2.0[${PYTHON_USEDEP}] @@ -43,19 +44,23 @@ RDEPEND=" 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_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}] + ) ) ) + ' python3_{8..10}) ) " +distutils_enable_tests pytest + python_prepare_all() { local PATCHES=( "${FILESDIR}/${PN}-21.3-no-coverage.patch" @@ -73,32 +78,30 @@ python_prepare_all() { 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 [[ ${EPYTHON} == pypy* ]]; then - ewarn "Skipping tests on ${EPYTHON} since they are very broken" + if ! has "${EPYTHON}" python3.{8..10} ]]; then + einfo "Skipping tests on ${EPYTHON} since virtualenv-16 is 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 @@ -108,38 +111,18 @@ python_test() { ) 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" + local -x GENTOO_PIP_TESTING=1 + local -x PYTHONPATH="${WORKDIR}/virtualenv-${VENV_PV}" + local -x SETUPTOOLS_USE_DISTUTILS=stdlib + epytest -m "not network" -n "$(makeopts_jobs)" } 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} + newbashcomp completion.bash pip - "${EPYTHON}" -c "${pipcmd}" completion --zsh > "${COMPLETION}" || die insinto /usr/share/zsh/site-functions - newins "${COMPLETION}" _pip + newins completion.zsh _pip } diff --git a/dev-python/pip/pip-22.0.4.ebuild b/dev-python/pip/pip-22.0.4.ebuild index 48c8736f6a40..44134252dbde 100644 --- a/dev-python/pip/pip-22.0.4.ebuild +++ b/dev-python/pip/pip-22.0.4.ebuild @@ -32,7 +32,7 @@ SRC_URI=" " LICENSE="MIT" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" SLOT="0" IUSE="test vanilla" RESTRICT="!test? ( test )" |