From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2A1DA15800A for ; Sat, 19 Aug 2023 18:19:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 828BE2BC016; Sat, 19 Aug 2023 18:19:04 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 676E02BC016 for ; Sat, 19 Aug 2023 18:19:04 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9AEAA3411BA for ; Sat, 19 Aug 2023 18:19:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 46A76B8B for ; Sat, 19 Aug 2023 18:19:02 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1692468901.3d3e86a0b1eff4fcaf78110dcd7459cb8fb1aa3b.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/pip/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/pip/Manifest dev-python/pip/pip-23.1.2.ebuild dev-python/pip/pip-23.2.ebuild X-VCS-Directories: dev-python/pip/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 3d3e86a0b1eff4fcaf78110dcd7459cb8fb1aa3b X-VCS-Branch: master Date: Sat, 19 Aug 2023 18:19:02 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ac0f3d00-e273-4fcb-ba66-f0b7595257fa X-Archives-Hash: 1a1bdb198e014fef80c5643dc427c8f3 commit: 3d3e86a0b1eff4fcaf78110dcd7459cb8fb1aa3b Author: Michał Górny gentoo org> AuthorDate: Sat Aug 19 18:15:01 2023 +0000 Commit: Michał Górny gentoo org> CommitDate: Sat Aug 19 18:15:01 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d3e86a0 dev-python/pip: Remove old Signed-off-by: Michał Górny gentoo.org> dev-python/pip/Manifest | 2 - dev-python/pip/pip-23.1.2.ebuild | 127 -------------------------------------- dev-python/pip/pip-23.2.ebuild | 130 --------------------------------------- 3 files changed, 259 deletions(-) diff --git a/dev-python/pip/Manifest b/dev-python/pip/Manifest index 07d31b3cf822..ee4ad92612a7 100644 --- a/dev-python/pip/Manifest +++ b/dev-python/pip/Manifest @@ -1,3 +1 @@ -DIST pip-23.1.2.gh.tar.gz 9345911 BLAKE2B 511ac1a9405e377ccb2525e89676f4a63f138aa526d40e76f4d9681139d94db1f92772beab1a647654c17abc6bee09f52cf4c4f4484716874194565fda07d056 SHA512 b33070cb59a1258904a60b48ec8abfd9e316c5f87681fea13d89ddf6d516afac10965ae1db54fea299a0a72f98602ce02e8b3be46f239e857db84866045730e1 DIST pip-23.2.1.gh.tar.gz 9370625 BLAKE2B 9e7855aae371a773a070c24b50f985dac6ff7c2412d51e268368b911b92d0d0b52a839f9d761d5f6aaff33f1e7570d5f930e5063e8af98aa99f50d2f1c1b5ed2 SHA512 a6c629976c332cffe5dff0ec1e201d694c7a42fa8def202ebf1db251a6dbd90091eaac89c36a354a0cf0c60cdb267b4e0ec9ff6a88b0ac61cfaafdf159e34fc8 -DIST pip-23.2.gh.tar.gz 9370682 BLAKE2B dbce43e29ed453e32e13a6d2f18ba2d8095021de0073d13de18cb55b5410415d0feeb2610e31ae8a0025864e6d05eb41aab3dd8adeaecf990fa31e7284e71fa5 SHA512 fe915a8f85b21d59b416a5b1fad6e6ce2874b27e055c86ad71efe31c492f117a468734da239882c3d7f4678f91389daf0e8d13abc6429ddca5bfef87cb29dae0 diff --git a/dev-python/pip/pip-23.1.2.ebuild b/dev-python/pip/pip-23.1.2.ebuild deleted file mode 100644 index dccb1733d387..000000000000 --- a/dev-python/pip/pip-23.1.2.ebuild +++ /dev/null @@ -1,127 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# please bump dev-python/ensurepip-pip along with this package! - -DISTUTILS_USE_PEP517=setuptools -PYTHON_TESTED=( python3_{10..11} ) -PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" python3_12 pypy3 ) -PYTHON_REQ_USE="ssl(+),threads(+)" - -inherit bash-completion-r1 distutils-r1 multiprocessing - -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/pip/archive/${PV}.tar.gz -> ${P}.gh.tar.gz -" - -LICENSE="MIT" -# bundled deps -LICENSE+=" Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MPL-2.0 PSF-2" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" -SLOT="0" -IUSE="test-rust" - -RDEPEND=" - >=dev-python/setuptools-39.2.0[${PYTHON_USEDEP}] -" -BDEPEND=" - ${RDEPEND} - test? ( - $(python_gen_cond_dep ' - dev-python/ensurepip-setuptools - dev-python/ensurepip-wheel - 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/virtualenv[${PYTHON_USEDEP}] - dev-python/werkzeug[${PYTHON_USEDEP}] - dev-python/wheel[${PYTHON_USEDEP}] - test-rust? ( - dev-python/cryptography[${PYTHON_USEDEP}] - ) - ' "${PYTHON_TESTED[@]}") - ) -" - -distutils_enable_tests pytest - -python_prepare_all() { - local PATCHES=( - "${FILESDIR}/pip-23.1-no-coverage.patch" - ) - - distutils-r1_python_prepare_all - - if use test; then - local wheels=( - "${BROOT}"/usr/lib/python/ensurepip/{setuptools,wheel}-*.whl - ) - mkdir tests/data/common_wheels/ || die - cp "${wheels[@]}" 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}" - return 0 - fi - - local EPYTEST_DESELECT=( - tests/functional/test_inspect.py::test_inspect_basic - tests/functional/test_install.py::test_double_install_fail - # Internet - tests/functional/test_install.py::test_install_dry_run - tests/functional/test_install.py::test_editable_install__local_dir_setup_requires_with_pyproject - tests/functional/test_install.py::test_install_8559_wheel_package_present - tests/functional/test_config_settings.py::test_backend_sees_config_via_sdist - tests/functional/test_install.py::test_link_hash_in_dep_fails_require_hashes - # TODO - tests/unit/test_network_auth.py::test_keyring_cli_get_password - tests/unit/test_network_auth.py::test_keyring_cli_set_password - # wants to install keyring from Internet, sigh - tests/functional/test_install_config.py::test_prompt_for_keyring_if_needed - ) - - 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 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 -} diff --git a/dev-python/pip/pip-23.2.ebuild b/dev-python/pip/pip-23.2.ebuild deleted file mode 100644 index 58c5279dbfaa..000000000000 --- a/dev-python/pip/pip-23.2.ebuild +++ /dev/null @@ -1,130 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# please bump dev-python/ensurepip-pip along with this package! - -DISTUTILS_USE_PEP517=setuptools -PYTHON_TESTED=( python3_{10..11} ) -PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" python3_12 pypy3 ) -PYTHON_REQ_USE="ssl(+),threads(+)" - -inherit bash-completion-r1 distutils-r1 multiprocessing - -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/pip/archive/${PV}.tar.gz -> ${P}.gh.tar.gz -" - -LICENSE="MIT" -# bundled deps -LICENSE+=" Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MPL-2.0 PSF-2" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -SLOT="0" -IUSE="test-rust" - -RDEPEND=" - >=dev-python/setuptools-39.2.0[${PYTHON_USEDEP}] -" -BDEPEND=" - ${RDEPEND} - test? ( - $(python_gen_cond_dep ' - dev-python/ensurepip-setuptools - dev-python/ensurepip-wheel - 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/virtualenv[${PYTHON_USEDEP}] - dev-python/werkzeug[${PYTHON_USEDEP}] - dev-python/wheel[${PYTHON_USEDEP}] - test-rust? ( - dev-python/cryptography[${PYTHON_USEDEP}] - ) - ' "${PYTHON_TESTED[@]}") - ) -" - -distutils_enable_tests pytest - -python_prepare_all() { - local PATCHES=( - "${FILESDIR}/pip-23.1-no-coverage.patch" - ) - - distutils-r1_python_prepare_all - - if use test; then - local wheels=( - "${BROOT}"/usr/lib/python/ensurepip/{setuptools,wheel}-*.whl - ) - mkdir tests/data/common_wheels/ || die - cp "${wheels[@]}" 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}" - return 0 - fi - - local EPYTEST_DESELECT=( - tests/functional/test_inspect.py::test_inspect_basic - tests/functional/test_install.py::test_double_install_fail - # Internet - tests/functional/test_install.py::test_install_dry_run - tests/functional/test_install.py::test_editable_install__local_dir_setup_requires_with_pyproject - tests/functional/test_install.py::test_install_8559_wheel_package_present - tests/functional/test_config_settings.py::test_backend_sees_config_via_sdist - tests/functional/test_install.py::test_link_hash_in_dep_fails_require_hashes - # TODO - tests/unit/test_network_auth.py::test_keyring_cli_get_password - tests/unit/test_network_auth.py::test_keyring_cli_set_password - # wants to install keyring from Internet, sigh - tests/functional/test_install_config.py::test_prompt_for_keyring_if_needed - # probably a too strict assert - # https://github.com/pypa/pip/issues/12152 - tests/unit/test_req.py::TestRequirementSet::test_download_info_archive_cache_with_invalid_origin - ) - - 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 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 -}