summary refs log tree commit diff
path: root/tox.ini
diff options
context:
space:
mode:
authorJason Robinson <jasonr@matrix.org>2021-01-09 22:00:04 +0200
committerJason Robinson <jasonr@matrix.org>2021-01-09 22:00:04 +0200
commit2eb421b606c1ab3c720f510abbd6dc9ad25c0673 (patch)
treef69dde7b789a3c8bfe06a12a46792c92ffa05a1d /tox.ini
parentImplement clearing cache after deleting forward extremities (diff)
parentKeycloak mapping_provider example (#9037) (#9057) (diff)
downloadsynapse-2eb421b606c1ab3c720f510abbd6dc9ad25c0673.tar.xz
Merge branch 'develop' into jaywink/admin-forward-extremities
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini20
1 files changed, 17 insertions, 3 deletions
diff --git a/tox.ini b/tox.ini
index ab4ae295a9..297136fcc5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -24,6 +24,20 @@ deps =
     # install the "enum34" dependency of cryptography.
     pip>=10
 
+# directories/files we run the linters on
+lint_targets =
+    setup.py
+    synapse
+    tests
+    scripts
+    scripts-dev
+    stubs
+    contrib
+    synctl
+    synmark
+    .buildkite
+    docker
+
 # default settings for all tox environments
 [testenv]
 deps =
@@ -130,13 +144,13 @@ commands =
 [testenv:check_codestyle]
 extras = lint
 commands =
-    python -m black --check --diff .
-    /bin/sh -c "flake8 synapse tests scripts scripts-dev contrib synctl {env:PEP8SUFFIX:}"
+    python -m black --check --diff {[base]lint_targets}
+    flake8 {[base]lint_targets} {env:PEP8SUFFIX:}
     {toxinidir}/scripts-dev/config-lint.sh
 
 [testenv:check_isort]
 extras = lint
-commands = /bin/sh -c "isort -c --df --sp setup.cfg synapse tests scripts-dev scripts"
+commands = isort -c --df --sp setup.cfg {[base]lint_targets}
 
 [testenv:check-newsfragment]
 skip_install = True