[gentoo-commits] repo/gentoo:master commit in: dev-python/pip/

[Michał Górny]

commit:     7f92ebf38d61d956eb3d5f7c7a819a775844d3eb
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Jun  1 06:50:25 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Jun  1 07:21:37 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f92ebf3

dev-python/pip: Bump to 22.1.2

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/pip/Manifest                                 | 3 ++-
 dev-python/pip/pip-22.0.4-r1.ebuild                     | 2 +-
 dev-python/pip/pip-22.1.1.ebuild                        | 2 +-
 dev-python/pip/{pip-22.1.1.ebuild => pip-22.1.2.ebuild} | 6 +++---
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/dev-python/pip/Manifest b/dev-python/pip/Manifest
index 9e0d2bdafb02..dd69099730ad 100644
--- a/dev-python/pip/Manifest
+++ b/dev-python/pip/Manifest
@@ -1,8 +1,9 @@
 DIST pip-22.0.4.tar.gz 9325766 BLAKE2B 
9ce5a25e6fb9aedc39e2cddab2a8af3b47dbaaaf8bd22c39f8301b784e6e9f5434f63d5ef467f4d819b15bcd5cf8d3da52db34b3514c7b4a15823f77cb47e1c1
 SHA512 
af6d1787b4fe97f2eec9c2e3e3f0f756efca8cb83f6ecdae797986fb6050ee60d872a8a8eb7502a32c4334fc0c7af8cf3c58ce980407d0e9f89eec28a4290093
 DIST pip-22.1.1.tar.gz 9346893 BLAKE2B 
2ecf113b644536c125150584ad3e05382c8cc3fa291bb227b7457a203222676721dfe6ba3d5bcde9a2d901ba11c674f0f49c14387023594ea2f0248e688224d8
 SHA512 
3f67171848c4b1282e3abb3a55b1e3d1bdd87e418c535298c8d91ec12d59da271182d7d45f07d080b46a27d9f53c0180ebbfe9379cc640a21f2ec9dd60b06e3e
+DIST pip-22.1.2.gh.tar.gz 9346675 BLAKE2B 
f709f8977d467d5a3170884bb75cd2f74a2f40801ae02a3725d442e18e4073f9c4a39cd1c9d2ce3949eb888be69d151f67d0cf2d0cbad7e2ec1ec6e78150b5c7
 SHA512 
7dd13150023f1cca8f5e01da7688ae418b5d0b36364efcfc15374a5147c7cabd46ff1d34e6499bc8e182dc0d34a366f5fe21d8ab4de4d112d269a97200401305
 DIST setuptools-57.4.0-py3-none-any.whl 819017 BLAKE2B 
afba86cf9aeea58ee869fdc11bbb192abbf2f89710e468b90dc291fec228ca16202483e36195a5ad4e2b8d210326bc83e2be6ec696ab413d94ffaeb05bb9c030
 SHA512 
9bf230f4e0e72acab07ab372a6ca05adb3d175a8079d2f73d327c632f3d27b8ee10442d3e60f4c94a6e61d5ba2212fc78187ca6e1717e15bb570bdce4263fd0b
 DIST setuptools-62.2.0-py3-none-any.whl 1143965 BLAKE2B 
42bf650892d2e5810f18f8002fc6318b5abf890d04b2a3050784b93da88d806af5118eee65ed89b06e1cb908e4c7f6aa50222fba4b8617ab36923cfb624528ae
 SHA512 
496593580b5537fb142bc775d060d01ef3c9069fc06564b5e9cb8e2a56e8f264c1dc7438d38a17f8b7e20d509a6b4f62cdfaf290c4ed82e071a1cc10a297b8b8
 DIST setuptools-62.3.2-py3-none-any.whl 1225929 BLAKE2B 
608952e201f749ebf557e3962ba9856d5bdcbc534f3a25598cab0d6c53282cfb3b9f007ba135497a8addf49db4c02bc4387c486d95a4529d01ce4114154ec28a
 SHA512 
366d69dc44e326dd7549cdacd8dec481a14dce4feef4338adc38b9de5c4c338f04d61696e13ce8603be1315f2e8734100f92d3fe4b4b11843e19f550c9631978
 DIST virtualenv-16.7.11.tar.gz 8134533 BLAKE2B 
ea81e11c210d911bf9576edf7b1754721b270adcc5d9633415d33b8f659149d64932fe2d366200121ec00c266c25dae380e248add438fc357477114eba4dfb4e
 SHA512 
