diff options
| author | Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> | 2021-01-26 11:36:12 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-26 11:36:12 +0000 |
| commit | e74bb9673315768287430bff2cb8bb0adb3e49ab (patch) | |
| tree | 90436c69dbab12ab2cdd2cd13c423a97810b87fb | |
| parent | Merge pull request #9062 from matrix-org/jaywink/admin-forward-extremities (diff) | |
| download | synapse-e74bb9673315768287430bff2cb8bb0adb3e49ab.tar.xz | |
Update isort to v5.7.0 (#9222)
This new version no longer has the problem of adding/removing a blank line in `.pyi` files, which black disagrees with. This would cause `isort` to slightly modify `.pyi` files, before `black` would subsequently modify back directly afterwards. Relevant `isort` issue: https://github.com/pycqa/isort/issues/1284
| -rw-r--r-- | changelog.d/9222.misc | 1 | ||||
| -rwxr-xr-x | setup.py | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/changelog.d/9222.misc b/changelog.d/9222.misc new file mode 100644 index 0000000000..37490717b3 --- /dev/null +++ b/changelog.d/9222.misc @@ -0,0 +1 @@ +Update `isort` to v5.7.0 to bypass a bug where it would disagree with `black` about formatting. \ No newline at end of file diff --git a/setup.py b/setup.py index ddbe9f511a..99425d52de 100755 --- a/setup.py +++ b/setup.py @@ -96,7 +96,7 @@ CONDITIONAL_REQUIREMENTS["all"] = list(ALL_OPTIONAL_REQUIREMENTS) # # We pin black so that our tests don't start failing on new releases. CONDITIONAL_REQUIREMENTS["lint"] = [ - "isort==5.0.3", + "isort==5.7.0", "black==19.10b0", "flake8-comprehensions", "flake8", |