diff options
| author | Donald Stufft <donald@stufft.io> | 2015-06-02 15:39:55 (GMT) |
|---|---|---|
| committer | Donald Stufft <donald@stufft.io> | 2015-06-02 15:39:55 (GMT) |
| commit | 231d90609b026dc709efd16d5bda610fbb12ebad (patch) | |
| tree | 3b1c14ccb9a7e2142e03c0b3c69336569249ac26 | |
| parent | 67872ba91a582aaf755548155f71292125e95c68 (diff) | |
| parent | 96cf848a8b27fae04934b272bf4567fbbc612e79 (diff) | |
| download | cpython-231d90609b026dc709efd16d5bda610fbb12ebad.zip cpython-231d90609b026dc709efd16d5bda610fbb12ebad.tar.gz cpython-231d90609b026dc709efd16d5bda610fbb12ebad.tar.bz2 | |
Merge update to pip/setuptools
| -rw-r--r-- | Lib/ensurepip/__init__.py | 4 | ||||
| -rw-r--r-- | Lib/ensurepip/_bundled/pip-7.0.3-py2.py3-none-any.whl (renamed from Lib/ensurepip/_bundled/pip-7.0.1-py2.py3-none-any.whl) | bin | 1118215 -> 1118548 bytes | |||
| -rw-r--r-- | Lib/ensurepip/_bundled/setuptools-17.0-py2.py3-none-any.whl (renamed from Lib/ensurepip/_bundled/setuptools-16.0-py2.py3-none-any.whl) | bin | 461608 -> 461737 bytes |
3 files changed, 2 insertions, 2 deletions
diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py index e5db9f9..027b733 100644 --- a/Lib/ensurepip/__init__.py +++ b/Lib/ensurepip/__init__.py @@ -8,9 +8,9 @@ import tempfile __all__ = ["version", "bootstrap"] -_SETUPTOOLS_VERSION = "16.0" +_SETUPTOOLS_VERSION = "17.0" -_PIP_VERSION = "7.0.1" +_PIP_VERSION = "7.0.3" # 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-7.0.1-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/pip-7.0.3-py2.py3-none-any.whl Binary files differindex 30a61f0..bb0cb31 100644 --- a/Lib/ensurepip/_bundled/pip-7.0.1-py2.py3-none-any.whl +++ b/Lib/ensurepip/_bundled/pip-7.0.3-py2.py3-none-any.whl diff --git a/Lib/ensurepip/_bundled/setuptools-16.0-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/setuptools-17.0-py2.py3-none-any.whl Binary files differindex fa4e994..a1d3561 100644 --- a/Lib/ensurepip/_bundled/setuptools-16.0-py2.py3-none-any.whl +++ b/Lib/ensurepip/_bundled/setuptools-17.0-py2.py3-none-any.whl |