diff options
Diffstat (limited to 'dev-python/pip')
-rw-r--r-- | dev-python/pip/Manifest | 8 | ||||
-rw-r--r-- | dev-python/pip/files/pip-19.1-disable-system-install.patch | 17 | ||||
-rw-r--r-- | dev-python/pip/files/pip-19.1-disable-version-check.patch | 19 | ||||
-rw-r--r-- | dev-python/pip/pip-19.1.ebuild | 101 | ||||
-rw-r--r-- | dev-python/pip/pip-19.3.1-r1.ebuild | 2 |
5 files changed, 2 insertions, 145 deletions
diff --git a/dev-python/pip/Manifest b/dev-python/pip/Manifest index 41d193d768c2..a6911d513ceb 100644 --- a/dev-python/pip/Manifest +++ b/dev-python/pip/Manifest @@ -1,5 +1,3 @@ -AUX pip-19.1-disable-system-install.patch 795 BLAKE2B 03cf006ae4482d530a614d4e0b9b5420d924835c88118ea895bbd7db69faa07867d255585fe9b49ea6d81d9689324f1a4844bd2badf3a1304ad748db6c2d6aeb SHA512 fe6bd65e73ed389173b636e339c58de58a96ca6c6dece93e8e5c3178d0c1fcbe2aa5019efba34831b54b09aed956a186604f44da7a50026ec3bf5fad425eaf87 -AUX pip-19.1-disable-version-check.patch 782 BLAKE2B 3dbd3472396edd592d79b418c0c76a2d71cde8557e2c5598bc061c618a7f0028fb086afb7e28e5c051075b65abc65e3568d3ac0c85335d0f8a3db6ad44795ad2 SHA512 ad65449df3e68e406052e21b6349d897dd988a0a257f4ee92032b8c0607807a4427e04d22b32bbef12b3607364299f8521d3c5a6774e32886a665b315b0b6779 AUX pip-19.3-disable-version-check.patch 872 BLAKE2B b0398674f56b78a066c4308f0a8ee0272c5c4c3cb569e6c300ac62fc9fbe8ec2a1bfe257047c15ddcf9cc44c47b7f8b9ab99e17b722bd6ae4cf9dc2a168e01d6 SHA512 1ece773f66556e4380eabf76490430e8fbec23f7cfad27dac02c7e49f7136b632515ef04843e89dfae42c095dbf5280d64e61da1544801c998f802aa59be8e22 AUX pip-19.3.1-disable-system-install.patch 809 BLAKE2B e3a6027922291efe4d1603cb730a9b6aaf653692bc176fd9eea5b804f3d10c419317e9caa97673c02533d4072baf99439af4f76bd38dd5c2ddb98a234ea32c91 SHA512 cf5418444c1a39716b0e528f0630ef931cdd0a4890d16801a575a5072600eb15195d0c0c67e711290e5ed6c7fc40da3f2fd3e5993c638f152240e0ee6f895ac0 AUX pip-19.3.1-network-tests.patch 2436 BLAKE2B bb4397074428c2fa0729380ee30e3e67be09871d592df1012937db495a79ffcbd92b534d48c8b459cd6f3ddd30e363f14961511fc8574d438cb5a8acc7b64f20 SHA512 ec3ca2a8381cdca5d8952803389837070b235b08c9df7985e4ffc4f78e83defb9284480fdee439fd42b86d0de5574c707c1de72b230742fee39ce7b8a57a066b @@ -7,18 +5,14 @@ AUX pip-19.3.1-r2-disable-system-install.patch 835 BLAKE2B 11a8b86f57619b87d090e AUX pip-20.0.2-disable-system-install.patch 1260 BLAKE2B eb2f86c6792b52f446e2c5dbe14eb015032879137a058b291d90da6b5da2c4a563959c34f25cbb551e1218306be136abec692950bace60fa46b439918a16f81b SHA512 0ca24355f54b45d74eba5eaecaac9d6c017a2e7b5743eef533c5ad4f7f28f1f707945a9407716e1a3f88121c6d4179bb6c991696b7f24bf6c77eebcff8d73104 AUX pip-9.0.1-disable-version-check.patch 1031 BLAKE2B 148e528aab19de021f193ac56d758c803e0875b618ee32e948eb103eb6b05eb56e2ecf5ed4dbe39893f5c44ddee17122fdd686f433f5ce89044b2c02291e0ba1 SHA512 8b5764d3ecdbfc871bdf051b41d9610d5028bc3b95a4bf990db46325d10e5d559449ec97ab052686148d6ab6abfa630fb38101c726b6648d19fa94ac593b0a28 AUX pip-disable-system-install.patch 1070 BLAKE2B 85bfd82888a169cf771467f4f811b9859fddc1cfd134ac21be42b9fd93d84118354fa23a2f4b0ec9c67024f571ba7035665302671420221b52f3fc89f24b1af3 SHA512 bb0a9a32b2eac0a12276c3f0527534226c03868300f54945d20eec16902ad51cbfdace9d79b0caa304bc641323194031a5ca9e5e784366a44527441bd0f3c231 -DIST pip-19.1.tar.gz 6320747 BLAKE2B 9b69fcdef751d6938a7c67f44692afa7088f660ab1e0ae113d21d0f48b4e29f43e0f0bcc137cf16ac0324ea3b500bd2a84234823f8d82556d6727f68139aab4b SHA512 0d2442c22c41133118353ba98f45260f0615a891725b2a069d8fbf26ec4033cc7297bb671944c3dcc1f68800b91e92e58fb407ca5a333382e20ac4bb5c9e0cb6 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-9.0.1.tar.gz 1197370 BLAKE2B 3618161690d5e0a38d141f9b51baea4aaa3fdc225664ef180bbeecf6e2df95e9ea4f97c63fe3a68f84f4fb5ebcc74e316827253c7e07b03565e58113bbaa918a SHA512 ee59efb4b009ff6543b7afdea99b9cbbee1981ecc03af586acda76674024d3b66dab23049e68f3da9448734984619fc1eaba6e965c9dd3d731973376c8a42e25 -DIST setuptools-41.0.1-py2.py3-none-any.whl 575966 BLAKE2B 332986453a35e4ec36ab2bdb80a8b0a70ffe4fec1bb874f481b0d8e31016a26d53070f90d0eea9030b8c48a1f9bc21a54d8a5a2b70096e1f8db84d42449903e4 SHA512 c84ddf1d1ea90216b2c475f3e4879f4e6792a859adf61db70d67f49a35f2cb4df6fd6d93049881e6d2a8d914768edfcd091475206bb5da3ac66c41c4b9147102 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.1-py2.py3-none-any.whl 21496 BLAKE2B 41bb9ed91d43f94209a010c286d541da9d68b9e727ec8a339fe3c24fb806746b1de5b62c6cd26d2c2841be17406e1f99353b6d172f5258540faeba014945e9e8 SHA512 761ad8cb96557b146642871e1f8ce75849a9828193d992a19d072236b9f8452ab54907a3b82bc7441f75f036155ae21b7450120e0c4c19aa5100b58337945ac0 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 -EBUILD pip-19.1.ebuild 3584 BLAKE2B 546155c7fa234911831c843c8162e47abd037446b5968c4de59a6565b972318e973a646e16e9383b2be4f6a9d963d67e9e26725e9fc52a1a1d2845a159324d59 SHA512 018b88185e223c3578cdd6bac808807f23de514069b7a13fe3d285b284d1c345ca8c909832d5975efed63c8ceacc908852ec136973793cbdcd8e1f1fc45c445d -EBUILD pip-19.3.1-r1.ebuild 3953 BLAKE2B f3c56b3691e0b595a543934a391a19c27b20b4c14c57066f76535bcdfdd34d0f45435d44f74b844ac85a86389e2f4c99dc99a6f369558c788327e34496f4ea17 SHA512 c4a2d0d4cdfdc8dc917333fe7ed2e0e1e490cfa00f365d9bc6e1fa8719400f271ddc77c25aa8191f1a3fe3592de10697855ebabc2ff287b5cc7b52d9de6885a5 +EBUILD pip-19.3.1-r1.ebuild 3952 BLAKE2B 47558ece06c8b19b245eda03d1f4715d69897c245f492bbf7256237d965eed978919b4373bd9bdafb713305528356a7c178b605ed9db5273577b1485dc436bfd SHA512 3d7d4399a939e2379ddf016ae2e0cd28226272edc86b8e1faee88860b21d32b0a50dc3b3738a3eb52491e32bdac2584b1ed97076740b5f59bd491a0699827a19 EBUILD pip-19.3.1-r2.ebuild 3916 BLAKE2B 0b5663135d0c61e1fba71bff7de5e6b9e74a989f674d1cc1dc418a20631bd0d72680e9360470257b1205100a6ccf7c8f876e236327f591ba1614dc237fbe530f SHA512 f30cb585dad403eea8cee9d17f4b602ab34bf582762ec086fdfd0f93f7c0314421df62336112f42d42528be8072e2cb798cd5e5d1c8c8a6b03fc160ba69d1a5b EBUILD pip-20.0.2.ebuild 3957 BLAKE2B 6eeb001d9789afc065e86d13306a7c3674dfee90f4b6a4927f26c1fef7369b34f58cd1489d19b1e74c8db1c7146e6572c262071b5fe86cf2dfe892ffaa901cc9 SHA512 2dc0f239b7384054655adfcea9a081bf67867e79cdd9e3bf4090a59b5088fce04b653c312396e37da48763f08a2ca8eb1d9347bdc1a2f6e31966d8c71f7793df EBUILD pip-9.0.1-r2.ebuild 2455 BLAKE2B b891741da8946986a3140e1023ec956358d70b1fbabc70964ae2edf596ed96d0fa80b62732da6193ba6a9e45c81ce239058dc4054cff59b3c749d309cda3f85a SHA512 727ebc793313293384c9fcc32e403fd5dbab8ac72528fe0bb96b2011ecf9e8b659f6b4fa0b5165b97d68ef33627b0c0233ce88b955fd962b794d10c613659a45 diff --git a/dev-python/pip/files/pip-19.1-disable-system-install.patch b/dev-python/pip/files/pip-19.1-disable-system-install.patch deleted file mode 100644 index bc88ef715a2e..000000000000 --- a/dev-python/pip/files/pip-19.1-disable-system-install.patch +++ /dev/null @@ -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: -+ 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) diff --git a/dev-python/pip/files/pip-19.1-disable-version-check.patch b/dev-python/pip/files/pip-19.1-disable-version-check.patch deleted file mode 100644 index a46a47f0fc68..000000000000 --- a/dev-python/pip/files/pip-19.1-disable-version-check.patch +++ /dev/null @@ -1,19 +0,0 @@ -Don't check for new versions of pip. - ---- pip-19.1/src/pip/_internal/cli/base_command.py -+++ pip-19.1/src/pip/_internal/cli/base_command.py -@@ -213,12 +213,8 @@ class Command(object): - - return UNKNOWN_ERROR - finally: -- allow_version_check = ( -- # Does this command have the index_group options? -- hasattr(options, "no_index") and -- # Is this command allowed to perform this check? -- not (options.disable_pip_version_check or options.no_index) -- ) -+ # Disabled on Gentoo -+ allow_version_check = False - # Check if we're using the latest version of pip available - if allow_version_check: - session = self._build_session( diff --git a/dev-python/pip/pip-19.1.ebuild b/dev-python/pip/pip-19.1.ebuild deleted file mode 100644 index 7a298c231eb3..000000000000 --- a/dev-python/pip/pip-19.1.ebuild +++ /dev/null @@ -1,101 +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} pypy3 ) -PYTHON_REQ_USE="ssl(+),threads(+)" - -inherit bash-completion-r1 distutils-r1 multiprocessing - -SETUPTOOLS_PV="41.0.1" -WHEEL_PV="0.33.1" - -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 x86" -SLOT="0" -IUSE="test -vanilla" - -# disable-system-install patch breaks tests -RESTRICT="!vanilla? ( test ) !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-4[${PYTHON_USEDEP}] - dev-python/pytest-cov[${PYTHON_USEDEP}] - <dev-python/pytest-rerunfailures-7.0[${PYTHON_USEDEP}] - dev-python/pytest-timeout[${PYTHON_USEDEP}] - <dev-python/pytest-xdist-1.28.0[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - dev-python/scripttest[${PYTHON_USEDEP}] - dev-python/wheel[${PYTHON_USEDEP}] - ) -" - -python_prepare_all() { - local PATCHES=( - "${FILESDIR}/${PN}-19.1-disable-version-check.patch" - ) - if ! use vanilla; then - PATCHES+=( "${FILESDIR}/pip-19.1-disable-system-install.patch" ) - fi - distutils-r1_python_prepare_all - - if use test; then - mkdir tests/data/common_wheels/ - 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 () { - # Exclude tests that fail for some reason. Some of these failures may be Gentoo-specific. - python -m pytest \ - -n $(makeopts_jobs) \ - --timeout 300 \ - -k "not (svn or git or bazaar or mercurial or test_pep518_uses_build_env or test_install_package_with_root or test_install_editable_with_prefix or install_from_user or install_user_conflict or upgrade_user_conflict or build_env_isolation or config_file_venv_option or get_legacy_build_wheel or install_user_wheel or uninstall_non_local_distutils or install_from_current_directory_into_usersite or uninstall_editable_from_usersite)" \ - -m "not network" \ - || die -} - -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-19.3.1-r1.ebuild b/dev-python/pip/pip-19.3.1-r1.ebuild index f0dfd5344704..8a4b36362386 100644 --- a/dev-python/pip/pip-19.3.1-r1.ebuild +++ b/dev-python/pip/pip-19.3.1-r1.ebuild @@ -64,7 +64,7 @@ python_prepare_all() { fi } -python_test () { +python_test() { # pip test suite likes to test installed version of pip, both the module and the executable. # Here we install it into a temporary dir and add to PATHs in a subshell. EPYTHON_ROOT="${T}/${EPYTHON}_root" |