| commit | 2b4ec1ce8a1e14a0c8de4fbab9442c6260a5f27d | [log] [tgz] |
|---|---|---|
| author | Donald Stufft <donald@stufft.io> | Sun Jan 11 15:53:02 2015 -0500 |
| committer | Donald Stufft <donald@stufft.io> | Sun Jan 11 15:53:02 2015 -0500 |
| tree | 44e7853364167b16102bc29f0743091992e6959e | |
| parent | c114e7db60825dc8dcdfda0f26131cdf69158037 [diff] | |
| parent | d9fe22ce9b7d351193bef274eaad0e7b43cbb903 [diff] |
Merged 3.4 into default
diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py index 82c0111..9b9567e 100644 --- a/Lib/ensurepip/__init__.py +++ b/Lib/ensurepip/__init__.py
@@ -8,7 +8,7 @@ __all__ = ["version", "bootstrap"] -_SETUPTOOLS_VERSION = "11.0" +_SETUPTOOLS_VERSION = "11.3.1" _PIP_VERSION = "6.0.6"
diff --git a/Lib/ensurepip/_bundled/setuptools-11.0-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/setuptools-11.3.1-py2.py3-none-any.whl similarity index 75% rename from Lib/ensurepip/_bundled/setuptools-11.0-py2.py3-none-any.whl rename to Lib/ensurepip/_bundled/setuptools-11.3.1-py2.py3-none-any.whl index ceeaa3c..6892ff8 100644 --- a/Lib/ensurepip/_bundled/setuptools-11.0-py2.py3-none-any.whl +++ b/Lib/ensurepip/_bundled/setuptools-11.3.1-py2.py3-none-any.whl Binary files differ