82d0d2a964508511e8e1686703581ff543f65791dc2449d9741d46ea57c4c89673947d2477ba374176f05fcea2a5ca572aa650c61c4f3271c4d73d1ff9d9ff42
-DIST virtualenv-16.7.12.tar.gz 8906590 BLAKE2B 
a1f206769e4e5797562906162e492e44c4a72720e4f88a0362dc802ce2df20c65aaab6a72dce2238445601a10fae59bd90cd362217994d30911f105afd71c5fa
 SHA512 
0278b33fb19f6553e70ad3dcffa6ea1a455ff435b216ac9b4fadff216b2932714faa2bb6027af3058010111d8511a5c2fcd424f31c9645be361603971f111c8e
+DIST virtualenv-16.7.12.gh.tar.gz 8906590 BLAKE2B 
a1f206769e4e5797562906162e492e44c4a72720e4f88a0362dc802ce2df20c65aaab6a72dce2238445601a10fae59bd90cd362217994d30911f105afd71c5fa
 SHA512 
0278b33fb19f6553e70ad3dcffa6ea1a455ff435b216ac9b4fadff216b2932714faa2bb6027af3058010111d8511a5c2fcd424f31c9645be361603971f111c8e
 DIST wheel-0.36.2-py2.py3-none-any.whl 35046 BLAKE2B 
bc4e8dab7c74eea34d3b4a813b7eaf6295a99a396a861b6cdd76f743043e89140bad132bdd13e385e8945ce02e0798e1d3ac73fc1b23bde5b2a83e4bb4dd5cdc
 SHA512 
6bb5119b4d3704fe1e3c1eaaa3124edab13f61b46f8a0a8e75974fac4e5b25d8b53606071a03a8d8990ad1cfe2ab247ddea260098df2c0c35ae965be47080284

diff --git a/dev-python/pip/pip-22.0.4-r1.ebuild 
b/dev-python/pip/pip-22.0.4-r1.ebuild
index b199d1693021..0d8929566407 100644
--- a/dev-python/pip/pip-22.0.4-r1.ebuild
+++ b/dev-python/pip/pip-22.0.4-r1.ebuild
@@ -29,7 +29,7 @@ SRC_URI="
                
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
+                       -> virtualenv-${VENV_PV}.gh.tar.gz
        )
 "
 

diff --git a/dev-python/pip/pip-22.1.1.ebuild b/dev-python/pip/pip-22.1.1.ebuild
index 69eda74f4025..e2310a5a0555 100644
--- a/dev-python/pip/pip-22.1.1.ebuild
+++ b/dev-python/pip/pip-22.1.1.ebuild
@@ -30,7 +30,7 @@ SRC_URI="
                
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
+                       -> virtualenv-${VENV_PV}.gh.tar.gz
        )
 "
 

diff --git a/dev-python/pip/pip-22.1.1.ebuild b/dev-python/pip/pip-22.1.2.ebuild
similarity index 96%
copy from dev-python/pip/pip-22.1.1.ebuild
copy to dev-python/pip/pip-22.1.2.ebuild
index 69eda74f4025..54495b779246 100644
--- a/dev-python/pip/pip-22.1.1.ebuild
+++ b/dev-python/pip/pip-22.1.2.ebuild
@@ -25,12 +25,12 @@ HOMEPAGE="
        https://github.com/pypa/pip/
 "
 SRC_URI="
-       https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+       https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.gh.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
+                       -> virtualenv-${VENV_PV}.gh.tar.gz
        )
 "
 
@@ -65,7 +65,6 @@ distutils_enable_tests pytest
 python_prepare_all() {
        local PATCHES=(
                "${FILESDIR}/pip-21.3-no-coverage.patch"
-               "${FILESDIR}/pip-22.1.1-test-version-check.patch"
        )
        if ! use vanilla; then
                PATCHES+=( 
"${FILESDIR}/pip-20.0.2-disable-system-install.patch" )
@@ -116,6 +115,7 @@ python_test() {
        local -x GENTOO_PIP_TESTING=1
        local -x PYTHONPATH="${WORKDIR}/virtualenv-${VENV_PV}"
        local -x SETUPTOOLS_USE_DISTUTILS=stdlib
+       local -x PIP_DISABLE_PIP_VERSION_CHECK=1
        epytest -m "not network" -n "$(makeopts_jobs)"
 }