Skip to content

C
cpython
Commit c488bc6a authored by Donald Stufft's avatar Donald Stufft
Browse files
Options

Merge 3.4 into 3.5

parents 5c13aa15 2bc69c49
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
Lib/ensurepip/__init__.py
View file @ c488bc6a
...@@ -8,9 +8,9 @@ import tempfile ...@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7