diff options
| -rw-r--r-- | Lib/ensurepip/__init__.py | 10 | ||||
| -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) | bin | 956945 -> 957957 bytes | |||
| -rw-r--r-- | Lib/test/test_ensurepip.py | 16 |
3 files changed, 10 insertions, 16 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 Binary files differindex 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 diff --git a/Lib/test/test_ensurepip.py b/Lib/test/test_ensurepip.py index e50093d..68dd3e2 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, ) |