summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
authorMonty Taylor <mordred@inaugust.com>2013-07-12 03:03:18 -0400
committerMonty Taylor <mordred@inaugust.com>2013-07-12 03:03:18 -0400
commitbe8aa97de269ed1993243715a71699e95229cc59 (patch)
treeee30ea5187613b7ddde7d210295907286d2f5c56 /tox.ini
parent0cf4cc847190bfa7209b0fba2b5b4d7493ca4def (diff)
parent091ce52138d65fc0fe0cdbea5556d76a4ecc5b29 (diff)
downloadoslo-version-be8aa97de269ed1993243715a71699e95229cc59.tar.gz
Merge feature/merged2to1 into master
Upstream d2to1 has been rather unresponsive, and doing what we need in this case is really easier without the extra complexity. Change-Id: Ibd16944e76ad8398b57b6ddcbcd150cd462add3e
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini2
1 files changed, 1 insertions, 1 deletions
diff --git a/tox.ini b/tox.ini
index 6d32c86..97d7a78 100644
--- a/tox.ini
+++ b/tox.ini
@@ -9,7 +9,7 @@ setenv = VIRTUAL_ENV={envdir}
deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
commands =
- python setup.py testr --slowest --testr-args='{posargs}'
+ python setup.py testr --testr-args='{posargs}'
[tox:jenkins]
sitepackages = True