summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Meyer <carl@oddbird.net>2011-12-11 22:34:23 -0700
committerCarl Meyer <carl@oddbird.net>2011-12-11 22:34:23 -0700
commitfec893d92da646a81e97861c7ba8e42728335fb3 (patch)
tree6e10b524570e59553fff6bd312e399e634c6a588
parent81b6c6b66b8e909654ac0fc48ffe412bfe4612a9 (diff)
downloadpip-fec893d92da646a81e97861c7ba8e42728335fb3.tar.gz
Require virtualenv 1.7 for running tests, and drop --no-site-packages.
-rw-r--r--setup.py2
-rw-r--r--tests/test_pip.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/setup.py b/setup.py
index 52731e80b..759597d19 100644
--- a/setup.py
+++ b/setup.py
@@ -51,5 +51,5 @@ setup(name="pip",
packages=['pip', 'pip.commands', 'pip.vcs'],
entry_points=dict(console_scripts=['pip=pip:main', 'pip-%s=pip:main' % sys.version[:3]]),
test_suite='nose.collector',
- tests_require=['nose', 'virtualenv>=1.6', 'scripttest>=1.1.1', 'mock'],
+ tests_require=['nose', 'virtualenv>=1.7', 'scripttest>=1.1.1', 'mock'],
zip_safe=False)
diff --git a/tests/test_pip.py b/tests/test_pip.py
index 92cfff7d7..bea7d4aa7 100644
--- a/tests/test_pip.py
+++ b/tests/test_pip.py
@@ -54,7 +54,7 @@ def create_virtualenv(where, distribute=False):
try:
import virtualenv
distribute_opt = distribute and ['--distribute'] or []
- sys.argv = ['virtualenv', '--quiet'] + distribute_opt + ['--no-site-packages', '--unzip-setuptools', where]
+ sys.argv = ['virtualenv', '--quiet'] + distribute_opt + ['--unzip-setuptools', where]
virtualenv.main()
finally:
sys.argv = save_argv