diff --git a/tools/pip-requires b/requirements.txt similarity index 100% rename from tools/pip-requires rename to requirements.txt diff --git a/setup.py b/setup.py index 29f486542a..6c4c2328c1 100644 --- a/setup.py +++ b/setup.py @@ -22,7 +22,7 @@ from swift import __canonical_version__ as version 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()] diff --git a/tools/test-requires b/test-requirements.txt similarity index 100% rename from tools/test-requires rename to test-requirements.txt diff --git a/tox.ini b/tox.ini index c6e6131096..c093e0d049 100644 --- a/tox.ini +++ b/tox.ini @@ -10,8 +10,8 @@ setenv = VIRTUAL_ENV={envdir} NOSE_OPENSTACK_SHOW_ELAPSED=1 NOSE_OPENSTACK_STDOUT=1 deps = - -r{toxinidir}/tools/pip-requires - -r{toxinidir}/tools/test-requires + -r{toxinidir}/requirements.txt + -r{toxinidir}/test-requirements.txt commands = nosetests test/unit {posargs} [tox:jenkins]