diff options
| -rw-r--r-- | Lib/ensurepip/__init__.py | 2 | ||||
| -rw-r--r-- | Lib/ensurepip/_bundled/pip-1.5rc1-py2.py3-none-any.whl (renamed from Lib/ensurepip/_bundled/pip-1.5.rc1-py2.py3-none-any.whl) | bin | 931600 -> 931600 bytes | |||
| -rw-r--r-- | Lib/test/test_venv.py | 4 |
3 files changed, 4 insertions, 2 deletions
diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py index 0fdacdad66..1a644da634 100644 --- a/Lib/ensurepip/__init__.py +++ b/Lib/ensurepip/__init__.py @@ -12,7 +12,7 @@ __all__ = ["version", "bootstrap"] _SETUPTOOLS_VERSION = "1.3.2" -_PIP_VERSION = "1.5.rc1" +_PIP_VERSION = "1.5rc1" _PROJECTS = [ ("setuptools", _SETUPTOOLS_VERSION), diff --git a/Lib/ensurepip/_bundled/pip-1.5.rc1-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/pip-1.5rc1-py2.py3-none-any.whl Binary files differindex 6418895a58..6418895a58 100644 --- a/Lib/ensurepip/_bundled/pip-1.5.rc1-py2.py3-none-any.whl +++ b/Lib/ensurepip/_bundled/pip-1.5rc1-py2.py3-none-any.whl diff --git a/Lib/test/test_venv.py b/Lib/test/test_venv.py index f53eb37dc7..a92f4929da 100644 --- a/Lib/test/test_venv.py +++ b/Lib/test/test_venv.py @@ -5,6 +5,7 @@ Copyright (C) 2011-2012 Vinay Sajip. Licensed to the PSF under a contributor agreement. """ +import ensurepip import os import os.path import shutil @@ -313,8 +314,9 @@ class EnsurePipTest(BaseTest): err = err.decode("latin-1") # Force to text, prevent decoding errors self.assertEqual(err, "") out = out.decode("latin-1") # Force to text, prevent decoding errors + expected_version = "pip {}".format(ensurepip.version()) + self.assertEqual(out[:len(expected_version)], expected_version) env_dir = os.fsencode(self.env_dir).decode("latin-1") - self.assertTrue(out.startswith("pip")) self.assertIn(env_dir, out) |