summary refs log tree commit diff
path: root/tox.ini
diff options
context:
space:
mode:
authorWill Hunt <will@half-shot.uk>2020-09-28 11:11:57 +0100
committerGitHub <noreply@github.com>2020-09-28 11:11:57 +0100
commit6201ea56eeae22258d58db2f7381f96759f5e85e (patch)
tree37cb630a46fe96e416110de253ad50d256c0482e /tox.ini
parentAdd support for device messages, start support for device lists (diff)
parenttypo (diff)
downloadsynapse-6201ea56eeae22258d58db2f7381f96759f5e85e.tar.xz
Merge branch 'develop' into hs/super-wip-edus-down-sync
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini8
1 files changed, 3 insertions, 5 deletions
diff --git a/tox.ini b/tox.ini
index ddcab0198f..4d132eff4c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,13 +2,12 @@
 envlist = packaging, py35, py36, py37, py38, check_codestyle, check_isort
 
 [base]
+extras = test
 deps =
-    mock
     python-subunit
     junitxml
     coverage
     coverage-enable-subprocess
-    parameterized
 
     # cyptography 2.2 requires setuptools >= 18.5
     #
@@ -36,7 +35,7 @@ setenv =
 [testenv]
 deps =
     {[base]deps}
-extras = all
+extras = all, test
 
 whitelist_externals =
     sh
@@ -84,7 +83,6 @@ deps =
     # Old automat version for Twisted
     Automat == 0.3.0
 
-    mock
     lxml
     coverage
     coverage-enable-subprocess
@@ -97,7 +95,7 @@ commands =
     /bin/sh -c 'python -m synapse.python_dependencies | sed -e "s/>=/==/g" -e "s/psycopg2==2.6//" -e "s/pyopenssl==16.0.0/pyopenssl==17.0.0/" | xargs -d"\n" pip install'
 
     # Install Synapse itself. This won't update any libraries.
-    pip install -e .
+    pip install -e ".[test]"
 
     {envbindir}/coverage run "{envbindir}/trial"  {env:TRIAL_FLAGS:} {posargs:tests} {env:TOXSUFFIX:}