summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2018-12-10 14:28:05 +0000
committerGitHub <noreply@github.com>2018-12-10 14:28:05 +0000
commit9b1c19e0c5f084b60cb31a6eef4ab19c4fa7901a (patch)
tree5a5cb3a87fce4f8ac04dc60132a953ef8ac0ca4f
parentInitialise user displayname from SAML2 data (#4272) (diff)
parentNewsfile (diff)
downloadsynapse-9b1c19e0c5f084b60cb31a6eef4ab19c4fa7901a.tar.xz
Merge pull request #4283 from matrix-org/erikj/isort_df
Make isort tox check print diff when it fails
-rw-r--r--changelog.d/4283.misc1
-rw-r--r--tox.ini4
2 files changed, 3 insertions, 2 deletions
diff --git a/changelog.d/4283.misc b/changelog.d/4283.misc
new file mode 100644
index 0000000000..21de5eb509
--- /dev/null
+++ b/changelog.d/4283.misc
@@ -0,0 +1 @@
+Make isort tox check print diff when it fails
diff --git a/tox.ini b/tox.ini
index 731094b5da..3c398dc3ba 100644
--- a/tox.ini
+++ b/tox.ini
@@ -134,7 +134,7 @@ commands = /bin/sh -c "flake8 synapse tests scripts scripts-dev scripts/hash_pas
 [testenv:check_isort]
 skip_install = True
 deps = isort
-commands = /bin/sh -c "isort -c -sp setup.cfg -rc synapse tests"
+commands = /bin/sh -c "isort -c -df -sp setup.cfg -rc synapse tests"
 
 [testenv:check-newsfragment]
 skip_install = True
@@ -150,4 +150,4 @@ deps =
     codecov
 commands =
     coverage combine
-    codecov -X gcov
\ No newline at end of file
+    codecov -X gcov