summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-03-19 10:28:00 +0000
committerErik Johnston <erik@matrix.org>2019-03-19 10:28:00 +0000
commit4d25624ff66e909a288230b417fb525065c00e96 (patch)
tree6c1db74fa51b4a4ee2405aa66b06d42d18903d3b
parentBring py27-old into line with other test envs (diff)
downloadsynapse-4d25624ff66e909a288230b417fb525065c00e96.tar.xz
Revert changes
-rw-r--r--tox.ini14
1 files changed, 2 insertions, 12 deletions
diff --git a/tox.ini b/tox.ini

index a2dd35f197..0c2ba060b1 100644 --- a/tox.ini +++ b/tox.ini
@@ -84,16 +84,6 @@ deps = lxml coverage -extras = all - -whitelist_externals = - sh - -setenv = - {[base]setenv} - -passenv = * - commands = /usr/bin/find "{toxinidir}" -name '*.pyc' -delete # Make all greater-thans equals so we test the oldest version of our direct @@ -104,9 +94,9 @@ commands = # Add this so that coverage will run on subprocesses /bin/sh -c 'echo "import coverage; coverage.process_startup()" > {envsitepackagesdir}/../sitecustomize.py' - {envbindir}/coverage run "{envbindir}/trial" {env:TRIAL_FLAGS:} {posargs:tests} {env:TOXSUFFIX:} + pip install -e . -usedevelop=true + {envbindir}/coverage run "{envbindir}/trial" {env:TRIAL_FLAGS:} {posargs:tests} {env:TOXSUFFIX:} [testenv:packaging]