diff options
| author | Ned Deily <nad@python.org> | 2020-06-15 21:42:22 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-15 21:42:22 (GMT) |
| commit | e63cc2f64668bd1d4581f8efa7089af7e08863b8 (patch) | |
| tree | 3b19cd66615705dba2e9ba139e65dc6ab7c96d28 | |
| parent | a1d3be4623c8ec7069bd34ccdce336be9cdeb644 (diff) | |
| download | cpython-e63cc2f64668bd1d4581f8efa7089af7e08863b8.zip cpython-e63cc2f64668bd1d4581f8efa7089af7e08863b8.tar.gz cpython-e63cc2f64668bd1d4581f8efa7089af7e08863b8.tar.bz2 | |
bpo-38488: Upgrade bundled versions of pip & setuptools (GH-20491) (GH-20900)
Co-authored-by: Xavier Fernandez <xav.fernandez@gmail.com>
| -rw-r--r-- | Lib/ensurepip/__init__.py | 12 | ||||
| -rw-r--r-- | Lib/ensurepip/_bundled/pip-19.2.3-py2.py3-none-any.whl | bin | 1414986 -> 0 bytes | |||
| -rw-r--r-- | Lib/ensurepip/_bundled/pip-20.1.1-py2.py3-none-any.whl | bin | 0 -> 1490666 bytes | |||
| -rw-r--r-- | Lib/ensurepip/_bundled/setuptools-47.1.0-py3-none-any.whl (renamed from Lib/ensurepip/_bundled/setuptools-41.2.0-py2.py3-none-any.whl) | bin | 576332 -> 583087 bytes | |||
| -rw-r--r-- | Lib/test/test_venv.py | 2 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Library/2020-05-28-16-51-00.bpo-38488.hFQNgA.rst | 1 |
6 files changed, 8 insertions, 7 deletions
diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py index ecfaee5..f3152a5 100644 --- a/Lib/ensurepip/__init__.py +++ b/Lib/ensurepip/__init__.py @@ -9,13 +9,13 @@ import tempfile __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"), ] @@ -104,8 +104,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 = pkgutil.get_data( "ensurepip", "_bundled/{}".format(wheel_name), diff --git a/Lib/ensurepip/_bundled/pip-19.2.3-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/pip-19.2.3-py2.py3-none-any.whl Binary files differdeleted file mode 100644 index 8118df8..0000000 --- a/Lib/ensurepip/_bundled/pip-19.2.3-py2.py3-none-any.whl +++ /dev/null diff --git a/Lib/ensurepip/_bundled/pip-20.1.1-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/pip-20.1.1-py2.py3-none-any.whl Binary files differnew file mode 100644 index 0000000..ea1d0f7 --- /dev/null +++ b/Lib/ensurepip/_bundled/pip-20.1.1-py2.py3-none-any.whl diff --git a/Lib/ensurepip/_bundled/setuptools-41.2.0-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/setuptools-47.1.0-py3-none-any.whl Binary files differindex 82df6f6..f87867f 100644 --- a/Lib/ensurepip/_bundled/setuptools-41.2.0-py2.py3-none-any.whl +++ b/Lib/ensurepip/_bundled/setuptools-47.1.0-py3-none-any.whl diff --git a/Lib/test/test_venv.py b/Lib/test/test_venv.py index bc4e95f..7e05138 100644 --- a/Lib/test/test_venv.py +++ b/Lib/test/test_venv.py @@ -480,7 +480,7 @@ class EnsurePipTest(BaseTest): # executing pip with sudo, you may want sudo's -H flag." # where $HOME is replaced by the HOME environment variable. 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) self.assertEqual(err.rstrip(), "") # Being fairly specific regarding the expected behaviour for the diff --git a/Misc/NEWS.d/next/Library/2020-05-28-16-51-00.bpo-38488.hFQNgA.rst b/Misc/NEWS.d/next/Library/2020-05-28-16-51-00.bpo-38488.hFQNgA.rst new file mode 100644 index 0000000..c44da9f --- /dev/null +++ b/Misc/NEWS.d/next/Library/2020-05-28-16-51-00.bpo-38488.hFQNgA.rst @@ -0,0 +1 @@ +Update ensurepip to install pip 20.1.1 and setuptools 47.1.0. |