diff options
Diffstat (limited to 'dev-python/pip')
| -rw-r--r-- | dev-python/pip/Manifest | 3 | ||||
| -rw-r--r-- | dev-python/pip/files/pip-20.2-no-coverage.patch | 163 | ||||
| -rw-r--r-- | dev-python/pip/metadata.xml | 23 | ||||
| -rw-r--r-- | dev-python/pip/pip-20.3.3.ebuild | 150 | ||||
| -rw-r--r-- | dev-python/pip/pip-21.0.ebuild | 2 |
5 files changed, 13 insertions, 328 deletions
diff --git a/dev-python/pip/Manifest b/dev-python/pip/Manifest index feb532d49c06..4e81410ebc89 100644 --- a/dev-python/pip/Manifest +++ b/dev-python/pip/Manifest @@ -1,7 +1,4 @@ -DIST pip-20.3.3.tar.gz 8757085 BLAKE2B dce60cd59669929957715d6be70da4924c3a89bb4129f0972516bde8ccca751b4f327dd2f44a06cd0b48d092f8d520d1ec236ee812f768282004b34f1fabb798 SHA512 362d20e5d2665fa6211cf3836ca02a0340fb34ecde1d5902eecae744eb655d7dcfed0bd464e9db186b87b63a7aaf275e43645cf6321bdddd44b62787de84d87b DIST pip-21.0.1.tar.gz 8772082 BLAKE2B 2fdd78e2db8ceda2bd21fdeb4d29c0c2eda412827b87cc97ec1996a5b71b9c6e5938c0a6ef696163780bbbc55d81b8b3b1b6e2e79b05fbe9ce4bdd52e3ebdf13 SHA512 2db5397f4ca3a3f56f5add3f827bf1f0a4296019703438d68498266b9d2559b6baa3132061c5ad4c2a08bec6e76a2768763fdca02d86cf32aadd4640afbf3664 DIST pip-21.0.tar.gz 8770962 BLAKE2B 5a246e40a8b2ea5ceda27bec27e9bb6390613e28c301ed79fd95886c850a29ee1c0261f2dd69f1c2485dd72ec3010f61c4e783ed707a40630534790eba748c4b SHA512 ac77a7204423f1fdc3a4d328dab1860258efccde0123cff3217f357637c4ce3d85772ab81a230122ff813be2cfa40f2862e5d499390289efe1dcde3a31a42264 -DIST setuptools-44.0.0-py2.py3-none-any.whl 583230 BLAKE2B 823e6792471660f247e30a938aa869d345a63db7294e5f9b4bd88f15a7694779011d29740fe317149620985f705fc6e18cbb07a18e5680cc11d7c229ffbc74f6 SHA512 7006fd303181afbeeec0e30cafb9fd1e4d3c6f55cfdd6343fedbc32b17dbb96b3d96ae37f4db27bfb168738727474cf425904ec280ff1d2b789fc48077a8fa84 DIST setuptools-51.3.3-py3-none-any.whl 786243 BLAKE2B cc8a98cdfd5cb78a342a3d50049c0ebd0965451e9bd4050b7a133346f505a17842a498531ade9bf932064a6cac81277ecf60d94ef94faa39b78740de87f9fd86 SHA512 1d4f29e392371b7f0e427d0570fddbdd1204f6c98e48a0a289db23b20f7c048551584ac946e30b90d720cce4f508b3c39208e9a70f87067d66734432963d141c -DIST wheel-0.34.2-py2.py3-none-any.whl 26502 BLAKE2B 3a1bd4571c582245b60ff33c9bf74ff8a2ebafb26e56fc7b9bd215058d059b6bd13bbe21ce46002af257813a54126f27e19253f211e21c4548c7cf84cd15caf7 SHA512 4f1a44f4691ed8baad777d7874f7f4da96a5019eb485fd3a9eed9259aa2a9d5acccc6dc63a72128664347c64ee039a6076c6ca9c3b75a1f94457967864e522ed DIST wheel-0.36.2-py2.py3-none-any.whl 35046 BLAKE2B bc4e8dab7c74eea34d3b4a813b7eaf6295a99a396a861b6cdd76f743043e89140bad132bdd13e385e8945ce02e0798e1d3ac73fc1b23bde5b2a83e4bb4dd5cdc SHA512 6bb5119b4d3704fe1e3c1eaaa3124edab13f61b46f8a0a8e75974fac4e5b25d8b53606071a03a8d8990ad1cfe2ab247ddea260098df2c0c35ae965be47080284 diff --git a/dev-python/pip/files/pip-20.2-no-coverage.patch b/dev-python/pip/files/pip-20.2-no-coverage.patch deleted file mode 100644 index 55be5b8c9712..000000000000 --- a/dev-python/pip/files/pip-20.2-no-coverage.patch +++ /dev/null @@ -1,163 +0,0 @@ -From 43389903a55a5432ca8556f42fb2252c91c7ca45 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] Revert "Add basic test coverage configuration" - -This is just PITA since coverage uses native C extensions. ---- - .coveragerc | 4 +++ - setup.cfg | 38 ---------------------- - tests/conftest.py | 16 +-------- - tools/requirements/tests-common_wheels.txt | 2 -- - tox.ini | 16 ++------- - 5 files changed, 7 insertions(+), 69 deletions(-) - create mode 100644 .coveragerc - -diff --git a/.coveragerc b/.coveragerc -new file mode 100644 -index 00000000..5f833c94 ---- /dev/null -+++ b/.coveragerc -@@ -0,0 +1,4 @@ -+[run] -+branch = True -+omit = -+ src/pip/_vendor/* -diff --git a/setup.cfg b/setup.cfg -index 45fd58a3..e40596e9 100644 ---- a/setup.cfg -+++ b/setup.cfg -@@ -67,44 +67,6 @@ markers = - yaml: yaml based tests - fails_on_new_resolver: Does not yet work on the new resolver - --[coverage:run] --branch = True --# Do not gather coverage for vendored libraries. --omit = */_vendor/* --# Centralized absolute file prefix for coverage files. --data_file = ${COVERAGE_OUTPUT_DIR}/.coverage --# By default, each covered process will try to truncate and then write to --# `data_file`, but with `parallel`, they will write to separate files suffixed --# with hostname, pid, and a timestamp. --parallel = True --# If not set, then at the termination of each worker (when using pytest-xdist), --# the following is traced: "Coverage.py warning: Module pip was previously --# imported, but not measured (module-not-measured)" --disable_warnings = module-not-measured -- --[coverage:paths] --# We intentionally use "source0" here because pytest-cov unconditionally sets --# "source" after loading the config. --source0 = -- # The primary source code path which other paths will be combined into. -- src/pip/ -- # Unit test source directory e.g. -- # `.tox/coverage-py3/lib/pythonX.Y/site-packages/pip/...` -- */site-packages/pip/ -- # Functional test virtual environment directories, which look like -- # `tmpdir/pip0/pip/src/pip/...` -- */pip/src/pip/ -- --[coverage:report] --exclude_lines = -- # We must re-state the default because the `exclude_lines` option overrides -- # it. -- pragma: no cover -- # This excludes typing-specific code, which will be validated by mypy anyway. -- if MYPY_CHECK_RUNNING -- # Can be set to exclude e.g. `if PY2:` on Python 3 -- ${PIP_CI_COVERAGE_EXCLUDES} -- - [bdist_wheel] - universal = 1 - -diff --git a/tests/conftest.py b/tests/conftest.py -index 2aab5020..0db6d967 100644 ---- a/tests/conftest.py -+++ b/tests/conftest.py -@@ -294,13 +294,6 @@ def wheel_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') -@@ -310,7 +303,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): -+ setuptools_install, common_wheels): - - if six.PY3 and request.config.getoption('--use-venv'): - venv_type = 'venv' -@@ -334,13 +327,6 @@ def virtualenv_template(request, tmpdir_factory, pip_src, - subprocess.check_call([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 ( -diff --git a/tools/requirements/tests-common_wheels.txt b/tools/requirements/tests-common_wheels.txt -index f0edf0b0..6703d606 100644 ---- a/tools/requirements/tests-common_wheels.txt -+++ b/tools/requirements/tests-common_wheels.txt -@@ -7,5 +7,3 @@ - - setuptools >= 40.8.0 - wheel --# As required by pytest-cov. --coverage >= 4.4 -diff --git a/tox.ini b/tox.ini -index 82e9abc6..7a19ca61 100644 ---- a/tox.ini -+++ b/tox.ini -@@ -8,7 +8,6 @@ envlist = - # Wrapper for calls to pip that make sure the version being used is the - # original virtualenv (stable) version, and not the code being tested. - pip = python {toxinidir}/tools/tox_pip.py --mkdirp = python -c 'import os, sys; os.path.exists(sys.argv[1]) or os.mkdir(sys.argv[1])' - - [testenv] - # Remove USERNAME once we drop PY2. -@@ -31,20 +30,9 @@ commands = pytest --timeout 300 [] - install_command = {[helpers]pip} install {opts} {packages} - list_dependencies_command = {[helpers]pip} freeze --all - --[testenv:coverage] -+[testenv:coverage-py3] - basepython = python3 --commands = -- {[helpers]mkdirp} {toxinidir}/.coverage-output -- pytest --timeout 300 --cov=pip --cov-config={toxinidir}/setup.cfg [] -- --setenv = -- # Used in coverage configuration in setup.cfg. -- COVERAGE_OUTPUT_DIR = {toxinidir}/.coverage-output -- # Ensure coverage is enabled in child processes in virtual environments -- # since they won't already have been enabled by pytest-cov. -- COVERAGE_PROCESS_START = {toxinidir}/setup.cfg -- # Used in coverage configuration in setup.cfg. -- PIP_CI_COVERAGE_EXCLUDES = if PY2 -+commands = pytest --timeout 300 --cov=pip --cov-report=term-missing --cov-report=xml --cov-report=html tests/unit {posargs} - - [testenv:docs] - # Don't skip install here since pip_sphinxext uses pip's internals. --- -2.28.0 - diff --git a/dev-python/pip/metadata.xml b/dev-python/pip/metadata.xml index 93b87f39e3d6..67cdae8ae813 100644 --- a/dev-python/pip/metadata.xml +++ b/dev-python/pip/metadata.xml @@ -1,13 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>python@gentoo.org</email> - <name>Python</name> - </maintainer> - <stabilize-allarches/> - <upstream> - <remote-id type="pypi">pip</remote-id> - <remote-id type="github">pypa/pip</remote-id> - </upstream> -</pkgmetadata> + <maintainer type="project"> + <email>python@gentoo.org</email> + <name>Python</name> + </maintainer> + <upstream> + <remote-id type="pypi">pip</remote-id> + <remote-id type="github">pypa/pip</remote-id> + </upstream> + <origin>gentoo-staging</origin> + <stabilize-allarches/> +</pkgmetadata>
\ No newline at end of file diff --git a/dev-python/pip/pip-20.3.3.ebuild b/dev-python/pip/pip-20.3.3.ebuild deleted file mode 100644 index b2135795cf29..000000000000 --- a/dev-python/pip/pip-20.3.3.ebuild +++ /dev/null @@ -1,150 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DISTUTILS_USE_SETUPTOOLS=rdepend -PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 ) -PYTHON_REQ_USE="ssl(+),threads(+)" - -inherit bash-completion-r1 distutils-r1 multiprocessing - -SETUPTOOLS_PV="44.0.0" -WHEEL_PV="0.34.2" - -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/py2.py3/s/setuptools/setuptools-${SETUPTOOLS_PV}-py2.py3-none-any.whl - https://files.pythonhosted.org/packages/py2.py3/w/wheel/wheel-${WHEEL_PV}-py2.py3-none-any.whl - ) -" -# PyPI archive does not have tests, so we need to download from GitHub. -# setuptools & wheel .whl files are required for testing, exact version is not very important. - -LICENSE="MIT" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos" -SLOT="0" -IUSE="test -vanilla" - -# disable-system-install patch breaks tests -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-python/setuptools-39.2.0[${PYTHON_USEDEP}] -" -DEPEND=" - ${RDEPEND} - test? ( - dev-python/cryptography[${PYTHON_USEDEP}] - dev-python/csv23[${PYTHON_USEDEP}] - dev-python/freezegun[${PYTHON_USEDEP}] - dev-python/mock[${PYTHON_USEDEP}] - dev-python/pretend[${PYTHON_USEDEP}] - dev-python/pytest[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - dev-python/scripttest[${PYTHON_USEDEP}] - <dev-python/virtualenv-20[${PYTHON_USEDEP}] - dev-python/werkzeug[${PYTHON_USEDEP}] - dev-python/wheel[${PYTHON_USEDEP}] - ) -" - -python_prepare_all() { - local PATCHES=( - "${FILESDIR}/${PN}-19.3-disable-version-check.patch" - "${FILESDIR}/${PN}-20.2-no-coverage.patch" - ) - if ! use vanilla; then - PATCHES+=( "${FILESDIR}/pip-20.0.2-disable-system-install.patch" ) - fi - - # TODO - rm tests/functional/test_new_resolver_user.py || die - - distutils-r1_python_prepare_all - - if use test; then - mkdir tests/data/common_wheels/ || die - cp "${DISTDIR}"/setuptools-${SETUPTOOLS_PV}-py2.py3-none-any.whl \ - tests/data/common_wheels/ || die - - cp "${DISTDIR}"/wheel-${WHEEL_PV}-py2.py3-none-any.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 -a exclude_tests - - # these will be built in to an expression passed to pytest to exclude - exclude_tests=( - git - svn - bazaar - mercurial - version_check - uninstall_non_local_distutils - pep518_uses_build_env - install_package_with_root - install_editable_with_prefix - install_user_wheel - install_from_current_directory_into_usersite - uninstall_editable_from_usersite - uninstall_from_usersite_with_dist_in_global_site - build_env_isolation - user_config_accepted - # these fail with new setuptools + distutils_install_for_testing - double_install_fail - multiple_exclude_and_normalization - ) - - distutils_install_for_testing --via-root - - # generate the expression to exclude failing tests - local exclude_expr - printf -v exclude_expr "or %s " "${exclude_tests[@]}" || die - exclude_expr="not (${exclude_expr#or })" || die - - local -x GENTOO_PIP_TESTING=1 \ - PATH="${TEST_DIR}/scripts:${PATH}" \ - PYTHONPATH="${TEST_DIR}/lib:${BUILD_DIR}/lib" - - pytest -vv \ - -k "${exclude_expr}" \ - -m "not network" \ - || die "Tests fail with ${EPYTHON}" -} - -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"; import pip.__main__; sys.exit(pip.__main__._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 -} diff --git a/dev-python/pip/pip-21.0.ebuild b/dev-python/pip/pip-21.0.ebuild index 5b6b877d6d3b..c8692dd7dd80 100644 --- a/dev-python/pip/pip-21.0.ebuild +++ b/dev-python/pip/pip-21.0.ebuild @@ -29,7 +29,7 @@ SRC_URI=" # PyPI archive does not have tests, so we need to download from GitHub. LICENSE="MIT" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos" SLOT="0" IUSE="test -vanilla" RESTRICT="!test? ( test )" |