summaryrefslogtreecommitdiffstats
path: root/Lib/ensurepip
diff options
context:
space:
mode:
authorDonald Stufft <donald@stufft.io>2014-01-02 14:33:35 (GMT)
committerDonald Stufft <donald@stufft.io>2014-01-02 14:33:35 (GMT)
commitf7f58f8db52a7981dc776a128fcb64657f15406c (patch)
tree06c83d2e7fcd52a2e4002856690a16b3260f6a36 /Lib/ensurepip
parentc70d4f4d797ada5fbb1ef150c3c2015620346345 (diff)
downloadcpython-f7f58f8db52a7981dc776a128fcb64657f15406c.zip
cpython-f7f58f8db52a7981dc776a128fcb64657f15406c.tar.gz
cpython-f7f58f8db52a7981dc776a128fcb64657f15406c.tar.bz2
Update pip to the released 1.5
Diffstat (limited to 'Lib/ensurepip')
-rw-r--r--Lib/ensurepip/__init__.py10
-rw-r--r--Lib/ensurepip/_bundled/pip-1.5-py2.py3-none-any.whl (renamed from Lib/ensurepip/_bundled/pip-1.5rc4-py2.py3-none-any.whl)bin956945 -> 957957 bytes
2 files changed, 2 insertions, 8 deletions
diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py
index ce494d1..26d411f 100644
--- a/Lib/ensurepip/__init__.py
+++ b/Lib/ensurepip/__init__.py
@@ -4,15 +4,13 @@ import pkgutil
import sys
import tempfile
-# TODO: Remove the --pre flag when a pip 1.5 final copy is available
-
__all__ = ["version", "bootstrap"]
_SETUPTOOLS_VERSION = "2.0.2"
-_PIP_VERSION = "1.5rc4"
+_PIP_VERSION = "1.5"
# pip currently requires ssl support, so we try to provide a nicer
# error message when that is missing (http://bugs.python.org/issue19744)
@@ -102,11 +100,7 @@ def bootstrap(*, root=None, upgrade=False, user=False,
additional_paths.append(os.path.join(tmpdir, wheel_name))
# Construct the arguments to be passed to the pip command
- args = [
- "install", "--no-index", "--find-links", tmpdir,
- # Temporary until pip 1.5 is final
- "--pre",
- ]
+ args = ["install", "--no-index", "--find-links", tmpdir]
if root:
args += ["--root", root]
if upgrade:
diff --git a/Lib/ensurepip/_bundled/pip-1.5rc4-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/pip-1.5-py2.py3-none-any.whl
index 2a16332..dd7ca2e 100644
--- a/Lib/ensurepip/_bundled/pip-1.5rc4-py2.py3-none-any.whl
+++ b/Lib/ensurepip/_bundled/pip-1.5-py2.py3-none-any.whl
Binary files differ