Skip to content

Commit 7b2f0aa

Browse files
committed
Upgrade pkg_resources (via setuptools) to 44.0.0
1 parent 1176591 commit 7b2f0aa

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

news/pkg_resources.vendor

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Upgrade pkg_resources (via setuptools) to 44.0.0

src/pip/_vendor/pkg_resources/__init__.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,8 @@
8888
__metaclass__ = type
8989

9090

91-
if (3, 0) < sys.version_info < (3, 4):
92-
raise RuntimeError("Python 3.4 or later is required")
91+
if (3, 0) < sys.version_info < (3, 5):
92+
raise RuntimeError("Python 3.5 or later is required")
9393

9494
if six.PY2:
9595
# Those builtin exceptions are only defined in Python 3
@@ -333,7 +333,7 @@ class UnknownExtra(ResolutionError):
333333

334334
_provider_factories = {}
335335

336-
PY_MAJOR = sys.version[:3]
336+
PY_MAJOR = '{}.{}'.format(*sys.version_info)
337337
EGG_DIST = 3
338338
BINARY_DIST = 2
339339
SOURCE_DIST = 1
@@ -3109,6 +3109,7 @@ def __init__(self, requirement_string):
31093109
self.extras = tuple(map(safe_extra, self.extras))
31103110
self.hashCmp = (
31113111
self.key,
3112+
self.url,
31123113
self.specifier,
31133114
frozenset(self.extras),
31143115
str(self.marker) if self.marker else None,

src/pip/_vendor/vendor.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ requests==2.22.0
1818
idna==2.8
1919
urllib3==1.25.7
2020
retrying==1.3.3
21-
setuptools==41.4.0
21+
setuptools==44.0.0
2222
six==1.14.0
2323
webencodings==0.5.1

0 commit comments

Comments
 (0)