LITE-26345: add isort

.github/workflows/build.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.8", "3.9", "3.10"]
+        python-version: ["3.8", "3.9", "3.10", "3.11"]
     steps:
     - uses: actions/checkout@v3
       with:

connect/reports/renderers/__init__.py

@@ -1,12 +1,12 @@
 #  Copyright © 2022 CloudBlue. All rights reserved.
 
+from connect.reports.renderers.csv import CSVRenderer  # noqa
+from connect.reports.renderers.j2 import Jinja2Renderer  # noqa
+from connect.reports.renderers.json import JSONRenderer  # noqa
+from connect.reports.renderers.pdf import PDFRenderer  # noqa
 from connect.reports.renderers.registry import (  # noqa
-    get_renderers,
-    get_renderer_class,
     get_renderer,
+    get_renderer_class,
+    get_renderers,
 )
-from connect.reports.renderers.j2 import Jinja2Renderer # noqa
-from connect.reports.renderers.json import JSONRenderer # noqa
-from connect.reports.renderers.pdf import PDFRenderer # noqa
-from connect.reports.renderers.xlsx import XLSXRenderer # noqa
-from connect.reports.renderers.csv import CSVRenderer # noqa
+from connect.reports.renderers.xlsx import XLSXRenderer  # noqa

connect/reports/renderers/j2.py

@@ -2,11 +2,7 @@
 
 import os
 
-from jinja2 import (
-    Environment,
-    FileSystemLoader,
-    select_autoescape,
-)
+from jinja2 import Environment, FileSystemLoader, select_autoescape
 
 from connect.reports.renderers.base import BaseRenderer
 from connect.reports.renderers.registry import register

connect/reports/renderers/pdf.py

@@ -4,7 +4,7 @@
 import pathlib
 from functools import partial
 
-from weasyprint import CSS, default_url_fetcher, HTML
+from weasyprint import CSS, HTML, default_url_fetcher
 
 from connect.reports.renderers.j2 import Jinja2Renderer
 from connect.reports.renderers.registry import register

connect/reports/renderers/registry.py

@@ -2,6 +2,7 @@
 
 from connect.reports.renderers.base import BaseRenderer
 
+
 _RENDERERS = {}
 
 

connect/reports/renderers/xlsx.py

@@ -9,7 +9,7 @@
 import pytz
 from openpyxl import load_workbook
 from openpyxl.styles import Alignment, Font, PatternFill
-from openpyxl.styles.colors import Color, WHITE
+from openpyxl.styles.colors import WHITE, Color
 from openpyxl.utils.exceptions import InvalidFileException
 
 from connect.reports.renderers.base import BaseRenderer

pyproject.toml

@@ -17,12 +17,14 @@ classifiers = [
     "Intended Audience :: Developers",
     "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
     "Topic :: Utilities",
     "Topic :: Software Development :: Libraries",
 ]
 
 [tool.poetry.dependencies]
-python = "^3.8"
+python = ">=3.8,<4"
 openpyxl = ">=2.5.14"
 WeasyPrint = "^53.4"
 Jinja2 = ">=2,<4"
@@ -44,11 +46,11 @@ flake8-bugbear = ">=20,<23"
 flake8-cognitive-complexity = "^0.1"
 flake8-commas = "~2.1"
 flake8-future-import = "~0.4"
-flake8-import-order = "~0.18"
 flake8-broken-line = ">=0.3,<0.7"
 flake8-pyproject = "^1.2.2"
 fs = "^2.4.12"
 pytest-asyncio = "^0.20.1"
+flake8-isort = "^6.0.0"
 
 [build-system]
 requires = ["poetry-core>=1.0.0", "setuptools"]
@@ -69,7 +71,8 @@ omit = [
     "*/settings/*",
     "*/manage.py",
     "*/wsgi.py",
-    "*/urls.py"
+    "*/urls.py",
+    "*/reports/constants.py"
 ]
 
 exclude_lines = [
@@ -92,7 +95,17 @@ exclude = [
 ]
 show_source = true
 max_line_length = 100
-import_order_style = "smarkets"
-application_import_names = "connect"
 max_cognitive_complexity = 15
 ignore = ["FI1", "W503", "B008"]
+
+[tool.isort]
+src_paths = "*"
+sections = ["FUTURE", "STDLIB", "THIRDPARTY", "FIRSTPARTY", "LOCALFOLDER"]
+group_by_package = true
+multi_line_output = 3
+force_grid_wrap = 4
+combine_as_imports = true
+use_parentheses = true
+include_trailing_comma = true
+line_length = 100
+lines_after_imports = 2

tests/reports/renderers/test_registry.py

@@ -4,12 +4,12 @@
 
 from connect.reports.renderers.base import BaseRenderer
 from connect.reports.renderers.registry import (
+    RendererAlreadyRegisteredError,
+    RendererNotFoundError,
     get_renderer,
     get_renderer_class,
     get_renderers,
     register,
-    RendererAlreadyRegisteredError,
-    RendererNotFoundError,
 )
 
 

tests/reports/renderers/test_xlsx.py

@@ -4,7 +4,7 @@
 
 import pytest
 from fs.tempfs import TempFS
-from openpyxl import load_workbook, Workbook
+from openpyxl import Workbook, load_workbook
 
 from connect.reports.datamodels import RendererDefinition
 from connect.reports.renderers import XLSXRenderer