summary refs log tree commit diff
path: root/tox.ini
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-02-25 14:27:36 +0000
committerAndrew Morgan <andrew@amorgan.xyz>2020-02-25 14:27:36 +0000
commit15a9ca24aaa2923626cda0e8c651552454fbfb36 (patch)
treea9cebc3ce28c15e9f7f9868cd89cf29ac4427e81 /tox.ini
parentRemove the cap on federation retry interval. (#6026) (diff)
parentFix for structured logging tests stomping on logs (#6023) (diff)
downloadsynapse-15a9ca24aaa2923626cda0e8c651552454fbfb36.tar.xz
Fix for structured logging tests stomping on logs (#6023)
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini30
1 files changed, 24 insertions, 6 deletions
diff --git a/tox.ini b/tox.ini
index 15fdf8433c..03119ac686 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,6 +2,7 @@
 envlist = packaging, py35, py36, py37, check_codestyle, check_isort
 
 [base]
+basepython = python3.7
 deps =
     mock
     python-subunit
@@ -137,18 +138,35 @@ commands = {toxinidir}/scripts-dev/generate_sample_config --check
 skip_install = True
 deps =
     coverage
-whitelist_externals =
-    bash
 commands=
     coverage combine
     coverage report
 
+[testenv:cov-erase]
+skip_install = True
+deps =
+    coverage
+commands=
+    coverage erase
+
+[testenv:cov-html]
+skip_install = True
+deps =
+    coverage
+commands=
+    coverage html
+
 [testenv:mypy]
-basepython = python3.5
+basepython = python3.7
+skip_install = True
 deps =
     {[base]deps}
     mypy
+    mypy-zope
+    typeshed
+env =
+    MYPYPATH = stubs/
 extras = all
-commands = mypy --ignore-missing-imports \
-            synapse/logging/_structured.py \
-            synapse/logging/_terse_json.py
+commands = mypy --show-traceback \
+            synapse/logging/ \
+            synapse/config/