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

[David Runge]

    Date: Friday, July 22, 2022 @ 21:04:00
  Author: dvzrv
Revision: 451560

upgpkg: python-pip 22.2-1: Upgrade to 22.2.

Remove python-html5lib from depends (upstream removed it from vendored packages).
Remove patch for fixing an import when devendoring (merged upstream and included).
Add docs.

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

-----------------------------------+
 PKGBUILD                          |   17 ++++++-----------
 pip-22.1.2-devendor_imports.patch |   21 ---------------------
 2 files changed, 6 insertions(+), 32 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-07-22 20:40:12 UTC (rev 451559)
+++ PKGBUILD	2022-07-22 21:04:00 UTC (rev 451560)
@@ -6,7 +6,7 @@
 
 _name=pip
 pkgname=python-pip
-pkgver=22.1.2
+pkgver=22.2
 pkgrel=1
 pkgdesc="The PyPA recommended tool for installing Python packages"
 url="https://pip.pypa.io/"
@@ -20,7 +20,6 @@
   python-colorama
   python-distlib
   python-distro
-  python-html5lib
   python-idna
   python-msgpack
   python-packaging
@@ -73,21 +72,16 @@
 source=(
   $_name-$pkgver.tar.gz::https://github.com/pypa/$_name/archive/$pkgver.tar.gz
   $_name-22.1.2-devendor.patch
-  $_name-22.1.2-devendor_imports.patch
 )
-sha512sums=('7dd13150023f1cca8f5e01da7688ae418b5d0b36364efcfc15374a5147c7cabd46ff1d34e6499bc8e182dc0d34a366f5fe21d8ab4de4d112d269a97200401305'
-            '90f07252786d765c8ba7ce12915ed9434d3696addb8e5cfff298f280b9f499ad6836a158c9f515a51fc7373f1a77b9eb550b7855609114b041aa7bc5b2b821ae'
-            '5abdd74c505f649e381c807607c98edeab45671ca48bb7d99fc85d35191bbe7addbcadb4b833d8851095896433a8860a703c80e120a15038afb234448cea514d')
-b2sums=('f709f8977d467d5a3170884bb75cd2f74a2f40801ae02a3725d442e18e4073f9c4a39cd1c9d2ce3949eb888be69d151f67d0cf2d0cbad7e2ec1ec6e78150b5c7'
-        '892455034738c6c7a74cd7c136c0650f9c4eb54dd4708cf43d2e17ecbd9904adb567c9c3d5a05865048645ad3aac65406a82d23af43fd3889d9290b66d89ead5'
-        '256b5cc8b0f91265965ca90f443033f540fc698fca981cc9b30fbba60fcc9a82b2f7acfabb807db0911677f5a50ad3387879adf6ee21b6029cad47ed2abe7ebd')
+sha512sums=('2ff3f9c2dc84c65c14c978e8c58cd3cee6cfff9753655c726763d6d7780d147479f32c47873d402ad9e0821fef940b971a7df93fabd6b998f07dea5af1251c9b'
+            '90f07252786d765c8ba7ce12915ed9434d3696addb8e5cfff298f280b9f499ad6836a158c9f515a51fc7373f1a77b9eb550b7855609114b041aa7bc5b2b821ae')
+b2sums=('e32fe63e81593a0ec9c0110af0f07f1a47ddd3d6c660c11e9eb9142c251b7f45e3a1cc343193b123364a6a3a69490add7d4ebb368aac027c448f00f7cd163d7c'
+        '892455034738c6c7a74cd7c136c0650f9c4eb54dd4708cf43d2e17ecbd9904adb567c9c3d5a05865048645ad3aac65406a82d23af43fd3889d9290b66d89ead5')
 
 shopt -s extglob
 prepare() {
   # set DEBUNDLED to True
   patch -Np1 -d $_name-$pkgver -i ../$_name-22.1.2-devendor.patch
-  # add missing imports for rich for devendoring: https://github.com/pypa/pip/pull/11211
-  patch -Np1 -d $_name-$pkgver -i ../$_name-22.1.2-devendor_imports.patch
 
   # remove vendored files, except __init__.py
   rm -frv $_name-$pkgver/src/pip/_vendor/!(__init__.py)
@@ -128,6 +122,7 @@
 
   install -vDm 644 LICENSE.txt -t "$pkgdir/usr/share/licenses/$pkgname/"
   install -vDm 644 docs/build/man/*.1 -t "$pkgdir/usr/share/man/man1/"
+  install -vDm 644 {NEWS,README}.rst -t "$pkgdir/usr/share/doc/$pkgname/"
 
   # NOTE: zsh completion does not work: https://bugs.archlinux.org/task/65349#comment187166
   PYTHONPATH="$pkgdir/$_site_packages" "$pkgdir"/usr/bin/pip completion --bash | install -vDm 644 /dev/stdin "$pkgdir"/usr/share/bash-completion/completions/pip

Deleted: pip-22.1.2-devendor_imports.patch
===================================================================
--- pip-22.1.2-devendor_imports.patch	2022-07-22 20:40:12 UTC (rev 451559)
+++ pip-22.1.2-devendor_imports.patch	2022-07-22 21:04:00 UTC (rev 451560)
@@ -1,21 +0,0 @@
-diff --git c/src/pip/_vendor/__init__.py w/src/pip/_vendor/__init__.py
-index 3843cb099..39579aa96 100644
---- c/src/pip/_vendor/__init__.py
-+++ w/src/pip/_vendor/__init__.py
-@@ -106,6 +106,16 @@ if DEBUNDLED:
-     vendored("requests.packages.urllib3.util.timeout")
-     vendored("requests.packages.urllib3.util.url")
-     vendored("resolvelib")
-+    vendored("rich")
-+    vendored("rich.console")
-+    vendored("rich.highlighter")
-+    vendored("rich.logging")
-+    vendored("rich.markup")
-+    vendored("rich.progress")
-+    vendored("rich.segment")
-+    vendored("rich.style")
-+    vendored("rich.text")
-+    vendored("rich.traceback")
-     vendored("tenacity")
-     vendored("tomli")
-     vendored("urllib3")