diff options
| -rw-r--r-- | dev-python/pip/Manifest | 1 | ||||
| -rw-r--r-- | dev-python/pip/files/pip-21.1-no-coverage.patch | 51 | ||||
| -rw-r--r-- | dev-python/pip/pip-21.2.4.ebuild | 129 |
3 files changed, 0 insertions, 181 deletions
diff --git a/dev-python/pip/Manifest b/dev-python/pip/Manifest index e64327676d1f..105f0877a738 100644 --- a/dev-python/pip/Manifest +++ b/dev-python/pip/Manifest @@ -1,4 +1,3 @@ -DIST pip-21.2.4.tar.gz 8786693 BLAKE2B 02d4cdd3d9feda2d4daaf7552bf86e068d2f040ef9836a128c8dfc36697594d6a7d830cc58dc4f2d42c22fec0230f3055ab8b5b204bfd1fb0b9429e2dd44f537 SHA512 3c018601bca60d865032962deaf0ba4943fc6c3f3d8d69dab65f987737daf7fa91492c8250ab36988d1fa5f22b20608ada88ac1ffde914a7d72485bf5164b45f 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 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?= <mgorny@gentoo.org> -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/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 -} |