summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
authorMonty Taylor <mordred@inaugust.com>2013-06-02 08:42:01 -0400
committerJenkins <jenkins@review.openstack.org>2013-06-25 21:52:17 +0000
commit4998315d0307405fc38824bc8d683a1595ca73d3 (patch)
treefb49360d7eded2a19596dec7422bdf8ddccced5d /tox.ini
parent5cc8a47d403fe40417672e930de0808a21cd9189 (diff)
downloadzuul-4998315d0307405fc38824bc8d683a1595ca73d3.tar.gz
Rename requirements files to standard names.
Change-Id: I0385ac9f8336a8c2e45b0fa6ed062b6b23a182aa Reviewed-on: https://review.openstack.org/33351 Reviewed-by: James E. Blair <corvus@inaugust.com> Approved: Jeremy Stanley <fungi@yuggoth.org> Reviewed-by: Jeremy Stanley <fungi@yuggoth.org> Tested-by: Jenkins
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini6
1 files changed, 3 insertions, 3 deletions
diff --git a/tox.ini b/tox.ini
index dea7c5761..8633c8d18 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,8 +5,8 @@ envlist = pep8, pyflakes, py27
# Set STATSD env variables so that statsd code paths are tested.
setenv = STATSD_HOST=localhost
STATSD_PORT=8125
-deps = -r{toxinidir}/tools/pip-requires
- -r{toxinidir}/tools/test-requires
+deps = -r{toxinidir}/requirements.txt
+ -r{toxinidir}/test-requirements.txt
commands = nosetests --logging-format="%(asctime)s %(name)-32s %(levelname)-8s %(message)s" {posargs}
[tox:jenkins]
@@ -20,7 +20,7 @@ setenv = NOSE_WITH_COVERAGE=1
[testenv:pyflakes]
deps = pyflakes
- -r{toxinidir}/tools/pip-requires
+ -r{toxinidir}/requirements.txt
commands = pyflakes zuul setup.py
[testenv:venv]