[arch-commits] Commit in python-pip/trunk (PKGBUILD pip-22.1.2-devendor.patch)

[David Runge]

    Date: Sunday, August 28, 2022 @ 14:22:25
  Author: dvzrv
Revision: 454672

upgpkg: python-pip 22.2.2-2: Rebuild to remove devendoring.

Devendoring leads to undesired side-effects for users when installing packages
in user-space: https://github.com/pypa/pip/issues/11411
Until a better solution is found to circumvent the loading of user-installed
packages instead of the system-wide installed devendored dependencies,
vendoring is unfortunately the only viable option.

Modified:
  python-pip/trunk/PKGBUILD
Deleted:
  python-pip/trunk/pip-22.1.2-devendor.patch

---------------------------+
 PKGBUILD                  |   55 ++++----------------------------------------
 pip-22.1.2-devendor.patch |   12 ---------
 2 files changed, 5 insertions(+), 62 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-08-28 14:11:16 UTC (rev 454671)
+++ PKGBUILD	2022-08-28 14:22:25 UTC (rev 454672)
@@ -7,42 +7,12 @@
 _name=pip
 pkgname=python-pip
 pkgver=22.2.2
-pkgrel=1
+pkgrel=2
 pkgdesc="The PyPA recommended tool for installing Python packages"
 url="https://pip.pypa.io/"
 arch=(any)
 license=(MIT)
-# packages required to devendor pip: https://github.com/pypa/pip/tree/main/src/pip/_vendor
-_vendored=(
-  python-cachecontrol
-  python-certifi
-  python-chardet
-  python-colorama
-  python-distlib
-  python-distro
-  python-idna
-  python-msgpack
-  python-packaging
-  python-pep517
-  python-platformdirs
-  python-pygments
-  python-pyparsing
-  python-requests
-  python-resolvelib
-  python-rich
-  python-setuptools
-  python-six
-  python-tenacity
-  python-tomli
-  python-typing-extensions
-  python-urllib3
-  python-webencodings
-)
-# add these until https://github.com/pypa/pip/issues/5354#issuecomment-672678167 is resolved
-_vendored_optional=(
-  python-pyopenssl
-)
-depends=("${_vendored[@]}" "${_vendored_optional[@]}")
+depends=(python)
 makedepends=(
   python-build
   python-installer
@@ -69,25 +39,10 @@
   python-wheel
   subversion
 )
-source=(
-  $_name-$pkgver.tar.gz::https://github.com/pypa/$_name/archive/$pkgver.tar.gz
-  $_name-22.1.2-devendor.patch
-)
-sha512sums=('bd59e28b55475b77a8f11ea771cbad3b2602ff974e219f9a55288963a9522c9279a5b00fde40fb65cfebefae0e905d3da3c06fe50b402aa5326b25f70a98a015'
-            '90f07252786d765c8ba7ce12915ed9434d3696addb8e5cfff298f280b9f499ad6836a158c9f515a51fc7373f1a77b9eb550b7855609114b041aa7bc5b2b821ae')
-b2sums=('2179b0d3f5f05bbd678f1785b4dbc0613078c09c83b45faa62d766182dfeb564095abda809ed99f45644abcb06c125efc528aeaed3ad40ab1c9e8972e33ccbb2'
-        '892455034738c6c7a74cd7c136c0650f9c4eb54dd4708cf43d2e17ecbd9904adb567c9c3d5a05865048645ad3aac65406a82d23af43fd3889d9290b66d89ead5')
+source=($_name-$pkgver.tar.gz::https://github.com/pypa/$_name/archive/$pkgver.tar.gz)
+sha512sums=('bd59e28b55475b77a8f11ea771cbad3b2602ff974e219f9a55288963a9522c9279a5b00fde40fb65cfebefae0e905d3da3c06fe50b402aa5326b25f70a98a015')
+b2sums=('2179b0d3f5f05bbd678f1785b4dbc0613078c09c83b45faa62d766182dfeb564095abda809ed99f45644abcb06c125efc528aeaed3ad40ab1c9e8972e33ccbb2')
 
-shopt -s extglob
-prepare() {
-  # set DEBUNDLED to True
-  patch -Np1 -d $_name-$pkgver -i ../$_name-22.1.2-devendor.patch
-
-  # remove vendored files, except __init__.py
-  rm -frv $_name-$pkgver/src/pip/_vendor/!(__init__.py)
-  shopt -u extglob
-}
-
 build() {
   cd $_name-$pkgver
 

Deleted: pip-22.1.2-devendor.patch
===================================================================
--- pip-22.1.2-devendor.patch	2022-08-28 14:11:16 UTC (rev 454671)
+++ pip-22.1.2-devendor.patch	2022-08-28 14:22:25 UTC (rev 454672)
@@ -1,12 +0,0 @@
-diff -ruN a/src/pip/_vendor/__init__.py b/src/pip/_vendor/__init__.py
---- a/src/pip/_vendor/__init__.py	2022-05-31 13:05:52.000000000 +0200
-+++ b/src/pip/_vendor/__init__.py	2022-06-27 13:03:22.909131639 +0200
-@@ -14,7 +14,7 @@
- # Downstream redistributors which have debundled our dependencies should also
- # patch this value to be true. This will trigger the additional patching
- # to cause things like "six" to be available as pip.
--DEBUNDLED = False
-+DEBUNDLED = True
- 
- # By default, look in this directory for a bunch of .whl files which we will
- # add to the beginning of sys.path before attempting to import anything. This