Merge "Stop depending on sitepackages libvirt-python"
This commit is contained in:
commit
01a56d6436
@ -3,6 +3,7 @@ coverage>=3.6
|
|||||||
discover
|
discover
|
||||||
feedparser
|
feedparser
|
||||||
fixtures>=0.3.14
|
fixtures>=0.3.14
|
||||||
|
libvirt-python>=1.2.5
|
||||||
mock>=1.0
|
mock>=1.0
|
||||||
mox>=0.5.3
|
mox>=0.5.3
|
||||||
MySQL-python
|
MySQL-python
|
||||||
|
7
tox.ini
7
tox.ini
@ -4,7 +4,6 @@ envlist = py26,py27,py33,pep8
|
|||||||
skipsdist = True
|
skipsdist = True
|
||||||
|
|
||||||
[testenv]
|
[testenv]
|
||||||
sitepackages = True
|
|
||||||
usedevelop = True
|
usedevelop = True
|
||||||
install_command = pip install -U --force-reinstall {opts} {packages}
|
install_command = pip install -U --force-reinstall {opts} {packages}
|
||||||
# Note the hash seed is set to 0 until nova can be tested with a
|
# Note the hash seed is set to 0 until nova can be tested with a
|
||||||
@ -17,16 +16,13 @@ commands =
|
|||||||
python -m nova.openstack.common.lockutils python setup.py test --slowest --testr-args='{posargs}'
|
python -m nova.openstack.common.lockutils python setup.py test --slowest --testr-args='{posargs}'
|
||||||
|
|
||||||
[tox:jenkins]
|
[tox:jenkins]
|
||||||
sitepackages = True
|
|
||||||
downloadcache = ~/cache/pip
|
downloadcache = ~/cache/pip
|
||||||
|
|
||||||
[testenv:pep8]
|
[testenv:pep8]
|
||||||
sitepackages = False
|
|
||||||
commands =
|
commands =
|
||||||
flake8 {posargs}
|
flake8 {posargs}
|
||||||
|
|
||||||
[testenv:genconfig]
|
[testenv:genconfig]
|
||||||
sitepackages = False
|
|
||||||
commands =
|
commands =
|
||||||
bash tools/config/generate_sample.sh -b . -p nova -o etc/nova
|
bash tools/config/generate_sample.sh -b . -p nova -o etc/nova
|
||||||
|
|
||||||
@ -49,9 +45,6 @@ commands = {posargs}
|
|||||||
[testenv:docs]
|
[testenv:docs]
|
||||||
commands = python setup.py build_sphinx
|
commands = python setup.py build_sphinx
|
||||||
|
|
||||||
[testenv:py27local]
|
|
||||||
sitepackages = False
|
|
||||||
|
|
||||||
[flake8]
|
[flake8]
|
||||||
# H803 skipped on purpose per list discussion.
|
# H803 skipped on purpose per list discussion.
|
||||||
# E125 is deliberately excluded. See https://github.com/jcrocholl/pep8/issues/126
|
# E125 is deliberately excluded. See https://github.com/jcrocholl/pep8/issues/126
|
||||||
|
Loading…
x
Reference in New Issue
Block a user