mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-27 02:39:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

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"] __all__ = ["version", "bootstrap"]
_SETUPTOOLS_VERSION = "41.2.0" _SETUPTOOLS_VERSION = "47.1.0"
_PIP_VERSION = "19.2.3" _PIP_VERSION = "20.1.1"
_PROJECTS = [ _PROJECTS = [
("setuptools", _SETUPTOOLS_VERSION), ("setuptools", _SETUPTOOLS_VERSION, "py3"),
("pip", _PIP_VERSION), ("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 # 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 in _PROJECTS: for project, version, py_tag in _PROJECTS:
wheel_name = "{}-{}-py2.py3-none-any.whl".format(project, version) wheel_name = "{}-{}-{}-none-any.whl".format(project, version, py_tag)
whl = resources.read_binary( whl = resources.read_binary(
_bundled, _bundled,
wheel_name, wheel_name,

BIN
Lib/ensurepip/_bundled/pip-19.2.3-py2.py3-none-any.whl
View file

Binary file not shown.

BIN
Lib/ensurepip/_bundled/pip-20.1.1-py2.py3-none-any.whl Normal file
View file

Binary file not shown.

BIN
Lib/ensurepip/_bundled/setuptools-41.2.0-py2.py3-none-any.whl → Lib/ensurepip/_bundled/setuptools-47.1.0-py3-none-any.whl
View file

Binary file not shown.

2
Lib/test/test_venv.py
View file

@ -513,7 +513,7 @@ class EnsurePipTest(BaseTest):
# executing pip with sudo, you may want sudo's -H flag." # executing pip with sudo, you may want sudo's -H flag."
# where $HOME is replaced by the HOME environment variable. # where $HOME is replaced by the HOME environment variable.
err = re.sub("^(WARNING: )?The directory .* or its parent directory " err = re.sub("^(WARNING: )?The directory .* or its parent directory "
"is not owned by the current user .*$", "", "is not owned or is not writable by the current user.*$", "",
err, flags=re.MULTILINE) err, flags=re.MULTILINE)
self.assertEqual(err.rstrip(), "") self.assertEqual(err.rstrip(), "")
# Being fairly specific regarding the expected behaviour for the # Being fairly specific regarding the expected behaviour for the

1
Misc/NEWS.d/next/Library/2020-05-28-16-51-00.bpo-38488.hFQNgA.rst Normal file
View file

@ -0,0 +1 @@
Update ensurepip to install pip 20.1.1 and setuptools 47.1.0.