Merge "Rename requires files to standard names."
This commit is contained in:
commit
ee5e3bb365
2
setup.py
2
setup.py
@ -22,7 +22,7 @@ from swift import __canonical_version__ as version
|
|||||||
name = 'swift'
|
name = 'swift'
|
||||||
|
|
||||||
|
|
||||||
with open('tools/pip-requires', 'r') as f:
|
with open('requirements.txt', 'r') as f:
|
||||||
requires = [x.strip() for x in f if x.strip()]
|
requires = [x.strip() for x in f if x.strip()]
|
||||||
|
|
||||||
|
|
||||||
|
4
tox.ini
4
tox.ini
@ -10,8 +10,8 @@ setenv = VIRTUAL_ENV={envdir}
|
|||||||
NOSE_OPENSTACK_SHOW_ELAPSED=1
|
NOSE_OPENSTACK_SHOW_ELAPSED=1
|
||||||
NOSE_OPENSTACK_STDOUT=1
|
NOSE_OPENSTACK_STDOUT=1
|
||||||
deps =
|
deps =
|
||||||
-r{toxinidir}/tools/pip-requires
|
-r{toxinidir}/requirements.txt
|
||||||
-r{toxinidir}/tools/test-requires
|
-r{toxinidir}/test-requirements.txt
|
||||||
commands = nosetests test/unit {posargs}
|
commands = nosetests test/unit {posargs}
|
||||||
|
|
||||||
[tox:jenkins]
|
[tox:jenkins]
|
||||||
|
Loading…
x
Reference in New Issue
Block a user