bpo-33131: Upgrade ensurepip to bundle pip 10.0.1 (GH-6546)

Upgrade ensurepip to bundle pip 10.0.1

diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py
index 4a5b0583f88558539441a9298a690408f43ff5a5..8dc2354ce28734cd4d7728f35625f94efa0ca7ba 100644 (file)
--- 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 (file)
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 (file)
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 (file)
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.