summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorNick Coghlan <ncoghlan@gmail.com>2013-11-30 05:56:58 (GMT)
committerNick Coghlan <ncoghlan@gmail.com>2013-11-30 05:56:58 (GMT)
commit1b1b1789d022095266c83d4ce441ae6d096afbcd (patch)
tree16133236a49017a2aec274b70ca793703da12f49 /Lib
parent9730e335353b9cdb6f8016e27566ca7b43e42d09 (diff)
downloadcpython-1b1b1789d022095266c83d4ce441ae6d096afbcd.zip
cpython-1b1b1789d022095266c83d4ce441ae6d096afbcd.tar.gz
cpython-1b1b1789d022095266c83d4ce441ae6d096afbcd.tar.bz2
Fix and test pip version consistency
Diffstat (limited to 'Lib')
-rw-r--r--Lib/ensurepip/__init__.py2
-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)bin931600 -> 931600 bytes
-rw-r--r--Lib/test/test_venv.py4
3 files changed, 4 insertions, 2 deletions
diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py
index 0fdacda..1a644da 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
index 6418895..6418895 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
Binary files differ
diff --git a/Lib/test/test_venv.py b/Lib/test/test_venv.py
index f53eb37..a92f492 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)