From 0399cf9b5e370516e3d0aed6a63ff74aff5eadb5 Mon Sep 17 00:00:00 2001 From: Paul Moore Date: Fri, 20 Apr 2018 21:06:51 +0100 Subject: bpo-33131: Upgrade ensurepip to bundle pip 10.0.1 (GH-6546) Upgrade ensurepip to bundle pip 10.0.1 --- Lib/ensurepip/__init__.py | 6 +++--- .../_bundled/pip-10.0.1-py2.py3-none-any.whl | Bin 0 -> 1307639 bytes Lib/ensurepip/_bundled/pip-9.0.3-py2.py3-none-any.whl | Bin 1400985 -> 0 bytes .../Library/2018-04-20-10-43-17.bpo-33131.L2E977.rst | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 Lib/ensurepip/_bundled/pip-10.0.1-py2.py3-none-any.whl delete mode 100644 Lib/ensurepip/_bundled/pip-9.0.3-py2.py3-none-any.whl create mode 100644 Misc/NEWS.d/next/Library/2018-04-20-10-43-17.bpo-33131.L2E977.rst diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py index 4a5b058..8dc2354 100644 --- a/Lib/ensurepip/__init__.py +++ b/Lib/ensurepip/__init__.py @@ -10,7 +10,7 @@ __all__ = ["version", "bootstrap"] _SETUPTOOLS_VERSION = "39.0.1" -_PIP_VERSION = "9.0.3" +_PIP_VERSION = "10.0.1" _PROJECTS = [ ("setuptools", _SETUPTOOLS_VERSION), @@ -24,8 +24,8 @@ def _run_pip(args, additional_paths=None): sys.path = additional_paths + sys.path # Install the bundled software - import pip - return pip.main(args) + import pip._internal + return pip._internal.main(args) def version(): diff --git a/Lib/ensurepip/_bundled/pip-10.0.1-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/pip-10.0.1-py2.py3-none-any.whl new file mode 100644 index 0000000..9837092 Binary files /dev/null and b/Lib/ensurepip/_bundled/pip-10.0.1-py2.py3-none-any.whl differ diff --git a/Lib/ensurepip/_bundled/pip-9.0.3-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/pip-9.0.3-py2.py3-none-any.whl deleted file mode 100644 index 5d33bba..0000000 Binary files a/Lib/ensurepip/_bundled/pip-9.0.3-py2.py3-none-any.whl and /dev/null differ diff --git a/Misc/NEWS.d/next/Library/2018-04-20-10-43-17.bpo-33131.L2E977.rst b/Misc/NEWS.d/next/Library/2018-04-20-10-43-17.bpo-33131.L2E977.rst new file mode 100644 index 0000000..875c6ac --- /dev/null +++ b/Misc/NEWS.d/next/Library/2018-04-20-10-43-17.bpo-33131.L2E977.rst @@ -0,0 +1 @@ +Upgrade bundled version of pip to 10.0.1. -- cgit v0.12