isort 5 compatibility #7786
isort 5 compatibility #7786
Conversation
`-y` and `-rc` are now default behaviour and no longer exist. `dont-skip` is no longer required https://timothycrosley.github.io/isort/CHANGELOG/#500-penny-july-4-2020
There was a problem hiding this comment.
For clarity:
-ymeant "apply changes recursively without asking"-rcmeant "recursively look for Python files of which to sort imports"
These both indeed seem to be implied now given the changelog.
not_skip = '__init__.py' is now the default according to https://timothycrosley.github.io/isort/docs/configuration/profiles/#attrs, so it looks fine to remove.
Co-authored-by: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
Co-authored-by: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
|
|
||
| import dns.resolver | ||
| import urllib2 |
There was a problem hiding this comment.
Hm, is this script still Python 2?
| @@ -35,6 +33,7 @@ | |||
| ) | |||
| from synapse.api.room_versions import KNOWN_ROOM_VERSIONS | |||
| from synapse.events import EventBase | |||
| from synapse.logging import opentracing as opentracing | |||
There was a problem hiding this comment.
| from synapse.logging import opentracing as opentracing | |
| from synapse.logging import opentracing |
| @@ -45,6 +43,7 @@ | |||
| from synapse.module_api import ModuleApi | |||
| from synapse.push.mailer import load_jinja2_templates | |||
| from synapse.types import Requester, UserID | |||
| from synapse.util import stringutils as stringutils | |||
There was a problem hiding this comment.
| from synapse.util import stringutils as stringutils | |
| from synapse.util import stringutils |
| import logging | ||
| from io import BytesIO | ||
|
|
||
| import PIL.Image as Image | ||
| from PIL import Image as Image |
There was a problem hiding this comment.
| from PIL import Image as Image | |
| from PIL import Image |
| from synapse.api.errors import StoreError | ||
| from synapse.storage._base import SQLBaseStore | ||
| from synapse.types import JsonDict | ||
| from synapse.util import stringutils as stringutils |
There was a problem hiding this comment.
| from synapse.util import stringutils as stringutils | |
| from synapse.util import stringutils |
| import mock | ||
|
|
||
| import signedjson.key as key | ||
| import signedjson.sign as sign | ||
| from signedjson import key as key, sign as sign |
There was a problem hiding this comment.
| from signedjson import key as key, sign as sign | |
| from signedjson import key, sign |
| from parameterized import parameterized_class | ||
| from PIL import Image as Image |
There was a problem hiding this comment.
| from PIL import Image as Image | |
| from PIL import Image |
|
@auscompgeek: while those changes are all valid, they look like pre-existing problems. I don't think it makes sense to try and update this PR now it has landed. If you (or anybody) wants to open a new PR with those changes, be my guest... |
|
Whoops, sorry, I didn't realise this PR was already merged when I left those comments. |
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.
The two flags we set on invocation are no longer required, as they have been removed and are the default behaviour. The author has also removed dont_skip, and implies it is no longer required. I am unsure if that means we should be using something else though.
https://timothycrosley.github.io/isort/CHANGELOG/#500-penny-july-4-2020