[Python-checkins] cpython: Update pip to the released 1.5

donald.stufft python-checkins at python.org
Thu Jan 2 15:33:47 CET 2014


http://hg.python.org/cpython/rev/70fd3383bd31
changeset:   88253:70fd3383bd31
user:        Donald Stufft <donald at stufft.io>
date:        Thu Jan 02 09:33:35 2014 -0500
summary:
  Update pip to the released 1.5

files:
  Lib/ensurepip/__init__.py                              |   10 +-----
  Lib/ensurepip/_bundled/pip-1.5-py2.py3-none-any.whl    |  Bin 
  Lib/ensurepip/_bundled/pip-1.5rc4-py2.py3-none-any.whl |  Bin 
  Lib/test/test_ensurepip.py                             |   16 +++++-----
  4 files changed, 10 insertions(+), 16 deletions(-)


diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py
--- a/Lib/ensurepip/__init__.py
+++ b/Lib/ensurepip/__init__.py
@@ -4,15 +4,13 @@
 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 @@
             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 0000000000000000000000000000000000000000..dd7ca2e634424d8f443cf82f7b92393410219748
GIT binary patch
[stripped]
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 2a16332814c690b3fc6f040fc79709dfed2e5095..0000000000000000000000000000000000000000
GIT binary patch
[stripped]
diff --git a/Lib/test/test_ensurepip.py b/Lib/test/test_ensurepip.py
--- a/Lib/test/test_ensurepip.py
+++ b/Lib/test/test_ensurepip.py
@@ -52,7 +52,7 @@
         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 @@
         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 @@
         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 @@
         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 @@
         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 @@
         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 @@
         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 @@
         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,
         )

-- 
Repository URL: http://hg.python.org/cpython


More information about the Python-checkins mailing list