From 6a6268826982ef426dd7a2f0401092f018ad9f91 Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Tue, 29 Oct 2019 11:08:36 +0000 Subject: [PATCH 1/2] Update CI to lint same folders as lint.sh --- scripts-dev/update_database | 3 +-- tox.ini | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/scripts-dev/update_database b/scripts-dev/update_database index 10166583e1d8..27a1ad1e7e43 100755 --- a/scripts-dev/update_database +++ b/scripts-dev/update_database @@ -25,8 +25,8 @@ from twisted.internet import defer, reactor from synapse.config.homeserver import HomeServerConfig from synapse.metrics.background_process_metrics import run_as_background_process from synapse.server import HomeServer -from synapse.storage.engines import create_engine from synapse.storage import DataStore +from synapse.storage.engines import create_engine from synapse.storage.prepare_database import prepare_database logger = logging.getLogger("update_database") @@ -122,4 +122,3 @@ if __name__ == "__main__": )) reactor.run() - diff --git a/tox.ini b/tox.ini index 3cd2c5e63394..714bc1092d49 100644 --- a/tox.ini +++ b/tox.ini @@ -123,7 +123,7 @@ commands = [testenv:check_isort] skip_install = True deps = isort -commands = /bin/sh -c "isort -c -df -sp setup.cfg -rc synapse tests" +commands = /bin/sh -c "isort -c -df -sp setup.cfg -rc synapse tests scripts-dev scripts" [testenv:check-newsfragment] skip_install = True From d26765d5495c7079e1ffac5550defbdf903b8e32 Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Tue, 29 Oct 2019 11:12:40 +0000 Subject: [PATCH 2/2] Add changelog --- changelog.d/6270.misc | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/6270.misc diff --git a/changelog.d/6270.misc b/changelog.d/6270.misc new file mode 100644 index 000000000000..d1c58113233f --- /dev/null +++ b/changelog.d/6270.misc @@ -0,0 +1 @@ +Update CI to run `isort` over the `scripts` and `scripts-dev` directories. \ No newline at end of file