Support isort 7

.github/workflows/test.yaml

@@ -28,6 +28,9 @@ jobs:
           - tox_env: py3.12-black24
           - tox_env: py3.12-black23
           - tox_env: py3.12-black22
+          - tox_env: py3.12-isort7
+          - tox_env: py3.12-isort6
+          - tox_env: py3.12-isort5
           - tox_env: py3.12-pydantic1
     runs-on: ${{ matrix.os == '' && 'ubuntu-24.04' || matrix.os }}
     env:

pyproject.toml

@@ -34,7 +34,7 @@ dependencies = [
   "black>=19.10b0",
   "genson>=1.2.1,<2",
   "inflect>=4.1,<8",
-  "isort>=4.3.21,<7",
+  "isort>=4.3.21,<8",
   "jinja2>=2.10.1,<4",
   "packaging",
   "pydantic>=1.5",
@@ -106,6 +106,9 @@ docs = [
 black22 = [ "black==22.1" ]
 black23 = [ "black==23.12" ]
 black24 = [ "black==24.1" ]
+isort5 = [ "isort>=5,<6" ]
+isort6 = [ "isort>=6,<7" ]
+isort7 = [ "isort>=7,<8; python_version>='3.10'" ]
 pydantic1 = [ "pydantic<2" ]
 fix = [ "pre-commit-uv>=4.1.4" ]
 pkg-meta = [ "check-wheel-contents>=0.6.1", "twine>=6.1", "uv>=0.5.22" ]
@@ -131,6 +134,12 @@ conflicts = [
     { group = "black23" },
     { group = "dev" },
   ],
+  [
+    { group = "isort5" },
+    { group = "isort6" },
+    { group = "isort7" },
+    { group = "dev" },
+  ],
   [
     { group = "pydantic1" },
     { group = "pkg-meta" },

tests/main/graphql/test_main_graphql.py

@@ -276,7 +276,7 @@ def test_main_graphql_additional_imports_isort_4(tmp_path: Path) -> None:
     black.__version__.split(".")[0] == "19",
     reason="Installed black doesn't support the old style",
 )
-def test_main_graphql_additional_imports_isort_5_or_6(tmp_path: Path) -> None:
+def test_main_graphql_additional_imports_isort_not_4(tmp_path: Path) -> None:
     output_file: Path = tmp_path / "output.py"
     return_code: Exit = main([
         "--input",

tox.ini

@@ -14,6 +14,7 @@ env_list =
     readme
     coverage
     py3.12-black{24, 23, 22}
+    py3.12-isort{7, 6, 5}
     pkg_meta
 skip_missing_interpreters = true
 
@@ -45,6 +46,9 @@ dependency_groups =
     black24: black24
     black23: black23
     black22: black22
+    isort7: isort7
+    isort6: isort6
+    isort5: isort5
     pydantic1: pydantic1
 
 [testenv:fix]
@@ -85,6 +89,7 @@ depends =
     3.9
     py3.12-pydantic1
     py3.12-black{24, 23, 22}
+    py3.12-isort{7, 6, 5}
 dependency_groups = coverage
 
 [testenv:pkg_meta]