8000 bpo-38488: Upgrade bundled versions of pip & setuptools (GH-20491) (G… · python/cpython@678ffc4 · GitHub
[go: up one dir, main page]
Skip to content

Commit 678ffc4

Browse files
miss-islingtonned-deily
miss-islington
and
ned-deily
authored
bpo-38488: Upgrade bundled versions of pip & setuptools (GH-20491) (GH-20900)
Co-authored-by: Xavier Fernandez <xav.fernandez@gmail.com> (cherry picked from commit e63cc2f) Co-authored-by: Ned Deily <nad@python.org>
1 parent b46beb2 commit 678ffc4

File tree

6 files changed

+8
-7
lines changed

6 files changed

+8
-7
lines changed

‎Lib/ensurepip/__init__.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@
99
__all__ = ["version", "bootstrap"]
1010

1111

12-
_SETUPTOOLS_VERSION = "41.2.0"
12+
_SETUPTOOLS_VERSION = "47.1.0"
1313

14-
_PIP_VERSION = "19.2.3"
14+
_PIP_VERSION = "20.1.1"
1515

1616
_PROJECTS = [
17-
("setuptools", _SETUPTOOLS_VERSION),
18-
("pip", _PIP_VERSION),
17+
("setuptools", _SETUPTOOLS_VERSION, "py3"),
18+
("pip", _PIP_VERSION, "py2.py3"),
1919
]
2020

2121

@@ -102,8 +102,8 @@ def _bootstrap(*, root=None, upgrade=False, user=False,
102102
# Put our bundled wheels into a temporary directory and construct the
103103
# additional paths that need added to sys.path
104104
additional_paths = []
105-
for project, version in _PROJECTS:
106-
wheel_name = "{}-{}-py2.py3-none-any.whl".format(project, version)
105+
for project, version, py_tag in _PROJECTS:
106+
wheel_name = "{}-{}-{}-none-any.whl".format(project, version, py_tag)
107107
whl = pkgutil.get_data(
108108
"ensurepip",
109109
"_bundled/{}".format(wheel_name),

‎Lib/ensurepip/_bundled/pip-19.2.3-py2.py3-none-any.whl

-1.35 MB
Binary file not shown.

‎Lib/ensurepip/_bundled/pip-20.1.1-py2.py3-none-any.whl

1.42 MB
Binary file not shown.

‎Lib/ensurepip/_bundled/setuptools-41.2.0-py2.py3-none-any.whl renamed to ‎Lib/ensurepip/_bundled/setuptools-47.1.0-py3-none-any.whl

563 KB
Binary file not shown.

‎Lib/test/test_venv.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -471,7 +471,7 @@ def do_test_with_pip(self, system_site_packages):
471471
# executing pip with sudo, you may want sudo's -H flag."
472472
# where $HOME is replaced by the HOME environment variable.
473473
err = re.sub("^(WARNING: )?The directory .* or its parent directory "
474-
"is not owned by the current user .*$", "",
474+
"is not owned or is not writable by the current user.*$", "",
475475
err, flags=re.MULTILINE)
476476
self.assertEqual(err.rstrip(), "")
477477
# Being fairly specific regarding the expected behaviour for the

‎Misc/NEWS.d/next/Library/2020-05-28-16-51-00.bpo-38488.hFQNgA.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Update ensurepip to install pip 20.1.1 and setuptools 47.1.0.

0 commit comments

Comments
 (0)
0