mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-11-06 05:37:14 -08:00
dev-python/pip: Remove old
Signed-off-by: Michał Górny <mgorny@gentoo.org>
This commit is contained in:
Michał Górny
@@ -1,9 +1,5 @@
|
||||
DIST pip-19.3.1.tar.gz 6409819 BLAKE2B b3aacd0bee60400a1f30b4be57871002072e5cc7a86e76cca1848e977ebdc85b6e282fc521c19bf7a518d1aef3280133fcd65a431cb2a16e202dd7721c5b97ad SHA512 39446c0ab6e4495d98f22923a2a76901b024d9047b60d92580b21d447a718e5285cfd66f8ad0c20befcfe1abc7f06be29b6a5644d1b30265d3b67399fe76e033
|
||||
DIST pip-20.0.2.tar.gz 6445047 BLAKE2B 8f6e0a8908cf594c8d51818942b0839f59a495697a95dcc0347235e90cbe6d7f035f155761e7da9cfca1ba08b2c5a2c5def52c60c381f5428ef48efd1b6b5131 SHA512 f9965944ca0f319d01db1638ce97cf64772afff1778b3b1271155de73208cfcb3954d89a469c1143c0bf3288a53d4446165a49df994374b16ac6f7ffdae85857
|
||||
DIST pip-20.1.1.tar.gz 6503229 BLAKE2B 5b0409042c970ec47fa6f947b21a53aca43563a6bb442fd5f91788fa97caf7167a84b4f581de87453eb0e55657d2ccd11dca2d1815c3bfe9ef5923994306a6db SHA512 ee7b0345c08fbe0215811d07b4c57c1ceece826871842f6d1c174d82e8eee0ad810aa5413d6763ecd5a513e151792a53c36623ab99d2049555ef2542d32d1658
|
||||
DIST pip-20.2.tar.gz 8715960 BLAKE2B dbcec865314ba0b65112e42477a2c48dc9a60592a07a834d3886025489fcd8de4c83733044d1ad84dd87af084677b2f406d5d8faa301853ab844b3770be168de SHA512 77db7c618b492cbdef54ef98d4e9a94735a809148fb08ef7d065fbeaf047ced26ddc20d0395a0b2db079c66175a267fc15717a24def70392182326b2c659e6f1
|
||||
DIST pip-9.0.1.tar.gz 1197370 BLAKE2B 3618161690d5e0a38d141f9b51baea4aaa3fdc225664ef180bbeecf6e2df95e9ea4f97c63fe3a68f84f4fb5ebcc74e316827253c7e07b03565e58113bbaa918a SHA512 ee59efb4b009ff6543b7afdea99b9cbbee1981ecc03af586acda76674024d3b66dab23049e68f3da9448734984619fc1eaba6e965c9dd3d731973376c8a42e25
|
||||
DIST setuptools-41.4.0-py2.py3-none-any.whl 580302 BLAKE2B 58dc2d48445406f7467bfb0934dc507e8a569e4759bfcc95287cfb21b5b1a7bcab061656a29a8b4976ee3ae12a3adca570035ae4a6d9df09ae7a799857775d36 SHA512 a27b38d596931dfef81d705d05689b7748ce0e02d21af4a37204fc74b0913fa7241b8135535eb7749f09af361cad90c475af98493fef11c4ad974780ee01243d
|
||||
DIST setuptools-44.0.0-py2.py3-none-any.whl 583230 BLAKE2B 823e6792471660f247e30a938aa869d345a63db7294e5f9b4bd88f15a7694779011d29740fe317149620985f705fc6e18cbb07a18e5680cc11d7c229ffbc74f6 SHA512 7006fd303181afbeeec0e30cafb9fd1e4d3c6f55cfdd6343fedbc32b17dbb96b3d96ae37f4db27bfb168738727474cf425904ec280ff1d2b789fc48077a8fa84
|
||||
DIST wheel-0.33.6-py2.py3-none-any.whl 21556 BLAKE2B 6b6124c1e8e70592399a90c88b2a70efc5885bad81d2ff07a2e243eee008ba5cb0c927454036915a61e97489e29fe1abc4ba2e63d7eadf1a8985c8a8b7cdf4c4 SHA512 4663cd55ee9d3de138216bb06870606b546b19cb6a733f1beab211c0ba72e63d849c422d320ddc8aa8275ad04a30119a84c1351e589150cd18c2a34f9fdb224a
|
||||
DIST wheel-0.34.2-py2.py3-none-any.whl 26502 BLAKE2B 3a1bd4571c582245b60ff33c9bf74ff8a2ebafb26e56fc7b9bd215058d059b6bd13bbe21ce46002af257813a54126f27e19253f211e21c4548c7cf84cd15caf7 SHA512 4f1a44f4691ed8baad777d7874f7f4da96a5019eb485fd3a9eed9259aa2a9d5acccc6dc63a72128664347c64ee039a6076c6ca9c3b75a1f94457967864e522ed
|
||||
|
||||
@@ -1,66 +0,0 @@
|
||||
diff --git a/news/7359.trivial b/news/7359.trivial
|
||||
new file mode 100644
|
||||
index 000000000..e69de29bb
|
||||
diff --git a/tests/functional/test_freeze.py b/tests/functional/test_freeze.py
|
||||
index d13c931d0..2e35de3e6 100644
|
||||
--- a/tests/functional/test_freeze.py
|
||||
+++ b/tests/functional/test_freeze.py
|
||||
@@ -721,6 +721,7 @@ def test_freeze_user(script, virtualenv, data):
|
||||
assert 'simple2' not in result.stdout
|
||||
|
||||
|
||||
+@pytest.mark.network
|
||||
def test_freeze_path(tmpdir, script, data):
|
||||
"""
|
||||
Test freeze with --path.
|
||||
@@ -734,5 +735,6 @@ def test_freeze_path(tmpdir, script, data):
|
||||
_check_output(result.stdout, expected)
|
||||
|
||||
|
||||
+@pytest.mark.network
|
||||
def test_freeze_path_exclude_user(tmpdir, script, data):
|
||||
"""
|
||||
@@ -756,6 +758,7 @@ def test_freeze_path_exclude_user(tmpdir, script, data):
|
||||
_check_output(result.stdout, expected)
|
||||
|
||||
|
||||
+@pytest.mark.network
|
||||
def test_freeze_path_multiple(tmpdir, script, data):
|
||||
"""
|
||||
Test freeze with multiple --path arguments.
|
||||
diff --git a/tests/functional/test_install.py b/tests/functional/test_install.py
|
||||
index a9eff081d..ba7a0a55c 100644
|
||||
--- a/tests/functional/test_install.py
|
||||
+++ b/tests/functional/test_install.py
|
||||
@@ -1325,6 +1325,7 @@ def test_install_no_binary_disables_building_wheels(script, data, with_wheel):
|
||||
assert "Running setup.py install for upper" in str(res), str(res)
|
||||
|
||||
|
||||
+@pytest.mark.network
|
||||
def test_install_no_binary_builds_pep_517_wheel(script, data, with_wheel):
|
||||
to_install = data.packages.joinpath('pep517_setup_and_pyproject')
|
||||
res = script.pip(
|
||||
diff --git a/tests/functional/test_install_config.py b/tests/functional/test_install_config.py
|
||||
index 176976c4e..308263928 100644
|
||||
--- a/tests/functional/test_install_config.py
|
||||
+++ b/tests/functional/test_install_config.py
|
||||
@@ -133,6 +133,7 @@ def test_command_line_appends_correctly(script, data):
|
||||
), 'stdout: {}'.format(result.stdout)
|
||||
|
||||
|
||||
+@pytest.mark.network
|
||||
def test_config_file_override_stack(script, virtualenv):
|
||||
"""
|
||||
Test config files (global, overriding a global config with a
|
||||
diff --git a/tests/functional/test_install_upgrade.py b/tests/functional/test_install_upgrade.py
|
||||
index 6d2eeb5dc..0024de4d4 100644
|
||||
--- a/tests/functional/test_install_upgrade.py
|
||||
+++ b/tests/functional/test_install_upgrade.py
|
||||
@@ -8,6 +8,7 @@
|
||||
from tests.lib.local_repos import local_checkout
|
||||
|
||||
|
||||
+@pytest.mark.network
|
||||
def test_no_upgrade_unless_requested(script):
|
||||
"""
|
||||
No upgrade if not specifically requested.
|
||||
@@ -1,17 +0,0 @@
|
||||
install: Raise an error to avoid breaking python-exec
|
||||
|
||||
Running pip without --target, --root, or --user will result in packages
|
||||
being installed systemwide. This has a tendency to break python-exec if
|
||||
setuptools gets installed or upgraded.
|
||||
|
||||
--- pip-19.1/src/pip/_internal/commands/install.py
|
||||
+++ pip-19.1/src/pip/_internal/commands/install.py
|
||||
@@ -246,6 +246,9 @@ class InstallCommand(RequirementCommand):
|
||||
if options.upgrade:
|
||||
upgrade_strategy = options.upgrade_strategy
|
||||
|
||||
+ if not options.use_user_site and not options.target_dir and not options.root_path and not os.getenv('GENTOO_PIP_TESTING'):
|
||||
+ raise CommandError("(Gentoo) Please run pip with the --user option to avoid breaking python-exec")
|
||||
+
|
||||
if options.build_dir:
|
||||
options.build_dir = os.path.abspath(options.build_dir)
|
||||
@@ -1,32 +0,0 @@
|
||||
From 890a1c26018752f2c57c7800968e4b8d1e0987f9 Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Pipping <sebastian@pipping.org>
|
||||
Date: Sun, 20 Nov 2016 19:52:40 +0100
|
||||
Subject: [PATCH] Stop checking for new versions
|
||||
|
||||
---
|
||||
pip/basecommand.py | 9 ---------
|
||||
1 file changed, 9 deletions(-)
|
||||
|
||||
diff --git a/pip/basecommand.py b/pip/basecommand.py
|
||||
index 54c6706..3cffe86 100644
|
||||
--- a/pip/basecommand.py
|
||||
+++ b/pip/basecommand.py
|
||||
@@ -241,15 +241,6 @@ class Command(object):
|
||||
logger.critical('Exception:', exc_info=True)
|
||||
|
||||
return UNKNOWN_ERROR
|
||||
- finally:
|
||||
- # Check if we're using the latest version of pip available
|
||||
- if (not options.disable_pip_version_check and not
|
||||
- getattr(options, "no_index", False)):
|
||||
- with self._build_session(
|
||||
- options,
|
||||
- retries=0,
|
||||
- timeout=min(5, options.timeout)) as session:
|
||||
- pip_version_check(session)
|
||||
|
||||
return SUCCESS
|
||||
|
||||
--
|
||||
2.10.2
|
||||
|
||||
@@ -1,29 +0,0 @@
|
||||
From 847553da616edabede18c69ba640a32b719b45a8 Mon Sep 17 00:00:00 2001
|
||||
From: Mike Gilbert <floppym@gentoo.org>
|
||||
Date: Tue, 27 Oct 2015 12:20:44 -0400
|
||||
Subject: [PATCH] install: Raise an error to avoid breaking python-exec
|
||||
|
||||
Running pip without --target, --root, or --user will result in packages
|
||||
being installed systemwide. This has a tendency to break python-exec if
|
||||
setuptools gets installed or upgraded.
|
||||
---
|
||||
pip/commands/install.py | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/pip/commands/install.py b/pip/commands/install.py
|
||||
index 46cd9f2..36b72f2 100644
|
||||
--- a/pip/commands/install.py
|
||||
+++ b/pip/commands/install.py
|
||||
@@ -204,6 +204,9 @@ class InstallCommand(RequirementCommand):
|
||||
)
|
||||
options.ignore_installed = True
|
||||
|
||||
+ if not options.use_user_site and not options.target_dir and not options.root_path:
|
||||
+ raise CommandError("(Gentoo) Please run pip with the --user option to avoid breaking python-exec")
|
||||
+
|
||||
if options.build_dir:
|
||||
options.build_dir = os.path.abspath(options.build_dir)
|
||||
|
||||
--
|
||||
2.6.2
|
||||
|
||||
@@ -1,138 +0,0 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
|
||||
PYTHON_REQ_USE="ssl(+),threads(+)"
|
||||
|
||||
inherit bash-completion-r1 distutils-r1 multiprocessing
|
||||
|
||||
SETUPTOOLS_PV="41.4.0"
|
||||
WHEEL_PV="0.33.6"
|
||||
|
||||
DESCRIPTION="Installs python packages -- replacement for easy_install"
|
||||
HOMEPAGE="https://pip.pypa.io/ 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="amd64 arm64 ~hppa ~sparc x86"
|
||||
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/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[${PYTHON_USEDEP}]
|
||||
dev-python/wheel[${PYTHON_USEDEP}]
|
||||
)
|
||||
"
|
||||
|
||||
python_prepare_all() {
|
||||
local PATCHES=(
|
||||
"${FILESDIR}/${PN}-19.3-disable-version-check.patch"
|
||||
|
||||
# these are from upstream git
|
||||
"${FILESDIR}/pip-19.3.1-network-tests.patch"
|
||||
"${FILESDIR}/${PN}-20.1.1-test-endian.patch"
|
||||
)
|
||||
if ! use vanilla; then
|
||||
PATCHES+=( "${FILESDIR}/pip-19.3.1-r2-disable-system-install.patch" )
|
||||
fi
|
||||
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
|
||||
)
|
||||
|
||||
distutils_install_for_testing
|
||||
|
||||
# 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
|
||||
}
|
||||
@@ -1,84 +0,0 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
|
||||
PYTHON_REQ_USE="threads(+)"
|
||||
|
||||
inherit eutils bash-completion-r1 distutils-r1
|
||||
|
||||
DESCRIPTION="Installs python packages -- replacement for easy_install"
|
||||
HOMEPAGE="https://pip.pypa.io/ https://pypi.org/project/pip/ https://github.com/pypa/pip/"
|
||||
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="MIT"
|
||||
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
|
||||
SLOT="0"
|
||||
|
||||
IUSE="-vanilla"
|
||||
|
||||
# Check pip/_vendor/vendor.txt for this
|
||||
#VENDOR_DEPEND="
|
||||
# >=dev-python/distlib-0.2.2[${PYTHON_USEDEP}]
|
||||
# >=dev-python/html5lib-1.0b8[${PYTHON_USEDEP}]
|
||||
# >=dev-python/six-1.10.0${PYTHON_USEDEP}]
|
||||
# >=dev-python/colorama-0.3.6[${PYTHON_USEDEP}]
|
||||
# >=dev-python/requests-2.9.1-r2[${PYTHON_USEDEP}]
|
||||
# >=dev-python/CacheControl-0.11.6[${PYTHON_USEDEP}]
|
||||
# >=dev-python/lockfile-0.12.2[${PYTHON_USEDEP}]
|
||||
# >=dev-python/progress-1.2[${PYTHON_USEDEP}]
|
||||
# >=dev-python/packaging-16.5[${PYTHON_USEDEP}]
|
||||
# >=dev-python/retrying-1.3.3[${PYTHON_USEDEP}]
|
||||
# >=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
|
||||
# virtual/python-ipaddress[${PYTHON_USEDEP}]
|
||||
#"
|
||||
# https://github.com/pypa/pip/issues/3057
|
||||
#RDEPEND="${VENDOR_DEPEND}
|
||||
# >=dev-python/setuptools-19.2[${PYTHON_USEDEP}]
|
||||
# <dev-python/setuptools-19.4[${PYTHON_USEDEP}]
|
||||
#"
|
||||
#DEPEND="${RDEPEND}"
|
||||
|
||||
# required test data isn't bundled with the tarball
|
||||
RESTRICT="test"
|
||||
|
||||
#PATCHES=(
|
||||
# "${FILESDIR}"/${PN}-6.0.2-disable-version-check.patch
|
||||
# "${FILESDIR}"/${PN}-8.0.0-unbundle.patch
|
||||
# )
|
||||
|
||||
#python_prepare_all() {
|
||||
# mv pip/_vendor/__init__.py "${T}" || die
|
||||
# rm -r pip/_vendor/* || die
|
||||
# mv "${T}"/__init__.py pip/_vendor/__init__.py || die
|
||||
#
|
||||
# distutils-r1_python_prepare_all
|
||||
#}
|
||||
|
||||
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
python_prepare_all() {
|
||||
local PATCHES=(
|
||||
"${FILESDIR}/${PN}-9.0.1-disable-version-check.patch"
|
||||
)
|
||||
if ! use vanilla; then
|
||||
PATCHES+=( "${FILESDIR}/pip-disable-system-install.patch" )
|
||||
fi
|
||||
distutils-r1_python_prepare_all
|
||||
}
|
||||
|
||||
python_install_all() {
|
||||
local DOCS=( AUTHORS.txt docs/*.rst )
|
||||
distutils-r1_python_install_all
|
||||
|
||||
COMPLETION="${T}"/completion.tmp
|
||||
|
||||
"${PYTHON}" -m pip completion --bash > "${COMPLETION}" || die
|
||||
newbashcomp "${COMPLETION}" ${PN}
|
||||
|
||||
"${PYTHON}" -m pip completion --zsh > "${COMPLETION}" || die
|
||||
insinto /usr/share/zsh/site-functions
|
||||
newins "${COMPLETION}" _pip
|
||||
}
|
||||
Reference in New Issue
Block a user