Update isort to v5

Author: PeterJCLaw

plugins/routemaster-prometheus/setup.py

@@ -1,8 +1,9 @@
 """Package setup."""
 
-import version
 from setuptools import setup, find_packages
 
+import version
+
 with open('README.rst', 'r', encoding='utf-8') as f:
     long_description = f.read()
 

plugins/routemaster-prometheus/version.py

@@ -1,9 +1,6 @@
 """
 Versioning utils.
 """
-
-__all__ = ('get_version')
-
 import os
 import re
 import logging
@@ -13,6 +10,9 @@
 
 import pkg_resources
 
+__all__ = ('get_version')
+
+
 version_re = re.compile('^Version: (.+)$', re.M)
 
 logger = logging.getLogger(__file__)

plugins/routemaster-sentry/setup.py

@@ -1,8 +1,9 @@
 """Package setup."""
 
-import version
 from setuptools import setup, find_packages
 
+import version
+
 with open('README.rst', 'r', encoding='utf-8') as f:
     long_description = f.read()
 

plugins/routemaster-sentry/version.py

@@ -1,9 +1,6 @@
 """
 Versioning utils.
 """
-
-__all__ = ('get_version')
-
 import os
 import re
 import logging
@@ -13,6 +10,9 @@
 
 import pkg_resources
 
+__all__ = ('get_version')
+
+
 version_re = re.compile('^Version: (.+)$', re.M)
 
 logger = logging.getLogger(__file__)

plugins/routemaster-statsd/setup.py

@@ -1,8 +1,9 @@
 """Package setup."""
 
-import version
 from setuptools import setup, find_packages
 
+import version
+
 with open('README.rst', 'r', encoding='utf-8') as f:
     long_description = f.read()
 

plugins/routemaster-statsd/version.py

@@ -1,9 +1,6 @@
 """
 Versioning utils.
 """
-
-__all__ = ('get_version')
-
 import os
 import re
 import logging
@@ -13,6 +10,9 @@
 
 import pkg_resources
 
+__all__ = ('get_version')
+
+
 version_re = re.compile('^Version: (.+)$', re.M)
 
 logger = logging.getLogger(__file__)

routemaster/db/model.pyi

@@ -3,7 +3,6 @@ from typing import Any, Dict, List, Union, Optional
 
 from sqlalchemy import MetaData
 
-
 # Imperfect JSON type (see https://github.com/python/typing/issues/182)
 _JSON = Union[str, int, float, bool, None, Dict[str, Any], List[Any]]
 

scripts/linting/requirements.txt

@@ -36,7 +36,7 @@ flake8-debugger==3.1.0
     # via -r requirements.in
 flake8-docstrings==1.3.0
     # via -r requirements.in
-flake8-isort==2.5
+flake8-isort==4.1.1
     # via -r requirements.in
 flake8-junit-report==2.1.0
     # via -r requirements.in
@@ -54,7 +54,7 @@ flake8-todo==0.7
     # via -r requirements.in
 flake8-tuple==0.2.13
     # via -r requirements.in
-isort==4.3.4
+isort==5.10.1
     # via flake8-isort
 mccabe==0.6.1
     # via flake8
@@ -75,7 +75,7 @@ six==1.11.0
     #   pydocstyle
 snowballstemmer==1.2.1
     # via pydocstyle
-testfixtures==6.0.0
+testfixtures==6.18.3
     # via flake8-isort
 
 # The following packages are considered to be unsafe in a requirements file:

setup.cfg

@@ -29,7 +29,7 @@ exclude_lines =
 [isort]
 indent = 4
 known_first_party = routemaster
-known_standard_library = dataclasses, typing_extensions
+extra_standard_library = dataclasses, typing_extensions
 multi_line_output = 3
 length_sort = True
 order_by_type = True
@@ -38,8 +38,10 @@ default_section = THIRDPARTY
 sections = FUTURE,STDLIB,THIRDPARTY,FIRSTPARTY,LOCALFOLDER
 include_trailing_comma = True
 atomic = True
-not_skip = __init__.py
-skip = routemaster/migrations
+float_to_top = True
+extend_skip =
+    routemaster/migrations
+    .vscode
 
 [tool:pytest]
 python_paths=test_data/plugins/

setup.py

@@ -1,8 +1,9 @@
 """Package setup."""
 
-import version
 from setuptools import setup, find_packages
 
+import version
+
 with open('README.md', 'r', encoding='utf-8') as f:
     long_description = f.read()
 

version.py

@@ -1,9 +1,6 @@
 """
 Versioning utils.
 """
-
-__all__ = ('get_version')
-
 import os
 import re
 import logging
@@ -13,6 +10,9 @@
 
 import pkg_resources
 
+__all__ = ('get_version')
+
+
 version_re = re.compile('^Version: (.+)$', re.M)
 
 logger = logging.getLogger(__file__)