From: Donald Stufft <donald@stufft.io>
Date: Thu, 2 Jan 2014 14:33:35 +0000 (-0500)
Subject: Update pip to the released 1.5
X-Git-Tag: v3.4.0b2~49
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f7f58f8db52a7981dc776a128fcb64657f15406c;p=python

Update pip to the released 1.5
---

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.5rc4-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/pip-1.5-py2.py3-none-any.whl
similarity index 97%
rename from Lib/ensurepip/_bundled/pip-1.5rc4-py2.py3-none-any.whl
rename to Lib/ensurepip/_bundled/pip-1.5-py2.py3-none-any.whl
index 2a16332814..dd7ca2e634 100644
Binary files a/Lib/ensurepip/_bundled/pip-1.5rc4-py2.py3-none-any.whl and b/Lib/ensurepip/_bundled/pip-1.5-py2.py3-none-any.whl differ
diff --git a/Lib/test/test_ensurepip.py b/Lib/test/test_ensurepip.py
index e50093d8cc..68dd3e2e1c 100644
--- a/Lib/test/test_ensurepip.py
+++ b/Lib/test/test_ensurepip.py
@@ -52,7 +52,7 @@ class TestBootstrap(EnsurepipMixin, unittest.TestCase):
         self.run_pip.assert_called_once_with(
             [
                 "install", "--no-index", "--find-links",
-                unittest.mock.ANY, "--pre", "setuptools", "pip",
+                unittest.mock.ANY, "setuptools", "pip",
             ],
             unittest.mock.ANY,
         )
@@ -67,7 +67,7 @@ class TestBootstrap(EnsurepipMixin, unittest.TestCase):
         self.run_pip.assert_called_once_with(
             [
                 "install", "--no-index", "--find-links",
-                unittest.mock.ANY, "--pre", "--root", "/foo/bar/",
+                unittest.mock.ANY, "--root", "/foo/bar/",
                 "setuptools", "pip",
             ],
             unittest.mock.ANY,
@@ -80,7 +80,7 @@ class TestBootstrap(EnsurepipMixin, unittest.TestCase):
         self.run_pip.assert_called_once_with(
             [
                 "install", "--no-index", "--find-links",
-                unittest.mock.ANY, "--pre", "--user", "setuptools", "pip",
+                unittest.mock.ANY, "--user", "setuptools", "pip",
             ],
             unittest.mock.ANY,
         )
@@ -92,7 +92,7 @@ class TestBootstrap(EnsurepipMixin, unittest.TestCase):
         self.run_pip.assert_called_once_with(
             [
                 "install", "--no-index", "--find-links",
-                unittest.mock.ANY, "--pre", "--upgrade", "setuptools", "pip",
+                unittest.mock.ANY, "--upgrade", "setuptools", "pip",
             ],
             unittest.mock.ANY,
         )
@@ -104,7 +104,7 @@ class TestBootstrap(EnsurepipMixin, unittest.TestCase):
         self.run_pip.assert_called_once_with(
             [
                 "install", "--no-index", "--find-links",
-                unittest.mock.ANY, "--pre", "-v", "setuptools", "pip",
+                unittest.mock.ANY, "-v", "setuptools", "pip",
             ],
             unittest.mock.ANY,
         )
@@ -116,7 +116,7 @@ class TestBootstrap(EnsurepipMixin, unittest.TestCase):
         self.run_pip.assert_called_once_with(
             [
                 "install", "--no-index", "--find-links",
-                unittest.mock.ANY, "--pre", "-vv", "setuptools", "pip",
+                unittest.mock.ANY, "-vv", "setuptools", "pip",
             ],
             unittest.mock.ANY,
         )
@@ -128,7 +128,7 @@ class TestBootstrap(EnsurepipMixin, unittest.TestCase):
         self.run_pip.assert_called_once_with(
             [
                 "install", "--no-index", "--find-links",
-                unittest.mock.ANY, "--pre", "-vvv", "setuptools", "pip",
+                unittest.mock.ANY, "-vvv", "setuptools", "pip",
             ],
             unittest.mock.ANY,
         )
@@ -286,7 +286,7 @@ class TestBootstrappingMainFunction(EnsurepipMixin, unittest.TestCase):
         self.run_pip.assert_called_once_with(
             [
                 "install", "--no-index", "--find-links",
-                unittest.mock.ANY, "--pre", "setuptools", "pip",
+                unittest.mock.ANY, "setuptools", "pip",
             ],
             unittest.mock.ANY,
         )