summary refs log tree commit diff
path: root/scripts-dev
diff options
context:
space:
mode:
authorWill Hunt <will@half-shot.uk>2020-07-05 16:32:02 +0100
committerGitHub <noreply@github.com>2020-07-05 16:32:02 +0100
commit62b1ce85398f52e7d6137e77083294d0c90af459 (patch)
tree8bb59226c2abea66fccfd42068a608a88eeaae8c /scripts-dev
parentMerge different Resource implementation classes (#7732) (diff)
downloadsynapse-62b1ce85398f52e7d6137e77083294d0c90af459.tar.xz
isort 5 compatibility (#7786)
The CI appears to use the latest version of isort, which is a problem when isort gets a major version bump. Rather than try to pin the version, I've done the necessary to make isort5 happy with synapse.
Diffstat (limited to 'scripts-dev')
-rw-r--r--scripts-dev/check_signature.py2
-rwxr-xr-xscripts-dev/lint.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/scripts-dev/check_signature.py b/scripts-dev/check_signature.py

index ecda103cf7..6755bc5282 100644 --- a/scripts-dev/check_signature.py +++ b/scripts-dev/check_signature.py
@@ -2,9 +2,9 @@ import argparse import json import logging import sys -import urllib2 import dns.resolver +import urllib2 from signedjson.key import decode_verify_key_bytes, write_signing_keys from signedjson.sign import verify_signed_json from unpaddedbase64 import decode_base64 diff --git a/scripts-dev/lint.sh b/scripts-dev/lint.sh
index 6f1ba22931..66b0568858 100755 --- a/scripts-dev/lint.sh +++ b/scripts-dev/lint.sh
@@ -15,7 +15,7 @@ else fi echo "Linting these locations: $files" -isort -y -rc $files +isort $files python3 -m black $files ./scripts-dev/config-lint.sh flake8 $files