Skip to content

Commit 94498e9

Browse files
authored
Revert "Upgrade bundled versions of pip & setuptools (#16782)"
This reverts commit feb0846.
1 parent 5f4b229 commit 94498e9

File tree

5 files changed

+6
-7
lines changed

5 files changed

+6
-7
lines changed

Lib/ensurepip/__init__.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212
__all__ = ["version", "bootstrap"]
1313

1414

15-
_SETUPTOOLS_VERSION = "46.1.3"
15+
_SETUPTOOLS_VERSION = "41.2.0"
1616

17-
_PIP_VERSION = "20.1"
17+
_PIP_VERSION = "19.2.3"
1818

1919
_PROJECTS = [
20-
("setuptools", _SETUPTOOLS_VERSION, 'py3'),
21-
("pip", _PIP_VERSION, 'py2.py3'),
20+
("setuptools", _SETUPTOOLS_VERSION),
21+
("pip", _PIP_VERSION),
2222
]
2323

2424

@@ -107,8 +107,8 @@ def _bootstrap(*, root=None, upgrade=False, user=False,
107107
# Put our bundled wheels into a temporary directory and construct the
108108
# additional paths that need added to sys.path
109109
additional_paths = []
110-
for project, version, py_tag in _PROJECTS:
111-
wheel_name = "{}-{}-{}-none-any.whl".format(project, version, py_tag)
110+
for project, version in _PROJECTS:
111+
wheel_name = "{}-{}-py2.py3-none-any.whl".format(project, version)
112112
whl = resources.read_binary(
113113
_bundled,
114114
wheel_name,
Binary file not shown.
Binary file not shown.

Misc/NEWS.d/next/Library/2019-10-15-23-28-11.bpo-38488.hFQNgA.rst

-1
This file was deleted.

0 commit comments

Comments
 (0)