summaryrefslogtreecommitdiffstats
path: root/Lib/ensurepip
diff options
context:
space:
mode:
authorPaul Moore <p.f.moore@gmail.com>2018-04-20 20:06:51 (GMT)
committerGitHub <noreply@github.com>2018-04-20 20:06:51 (GMT)
commit0399cf9b5e370516e3d0aed6a63ff74aff5eadb5 (patch)
treea3dc42910ca21564720364298a73617926ef29e7 /Lib/ensurepip
parent53f67d401df40486fd0fb8fbcf9da725cd37290c (diff)
downloadcpython-0399cf9b5e370516e3d0aed6a63ff74aff5eadb5.zip
cpython-0399cf9b5e370516e3d0aed6a63ff74aff5eadb5.tar.gz
cpython-0399cf9b5e370516e3d0aed6a63ff74aff5eadb5.tar.bz2
bpo-33131: Upgrade ensurepip to bundle pip 10.0.1 (GH-6546)
Upgrade ensurepip to bundle pip 10.0.1
Diffstat (limited to 'Lib/ensurepip')
-rw-r--r--Lib/ensurepip/__init__.py6
-rw-r--r--Lib/ensurepip/_bundled/pip-10.0.1-py2.py3-none-any.whlbin0 -> 1307639 bytes
-rw-r--r--Lib/ensurepip/_bundled/pip-9.0.3-py2.py3-none-any.whlbin1400985 -> 0 bytes
3 files changed, 3 insertions, 3 deletions
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
--- /dev/null
+++ b/Lib/ensurepip/_bundled/pip-10.0.1-py2.py3-none-any.whl
Binary files 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
--- a/Lib/ensurepip/_bundled/pip-9.0.3-py2.py3-none-any.whl
+++ /dev/null
Binary files differ