Mercurial > cpython-lru_cache-weakref
changeset 87648:73a84d8dc544
Fix and test pip version consistency
| author | Nick Coghlan <ncoghlan@gmail.com> |
|---|---|
| date | Sat, 30 Nov 2013 15:56:58 +1000 |
| parents | 2c87d3944c7a |
| children | 7dc4bf283857 |
| files | Lib/ensurepip/__init__.py Lib/ensurepip/_bundled/pip-1.5.rc1-py2.py3-none-any.whl Lib/ensurepip/_bundled/pip-1.5rc1-py2.py3-none-any.whl Lib/test/test_venv.py |
| diffstat | 4 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/Lib/ensurepip/__init__.py Fri Nov 29 20:47:15 2013 -0800 +++ b/Lib/ensurepip/__init__.py Sat Nov 30 15:56:58 2013 +1000 @@ -12,7 +12,7 @@ _SETUPTOOLS_VERSION = "1.3.2" -_PIP_VERSION = "1.5.rc1" +_PIP_VERSION = "1.5rc1" _PROJECTS = [ ("setuptools", _SETUPTOOLS_VERSION),
--- a/Lib/test/test_venv.py Fri Nov 29 20:47:15 2013 -0800 +++ b/Lib/test/test_venv.py Sat Nov 30 15:56:58 2013 +1000 @@ -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)