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

[Felix Yan]

    Date: Saturday, June 12, 2021 @ 01:58:03
  Author: felixonmars
Revision: 417997

upgpkg: python-pip 20.3.1-2: fix compatibility with resolvelib 0.5.5

Added:
  python-pip/trunk/resolvelib-0.5.5.patch
Modified:
  python-pip/trunk/PKGBUILD

------------------------+
 PKGBUILD               |   12 +++++++++---
 resolvelib-0.5.5.patch |   45 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 54 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-06-12 01:31:51 UTC (rev 417996)
+++ PKGBUILD	2021-06-12 01:58:03 UTC (rev 417997)
@@ -4,7 +4,7 @@
 
 pkgname=('python-pip' 'python2-pip')
 pkgver=20.3.1
-pkgrel=1
+pkgrel=2
 pkgdesc="The PyPA recommended tool for installing Python packages"
 url="https://pip.pypa.io/"
 arch=('any')
@@ -18,13 +18,19 @@
 checkdepends=('python-pytest-runner' 'python-scripttest' 'python-virtualenv' 'python-pretend'
               'python-yaml' 'python-mock' 'python-freezegun' 'python-cryptography' 'python-pip'
               'python-wheel' 'python-werkzeug' 'python-csv23' 'git' 'subversion')
-source=("pip-${pkgver}.tar.gz::https://github.com/pypa/pip/archive/${pkgver}.tar.gz")
-sha512sums=('6061004b51e57e428a7eef02968fbbde02311ee184019c491012758010bffcb49d371c7612bc43cfacf96fe8de37fdcad34e3cadefc46b3b5962b0c716ee5d59')
+source=("pip-${pkgver}.tar.gz::https://github.com/pypa/pip/archive/${pkgver}.tar.gz"
+        resolvelib-0.5.5.patch)
+sha512sums=('6061004b51e57e428a7eef02968fbbde02311ee184019c491012758010bffcb49d371c7612bc43cfacf96fe8de37fdcad34e3cadefc46b3b5962b0c716ee5d59'
+            'f339a20e965c583c1dc741d9fff90749aab049d591f0ac974e2187d4f41842661802b96266e8e35454b65d61d65c337a770d58b81119af07483fde0eda48001b')
 
 shopt -s extglob
 prepare() {
   cd pip-$pkgver
 
+  # Backported from:
+  # https://github.com/pypa/pip/commit/0d39ae9734d054c25e48e2da7ddb76545e5de330
+  patch -p1 -i ../resolvelib-0.5.5.patch
+
   # Remove certifi usage
   sed -i 's|from pip._vendor.certifi import where|where = lambda: "/etc/ssl/certs/ca-certificates.crt"|' src/pip/_internal/commands/debug.py
 

Added: resolvelib-0.5.5.patch
===================================================================
--- resolvelib-0.5.5.patch	                        (rev 0)
+++ resolvelib-0.5.5.patch	2021-06-12 01:58:03 UTC (rev 417997)
@@ -0,0 +1,45 @@
+From 0d39ae9734d054c25e48e2da7ddb76545e5de330 Mon Sep 17 00:00:00 2001
+From: Tzu-ping Chung <uranusjr at gmail.com>
+Date: Tue, 9 Mar 2021 05:20:23 +0800
+Subject: [PATCH] Pull in resolvelib's typing information
+
+---
+ .../resolution/resolvelib/factory.py          |  9 ++-
+ .../resolution/resolvelib/provider.py         | 24 ++++--
+ .../resolution/resolvelib/resolver.py         | 25 +++++--
+ src/pip/_vendor/resolvelib.pyi                |  1 -
+ src/pip/_vendor/resolvelib/__init__.py        |  2 +-
+ src/pip/_vendor/resolvelib/__init__.pyi       | 15 ++++
+ src/pip/_vendor/resolvelib/providers.py       |  8 +-
+ src/pip/_vendor/resolvelib/providers.pyi      | 44 +++++++++++
+ src/pip/_vendor/resolvelib/py.typed           |  0
+ src/pip/_vendor/resolvelib/reporters.pyi      | 10 +++
+ src/pip/_vendor/resolvelib/resolvers.py       | 39 +++++-----
+ src/pip/_vendor/resolvelib/resolvers.pyi      | 73 +++++++++++++++++++
+ src/pip/_vendor/resolvelib/structs.pyi        | 35 +++++++++
+ src/pip/_vendor/vendor.txt                    |  2 +-
+ 14 files changed, 242 insertions(+), 45 deletions(-)
+ delete mode 100644 src/pip/_vendor/resolvelib.pyi
+ create mode 100644 src/pip/_vendor/resolvelib/__init__.pyi
+ create mode 100644 src/pip/_vendor/resolvelib/providers.pyi
+ create mode 100644 src/pip/_vendor/resolvelib/py.typed
+ create mode 100644 src/pip/_vendor/resolvelib/reporters.pyi
+ create mode 100644 src/pip/_vendor/resolvelib/resolvers.pyi
+ create mode 100644 src/pip/_vendor/resolvelib/structs.pyi
+
+diff --git a/src/pip/_internal/resolution/resolvelib/provider.py b/src/pip/_internal/resolution/resolvelib/provider.py
+index 2085a0714a3..cd2ccfa60a3 100644
+--- a/src/pip/_internal/resolution/resolvelib/provider.py
++++ b/src/pip/_internal/resolution/resolvelib/provider.py
+@@ -50,9 +50,9 @@ def __init__(
+         self._upgrade_strategy = upgrade_strategy
+         self._user_requested = user_requested
+ 
+-    def identify(self, dependency):
++    def identify(self, requirement_or_candidate):
+         # type: (Union[Requirement, Candidate]) -> str
+-        return dependency.name
++        return requirement_or_candidate.name
+ 
+     def get_preference(
+         self,