1 From 0d39ae9734d054c25e48e2da7ddb76545e5de330 Mon Sep 17 00:00:00 2001
2 From: Tzu-ping Chung <uranusjr@gmail.com>
3 Date: Tue, 9 Mar 2021 05:20:23 +0800
4 Subject: [PATCH] Pull in resolvelib's typing information
7 .../resolution/resolvelib/factory.py | 9 ++-
8 .../resolution/resolvelib/provider.py | 24 ++++--
9 .../resolution/resolvelib/resolver.py | 25 +++++--
10 src/pip/_vendor/resolvelib.pyi | 1 -
11 src/pip/_vendor/resolvelib/__init__.py | 2 +-
12 src/pip/_vendor/resolvelib/__init__.pyi | 15 ++++
13 src/pip/_vendor/resolvelib/providers.py | 8 +-
14 src/pip/_vendor/resolvelib/providers.pyi | 44 +++++++++++
15 src/pip/_vendor/resolvelib/py.typed | 0
16 src/pip/_vendor/resolvelib/reporters.pyi | 10 +++
17 src/pip/_vendor/resolvelib/resolvers.py | 39 +++++-----
18 src/pip/_vendor/resolvelib/resolvers.pyi | 73 +++++++++++++++++++
19 src/pip/_vendor/resolvelib/structs.pyi | 35 +++++++++
20 src/pip/_vendor/vendor.txt | 2 +-
21 14 files changed, 242 insertions(+), 45 deletions(-)
22 delete mode 100644 src/pip/_vendor/resolvelib.pyi
23 create mode 100644 src/pip/_vendor/resolvelib/__init__.pyi
24 create mode 100644 src/pip/_vendor/resolvelib/providers.pyi
25 create mode 100644 src/pip/_vendor/resolvelib/py.typed
26 create mode 100644 src/pip/_vendor/resolvelib/reporters.pyi
27 create mode 100644 src/pip/_vendor/resolvelib/resolvers.pyi
28 create mode 100644 src/pip/_vendor/resolvelib/structs.pyi
30 diff --git a/src/pip/_internal/resolution/resolvelib/provider.py b/src/pip/_internal/resolution/resolvelib/provider.py
31 index 2085a0714a3..cd2ccfa60a3 100644
32 --- a/src/pip/_internal/resolution/resolvelib/provider.py
33 +++ b/src/pip/_internal/resolution/resolvelib/provider.py
34 @@ -50,9 +50,9 @@ def __init__(
35 self._upgrade_strategy = upgrade_strategy
36 self._user_requested = user_requested
38 - def identify(self, dependency):
39 + def identify(self, requirement_or_candidate):
40 # type: (Union[Requirement, Candidate]) -> str
41 - return dependency.name
42 + return requirement_or_candidate.name