http://hg.python.org/cpython/rev/73a84d8dc544 changeset: 87648:73a84d8dc544 user: Nick Coghlan <ncoghlan@gmail.com> date: Sat Nov 30 15:56:58 2013 +1000 summary: Fix and test pip version consistency files: Lib/ensurepip/__init__.py | 2 +- Lib/ensurepip/_bundled/pip-1.5.rc1-py2.py3-none-any.whl | 0 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 --- a/Lib/ensurepip/__init__.py +++ b/Lib/ensurepip/__init__.py @@ -12,7 +12,7 @@ _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 rename from Lib/ensurepip/_bundled/pip-1.5.rc1-py2.py3-none-any.whl rename to 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 --- a/Lib/test/test_venv.py +++ b/Lib/test/test_venv.py @@ -5,6 +5,7 @@ Licensed to the PSF under a contributor agreement. """ +import ensurepip import os import os.path import shutil @@ -313,8 +314,9 @@ 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) -- Repository URL: http://hg.python.org/cpython