diff --git a/tools/pip-requires b/requirements.txt similarity index 100% rename from tools/pip-requires rename to requirements.txt 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/tools/install_venv.py b/tools/install_venv.py index ddb3d82c1e5..eda0ced903b 100644 --- a/tools/install_venv.py +++ b/tools/install_venv.py @@ -56,8 +56,8 @@ def print_help(): def main(argv): root = os.path.dirname(os.path.dirname(os.path.realpath(__file__))) venv = os.path.join(root, '.venv') - pip_requires = os.path.join(root, 'tools', 'pip-requires') - test_requires = os.path.join(root, 'tools', 'test-requires') + pip_requires = os.path.join(root, 'requirements.txt') + test_requires = os.path.join(root, 'test-requirements.txt') py_version = "python%s.%s" % (sys.version_info[0], sys.version_info[1]) project = 'Quantum' install = install_venv.InstallVenv(root, venv, pip_requires, test_requires, diff --git a/tools/patch_tox_venv.py b/tools/patch_tox_venv.py index 5f09939cfab..01ea05afb17 100644 --- a/tools/patch_tox_venv.py +++ b/tools/patch_tox_venv.py @@ -25,8 +25,8 @@ def main(argv): venv = os.environ['VIRTUAL_ENV'] - pip_requires = os.path.join(root, 'tools', 'pip-requires') - test_requires = os.path.join(root, 'tools', 'test-requires') + pip_requires = os.path.join(root, 'requirements.txt') + test_requires = os.path.join(root, 'test-requirements.txt') py_version = "python%s.%s" % (sys.version_info[0], sys.version_info[1]) project = 'quantum' install = install_venv.InstallVenv(root, venv, pip_requires, test_requires, diff --git a/tox.ini b/tox.ini index d266c7b253c..3c4320ea927 100644 --- a/tox.ini +++ b/tox.ini @@ -3,8 +3,8 @@ envlist = py26,py27,pep8 [testenv] setenv = VIRTUAL_ENV={envdir} -deps = -r{toxinidir}/tools/pip-requires - -r{toxinidir}/tools/test-requires +deps = -r{toxinidir}/requirements.txt + -r{toxinidir}/test-requirements.txt setuptools_git>=0.4 commands = python tools/patch_tox_venv.py