[Python-checkins] cpython (merge 3.5 -> default): Merge 3.5
donald.stufft
python-checkins at python.org
Fri Sep 9 12:15:14 EDT 2016
https://hg.python.org/cpython/rev/fdb3537e633a
changeset: 103406:fdb3537e633a
parent: 103403:57afe873e5bf
parent: 103405:ff942f8a8f49
user: Donald Stufft <donald at stufft.io>
date: Fri Sep 09 12:15:07 2016 -0400
summary:
Merge 3.5
files:
Lib/ensurepip/__init__.py | 2 +-
Lib/ensurepip/_bundled/setuptools-27.1.1-py2.py3-none-any.whl | Bin
Lib/ensurepip/_bundled/setuptools-27.1.2-py2.py3-none-any.whl | Bin
3 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py
--- a/Lib/ensurepip/__init__.py
+++ b/Lib/ensurepip/__init__.py
@@ -8,7 +8,7 @@
__all__ = ["version", "bootstrap"]
-_SETUPTOOLS_VERSION = "27.1.1"
+_SETUPTOOLS_VERSION = "27.1.2"
_PIP_VERSION = "8.1.2"
diff --git a/Lib/ensurepip/_bundled/setuptools-27.1.1-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/setuptools-27.1.1-py2.py3-none-any.whl
deleted file mode 100644
index 8e4ddc4f1ad0a77ec09744858abee256263a2664..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
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
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..de213bb72715caa07d12e94f97033110c1767e8d
GIT binary patch
[stripped]
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list