From 25219b7b4e8785bac151c7ffb994e57ae8f6ea9e Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Mon, 10 Dec 2018 13:58:26 +0000 Subject: [PATCH 1/2] Make isort tox check print diff when it fails --- tox.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tox.ini b/tox.ini index 731094b5daba..3c398dc3bafc 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 From 74c3606c5362d32f54178184a9f6a7bd2d835baa Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Mon, 10 Dec 2018 14:15:43 +0000 Subject: [PATCH 2/2] Newsfile --- changelog.d/4283.misc | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/4283.misc diff --git a/changelog.d/4283.misc b/changelog.d/4283.misc new file mode 100644 index 000000000000..21de5eb509c7 --- /dev/null +++ b/changelog.d/4283.misc @@ -0,0 +1 @@ +Make isort tox check print diff when it fails