mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-27 02:39:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Merge 3.4 into 3.5

Browse source
This commit is contained in:
Donald Stufft 2016-03-17 11:01:04 -04:00
commit c488bc6a76
3 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Lib/ensurepip/__init__.py
View file

@ -8,9 +8,9 @@ import tempfile
__all__ = ["version", "bootstrap"] __all__ = ["version", "bootstrap"]
_SETUPTOOLS_VERSION = "19.4" _SETUPTOOLS_VERSION = "20.3"
_PIP_VERSION = "8.0.2" _PIP_VERSION = "8.1.1"
# pip currently requires ssl support, so we try to provide a nicer # pip currently requires ssl support, so we try to provide a nicer
# error message when that is missing (http://bugs.python.org/issue19744) # error message when that is missing (http://bugs.python.org/issue19744)

BIN
Lib/ensurepip/_bundled/pip-8.0.2-py2.py3-none-any.whl → Lib/ensurepip/_bundled/pip-8.1.1-py2.py3-none-any.whl
View file

Binary file not shown.

BIN
Lib/ensurepip/_bundled/setuptools-19.4-py2.py3-none-any.whl → Lib/ensurepip/_bundled/setuptools-20.3-py2.py3-none-any.whl
View file

Binary file not shown.