[Python-checkins] bpo-33131: Upgrade ensurepip to bundle pip 10.0.1 (GH-6546)

[Miss Islington (bot)]

https://github.com/python/cpython/commit/b221107d32370670905fefb569b3104748f92afe
commit: b221107d32370670905fefb569b3104748f92afe
branch: 3.7
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2018-04-20T13:47:44-07:00
summary:

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


Upgrade ensurepip to bundle pip 10.0.1
(cherry picked from commit 0399cf9b5e370516e3d0aed6a63ff74aff5eadb5)

Co-authored-by: Paul Moore <p.f.moore at gmail.com>

files:
A Lib/ensurepip/_bundled/pip-10.0.1-py2.py3-none-any.whl
A Misc/NEWS.d/next/Library/2018-04-20-10-43-17.bpo-33131.L2E977.rst
D Lib/ensurepip/_bundled/pip-9.0.3-py2.py3-none-any.whl
M Lib/ensurepip/__init__.py

diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py
index 4a5b0583f885..8dc2354ce287 100644
--- a/Lib/ensurepip/__init__.py
+++ b/Lib/ensurepip/__init__.py
@@ -10,7 +10,7 @@
 
 _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 000000000000..9837092c07bb
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 5d33bba22868..000000000000
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 000000000000..875c6ac5f742
--- /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.