Merge branch 'main' into aholmes-add-documentation

pyproject.toml

@@ -90,7 +90,7 @@ dev-dependencies = [
     "coverage ~= 7.4",
     "junit2html >= 30.1,< 32.0",
     "pyright == 1.1.392.post0",
-    "isort ~= 5.13",
+    "isort >= 5.13,< 7.0",
     "ruff ~= 0.3",
     "bandit[sarif,toml] ~= 1.7",
     "sphinx",
@@ -311,8 +311,11 @@ skip-magic-trailing-comma = false
 line-ending = "auto"
 docstring-code-format = false
 docstring-code-line-length = "dynamic"
+[tool.ruff.lint.isort]
+split-on-trailing-comma = false
 
 [tool.isort]
 profile = "black"
 src_paths = ["src"]
 skip_glob = ["src/*/typings", "src/*/build"]
+split_on_trailing_comma = false