summary refs log tree commit diff
path: root/tox.ini
diff options
context:
space:
mode:
authorAmber Brown <hawkowl@atleastfornow.net>2018-12-22 01:37:26 +1100
committerGitHub <noreply@github.com>2018-12-22 01:37:26 +1100
commitc26f49a6645a84730811ea7bc5158d826bc43484 (patch)
tree5080d8f5543391c24cb30c4bd7d4511edd00900a /tox.ini
parentMerge branch 'master' into develop (diff)
downloadsynapse-c26f49a6645a84730811ea7bc5158d826bc43484.tar.xz
Make the dependencies more like a standard Python project and hook up the optional dependencies to setuptools (#4298)
Diffstat (limited to '')
-rw-r--r--tox.ini4
1 files changed, 1 insertions, 3 deletions
diff --git a/tox.ini b/tox.ini

index f5f07cb690..a0f5486829 100644 --- a/tox.ini +++ b/tox.ini
@@ -9,9 +9,6 @@ deps = junitxml coverage - # needed by some of the tests - lxml - # cyptography 2.2 requires setuptools >= 18.5 # # older versions of virtualenv (?) give us a virtualenv with the same @@ -33,6 +30,7 @@ setenv = [testenv] deps = {[base]deps} +extras = all whitelist_externals = sh