openstack/python-keystoneclient
Code Issues Proposed changes

Merge changes Iff60e659,Iff2102fc

Browse Source 
* changes:
  Install a good version of pip in the venv.
  Modify tox.ini file to do the standard thigns.
This commit is contained in:
Jenkins
2012-01-17 00:47:50 +00:00
committed by Gerrit Code Review
parent 716d5ef25a 572f250cd7
commit c7a72f15d7
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tools/install_venv.py
View File

@@ -168,7 +168,8 @@ def create_virtualenv(venv=VENV, no_site_packages=True):
run_command(['virtualenv', '-q', VENV]) run_command(['virtualenv', '-q', VENV])
print 'done.' print 'done.'
print 'Installing pip in virtualenv...', print 'Installing pip in virtualenv...',
if not run_command(['tools/with_venv.sh', 'easy_install', 'pip']).strip(): if not run_command(['tools/with_venv.sh', 'easy_install',
'pip>1.0']).strip():
die("Failed to install pip.") die("Failed to install pip.")
print 'done.' print 'done.'

16
tox.ini
View File

@@ -1,8 +1,14 @@
[tox] [tox]
envlist = py25,py26,py27 envlist = py26,py27
[testenv] [testenv]
deps = nose deps = -r{toxinidir}/tools/pip-requires
mock commands = /bin/bash run_tests.sh -N
mox
commands = nosetests [testenv:pep8]
deps = pep8
commands = /bin/bash run_tests.sh -N --pep8
[testenv:coverage]
deps = pep8
commands = /bin/bash run_tests.sh -N --with-coverage