From f7f58f8db52a7981dc776a128fcb64657f15406c Mon Sep 17 00:00:00 2001 From: Donald Stufft Date: Thu, 2 Jan 2014 09:33:35 -0500 Subject: Update pip to the released 1.5 --- Lib/ensurepip/__init__.py | 10 ++-------- Lib/ensurepip/_bundled/pip-1.5-py2.py3-none-any.whl | Bin 0 -> 957957 bytes Lib/ensurepip/_bundled/pip-1.5rc4-py2.py3-none-any.whl | Bin 956945 -> 0 bytes 3 files changed, 2 insertions(+), 8 deletions(-) create mode 100644 Lib/ensurepip/_bundled/pip-1.5-py2.py3-none-any.whl delete mode 100644 Lib/ensurepip/_bundled/pip-1.5rc4-py2.py3-none-any.whl (limited to 'Lib/ensurepip') diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py index ce494d10f8..26d411f619 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.5-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/pip-1.5-py2.py3-none-any.whl new file mode 100644 index 0000000000..dd7ca2e634 Binary files /dev/null and b/Lib/ensurepip/_bundled/pip-1.5-py2.py3-none-any.whl differ diff --git a/Lib/ensurepip/_bundled/pip-1.5rc4-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/pip-1.5rc4-py2.py3-none-any.whl deleted file mode 100644 index 2a16332814..0000000000 Binary files a/Lib/ensurepip/_bundled/pip-1.5rc4-py2.py3-none-any.whl and /dev/null differ -- cgit v1.2.1