commit: 3078d53d27bdcfac204e1450f00ab5b885e43273 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Sun Aug 1 06:45:56 2021 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Sun Aug 1 08:14:52 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3078d53d
dev-python/pip: Remove old Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> dev-python/pip/Manifest | 3 - .../pip/files/virtualenv-16.7.10-py310.patch | 84 ------------- dev-python/pip/pip-21.1.2-r1.ebuild | 133 --------------------- 3 files changed, 220 deletions(-) diff --git a/dev-python/pip/Manifest b/dev-python/pip/Manifest index b92f07f57c9..d9a8e6a2972 100644 --- a/dev-python/pip/Manifest +++ b/dev-python/pip/Manifest @@ -1,8 +1,5 @@ -DIST pip-21.1.2.tar.gz 8772481 BLAKE2B 23dbcc5dd7e7f66934282b9c93958267eb367d418b6c814032b7b89e0d94c73c143626781b8df081394019d2e575030b7a2fd61bb5221992ce2060cf069e8b04 SHA512 54a2b6074fcb2640868dedcabb5087b79a53a8ad57ec4ab5acf2862b8037403d8f156c2853ab60c2f10c6af999a0a90774f0bc3eca2978a82590935d37af167f DIST pip-21.1.3.tar.gz 8772944 BLAKE2B 4c50fcb7c05e05d11b137d08547d9d55f19687442b8d44caf05d19917b200bcf860032cb28745e41d51afda80a7ac09d60afb8d619ade5b965ed87bac1133006 SHA512 21bdc78f24751981ae49c9fda0430fc92b8d33eb7a546bc344e8cea4aa85dcd42191ef8eb3fdfb4f3d1cb5921698f819d73e6e190d8745cf7ddfa52732d95999 DIST pip-21.2.1.tar.gz 8781474 BLAKE2B 6a6a4972de31cea2f9ee2d70df00acec65efe344fa13e56ecf9b2f55125baa2effb30bf25c7649f5f30b2ecf9b5ebb7d32dc0f2dfa101444510c8573bd0c60be SHA512 2fff39703eb387ded66552ee62c2b3e4d18da6e8a904399919a5c51f65ddf1695ad410408fe5370877a1ce9992e7c07e091a1852dfb136ce5580e31fc1c03b81 -DIST setuptools-56.0.0-py3-none-any.whl 784941 BLAKE2B 136352bcaeeb803f94983db2e0f9ec79dacc23a6742a2f6f1b4bdd2b29a104f4965d78f9b4adf1a501c7bf39d4ed85a6786b03489f90872661afbf5e674fd3f9 SHA512 32405236e9c2936cde137bc4d4d07b548391336ce0511cd5677dcd1f85c7a142b0947e03cdceaeb37067874f5aa71daacaa1a6af95ae9fe3ad8af264f61e10f4 DIST setuptools-57.4.0-py3-none-any.whl 819017 BLAKE2B afba86cf9aeea58ee869fdc11bbb192abbf2f89710e468b90dc291fec228ca16202483e36195a5ad4e2b8d210326bc83e2be6ec696ab413d94ffaeb05bb9c030 SHA512 9bf230f4e0e72acab07ab372a6ca05adb3d175a8079d2f73d327c632f3d27b8ee10442d3e60f4c94a6e61d5ba2212fc78187ca6e1717e15bb570bdce4263fd0b -DIST virtualenv-16.7.10.tar.gz 5116776 BLAKE2B 42f0a4b4330850b504f8febd991ef6ecdcbb0821efdd94ca324a8cc34a68a760a8a98de97f0cb2384d8e6cbb0ce8f261995c6433886444e29b75ba0ce09ca12c SHA512 f06d7c354ce1910f04dbcbe1a77e60392653bbe4f638bafbe9284454db2c0e5d63cf9159201d0916fc01aaba91d45fb733b63096c38517fcd83fd00ed8b26d28 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 diff --git a/dev-python/pip/files/virtualenv-16.7.10-py310.patch b/dev-python/pip/files/virtualenv-16.7.10-py310.patch deleted file mode 100644 index 27c17a07445..00000000000 --- a/dev-python/pip/files/virtualenv-16.7.10-py310.patch +++ /dev/null @@ -1,84 +0,0 @@ -From b4aef0a53ba63c34e45413754705af4e438ef5df Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <m...@hroncok.cz> -Date: Wed, 5 May 2021 10:59:02 +0200 -Subject: [PATCH] Legacy: Use sysconfig.get_default_scheme() where available - (#2109) - ---- - .pre-commit-config.yaml | 43 ------------------------------------ - docs/changelog/2109.misc.rst | 1 + - virtualenv.py | 3 ++- - 3 files changed, 3 insertions(+), 44 deletions(-) - delete mode 100644 .pre-commit-config.yaml - create mode 100644 docs/changelog/2109.misc.rst - -diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml -deleted file mode 100644 -index 0b8234b7d..000000000 ---- a/.pre-commit-config.yaml -+++ /dev/null -@@ -1,43 +0,0 @@ --repos: --- repo: https://github.com/ambv/black -- rev: 19.10b0 -- hooks: -- - id: black -- args: [--safe] -- language_version: python3.8 --- repo: https://github.com/asottile/blacken-docs -- rev: v1.3.0 -- hooks: -- - id: blacken-docs -- additional_dependencies: [black==19.3b0] -- language_version: python3.8 --- repo: https://github.com/asottile/seed-isort-config -- rev: v1.9.3 -- hooks: -- - id: seed-isort-config -- args: [--application-directories, '.'] --- repo: https://github.com/pre-commit/mirrors-isort -- rev: v4.3.21 -- hooks: -- - id: isort --- repo: https://github.com/pre-commit/pre-commit-hooks -- rev: v2.4.0 -- hooks: -- - id: trailing-whitespace -- - id: end-of-file-fixer -- - id: check-yaml -- - id: debug-statements -- - id: check-merge-conflict -- - id: trailing-whitespace -- - id: check-docstring-first -- - id: flake8 -- additional_dependencies: ["flake8-bugbear == 19.8.0"] -- language_version: python3.8 --- repo: https://github.com/asottile/pyupgrade -- rev: v1.25.1 -- hooks: -- - id: pyupgrade --- repo: https://github.com/pre-commit/pygrep-hooks -- rev: v1.4.2 -- hooks: -- - id: rst-backticks -diff --git a/docs/changelog/2109.misc.rst b/docs/changelog/2109.misc.rst -new file mode 100644 -index 000000000..985f955df ---- /dev/null -+++ b/docs/changelog/2109.misc.rst -@@ -0,0 +1 @@ -+Preserve compatibility with Python 3.10 - by ``hroncok`` -diff --git a/virtualenv.py b/virtualenv.py -index 3085d1d18..86aa65674 100755 ---- a/virtualenv.py -+++ b/virtualenv.py -@@ -1809,7 +1809,8 @@ def fix_local_scheme(home_dir, symlink=True): - pass - else: - # noinspection PyProtectedMember -- if sysconfig._get_default_scheme() == "posix_local": -+ get_scheme = getattr(sysconfig, "get_default_scheme", None) or sysconfig._get_default_scheme -+ if get_scheme() == "posix_local": - local_path = os.path.join(home_dir, "local") - if not os.path.exists(local_path): - os.mkdir(local_path) diff --git a/dev-python/pip/pip-21.1.2-r1.ebuild b/dev-python/pip/pip-21.1.2-r1.ebuild deleted file mode 100644 index b1ccca2fad0..00000000000 --- a/dev-python/pip/pip-21.1.2-r1.ebuild +++ /dev/null @@ -1,133 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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-56.0.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.10 - -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 ~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 - - pushd "${WORKDIR}/virtualenv-${VENV_PV}" >/dev/null || die - eapply "${FILESDIR}/virtualenv-${VENV_PV}-py310.patch" - popd >/dev/null || 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 -}
