[Python-checkins] cpython (merge 3.4 -> 3.5): Merge new pip/setuptools from 3.4
donald.stufft
python-checkins at python.org
Wed Nov 2 15:55:34 EDT 2016
https://hg.python.org/cpython/rev/b06f232b4a38
changeset: 104879:b06f232b4a38
branch: 3.5
parent: 104875:a08eeb10d700
parent: 104878:fc4d1fb3f795
user: Donald Stufft <donald at stufft.io>
date: Wed Nov 02 15:53:58 2016 -0400
summary:
Merge new pip/setuptools from 3.4
files:
Lib/ensurepip/__init__.py | 4 ++--
Lib/ensurepip/_bundled/pip-8.1.2-py2.py3-none-any.whl | Bin
Lib/ensurepip/_bundled/pip-9.0.0-py2.py3-none-any.whl | Bin
Lib/ensurepip/_bundled/setuptools-27.1.2-py2.py3-none-any.whl | Bin
Lib/ensurepip/_bundled/setuptools-28.7.1-py2.py3-none-any.whl | Bin
5 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py
--- a/Lib/ensurepip/__init__.py
+++ b/Lib/ensurepip/__init__.py
@@ -8,9 +8,9 @@
__all__ = ["version", "bootstrap"]
-_SETUPTOOLS_VERSION = "27.1.2"
+_SETUPTOOLS_VERSION = "28.7.1"
-_PIP_VERSION = "8.1.2"
+_PIP_VERSION = "9.0.0"
# pip currently requires ssl support, so we try to provide a nicer
# error message when that is missing (http://bugs.python.org/issue19744)
diff --git a/Lib/ensurepip/_bundled/pip-8.1.2-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/pip-8.1.2-py2.py3-none-any.whl
deleted file mode 100644
index cc49227a0c7e13757f4863a9b7ace1eb56c3ce61..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
[stripped]
diff --git a/Lib/ensurepip/_bundled/pip-9.0.0-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/pip-9.0.0-py2.py3-none-any.whl
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..2c631a846c10cf51d32241263aff9c38a5bd8e27
GIT binary patch
[stripped]
diff --git a/Lib/ensurepip/_bundled/setuptools-27.1.2-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/setuptools-27.1.2-py2.py3-none-any.whl
deleted file mode 100644
index de213bb72715caa07d12e94f97033110c1767e8d..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
[stripped]
diff --git a/Lib/ensurepip/_bundled/setuptools-28.7.1-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/setuptools-28.7.1-py2.py3-none-any.whl
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..cbcc2200f46eb05d707ad7c2c581ac36e561c256
GIT binary patch
[stripped]
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list