Skip to content

Commit 80a3ba9

Browse files
committed
merge 3.4
2 parents 91060f2 + 5e4aafa commit 80a3ba9

File tree

3 files changed

+2
-2
lines changed

3 files changed

+2
-2
lines changed

Lib/ensurepip/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
__all__ = ["version", "bootstrap"]
99

1010

11-
_SETUPTOOLS_VERSION = "20.10.1"
11+
_SETUPTOOLS_VERSION = "25.2.0"
1212

13-
_PIP_VERSION = "8.1.1"
13+
_PIP_VERSION = "8.1.2"
1414

1515
# pip currently requires ssl support, so we try to provide a nicer
1616
# error message when that is missing (http://bugs.python.org/issue19744)
1.14 MB
Binary file not shown.

Lib/ensurepip/_bundled/setuptools-20.10.1-py2.py3-none-any.whl renamed to Lib/ensurepip/_bundled/setuptools-25.2.0-py2.py3-none-any.whl

497 KB
Binary file not shown.

0 commit comments

Comments
 (0)