diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2018-04-20 22:02:53 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-20 22:02:53 (GMT) |
| commit | 47d57bfd3d6ceb08f98fcff14fe3c8bb41ca0664 (patch) | |
| tree | eecf129a516c848b3d4a18dd5e746a5659684cea | |
| parent | 6444dd793eb2b92bf07746795f45b7464b7d4bf7 (diff) | |
| download | cpython-47d57bfd3d6ceb08f98fcff14fe3c8bb41ca0664.zip cpython-47d57bfd3d6ceb08f98fcff14fe3c8bb41ca0664.tar.gz cpython-47d57bfd3d6ceb08f98fcff14fe3c8bb41ca0664.tar.bz2 | |
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@gmail.com>
| -rw-r--r-- | Lib/ensurepip/__init__.py | 6 | ||||
| -rw-r--r-- | Lib/ensurepip/_bundled/pip-10.0.1-py2.py3-none-any.whl | bin | 0 -> 1307639 bytes | |||
| -rw-r--r-- | Lib/ensurepip/_bundled/pip-9.0.3-py2.py3-none-any.whl | bin | 1400985 -> 0 bytes | |||
| -rw-r--r-- | Misc/NEWS.d/next/Library/2018-04-20-10-43-17.bpo-33131.L2E977.rst | 1 |
4 files changed, 4 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 Binary files differnew file mode 100644 index 0000000..9837092 --- /dev/null +++ b/Lib/ensurepip/_bundled/pip-10.0.1-py2.py3-none-any.whl 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 Binary files differdeleted file mode 100644 index 5d33bba..0000000 --- a/Lib/ensurepip/_bundled/pip-9.0.3-py2.py3-none-any.whl +++ /dev/null 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. |