Revert "Upgrade bundled versions of pip & setuptools (#16782)" (GH-20484)

This reverts commit feb0846c3a.
This commit is contained in:
Victor Stinner 2020-05-28 15:57:49 +02:00 committed by GitHub
parent 5f4b229df7
commit 4fd4963ccc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 6 additions and 7 deletions

View File

@ -12,13 +12,13 @@ from . import _bundled
__all__ = ["version", "bootstrap"] __all__ = ["version", "bootstrap"]
_SETUPTOOLS_VERSION = "46.1.3" _SETUPTOOLS_VERSION = "41.2.0"
_PIP_VERSION = "20.1" _PIP_VERSION = "19.2.3"
_PROJECTS = [ _PROJECTS = [
("setuptools", _SETUPTOOLS_VERSION, 'py3'), ("setuptools", _SETUPTOOLS_VERSION),
("pip", _PIP_VERSION, 'py2.py3'), ("pip", _PIP_VERSION),
] ]
@ -107,8 +107,8 @@ def _bootstrap(*, root=None, upgrade=False, user=False,
# Put our bundled wheels into a temporary directory and construct the # Put our bundled wheels into a temporary directory and construct the
# additional paths that need added to sys.path # additional paths that need added to sys.path
additional_paths = [] additional_paths = []
for project, version, py_tag in _PROJECTS: for project, version in _PROJECTS:
wheel_name = "{}-{}-{}-none-any.whl".format(project, version, py_tag) wheel_name = "{}-{}-py2.py3-none-any.whl".format(project, version)
whl = resources.read_binary( whl = resources.read_binary(
_bundled, _bundled,
wheel_name, wheel_name,

Binary file not shown.

View File

@ -1 +0,0 @@
Update ensurepip to install pip 20.1 and setuptools 46.1.3.