mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 16:39:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

bpo-38488: Upgrade bundled versions of pip & setuptools (GH-20491)

Browse source 
(cherry picked from commit 5f79f46612)

Co-authored-by: Xavier Fernandez <xav.fernandez@gmail.com>
This commit is contained in:
Miss Islington (bot) 2020-06-15 13:39:49 -07:00 • committed by GitHub
parent b498c7f1b3
commit bc996c67b7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Lib/ensurepip/__init__.py
View file

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