diff options
| -rw-r--r-- | requirements.txt (renamed from tools/pip-requires) | 0 | ||||
| -rw-r--r-- | test-requirements.txt (renamed from tools/test-requires) | 0 | ||||
| -rwxr-xr-x | tools/install_venv.py | 4 | ||||
| -rw-r--r-- | tox.ini | 4 |
4 files changed, 4 insertions, 4 deletions
diff --git a/tools/pip-requires b/requirements.txt index 48615687..48615687 100644 --- a/tools/pip-requires +++ b/requirements.txt diff --git a/tools/test-requires b/test-requirements.txt index 79e56242..79e56242 100644 --- a/tools/test-requires +++ b/test-requirements.txt diff --git a/tools/install_venv.py b/tools/install_venv.py index b05a3f87..4debd4c8 100755 --- a/tools/install_venv.py +++ b/tools/install_venv.py @@ -31,8 +31,8 @@ import sys 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]) @@ -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 = {envpython} run_tests.py {envpython} run_tests.py --test-config=etc/tests/xml.localhost.test.conf |