46 lines
2.1 KiB
Diff
46 lines
2.1 KiB
Diff
From 0d39ae9734d054c25e48e2da7ddb76545e5de330 Mon Sep 17 00:00:00 2001
|
|
From: Tzu-ping Chung <uranusjr@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,
|