Merge branch 'master' into scalar_array_speedup

danielgtaylor · Oct 16, 2023 · 4947666 · 4947666
2 parents 126505a + 3514991
commit 4947666
Show file tree

Hide file tree

Showing 14 changed files with 1,355 additions and 551 deletions.
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -19,6 +19,7 @@ importlib-metadata = { version = ">=1.6.0", python = "<3.8" }
 jinja2 = { version = ">=3.0.3", optional = true }
 python-dateutil = "^2.8"
 isort = {version = "^5.11.5", optional = true}
+typing-extensions = "^4.7.1"
 
 [tool.poetry.dev-dependencies]
 asv = "^0.4.2"
@@ -37,7 +38,7 @@ sphinx-rtd-theme = "0.5.0"
 tomlkit = "^0.7.0"
 tox = "^3.15.1"
 pre-commit = "^2.17.0"
-pydantic = ">=1.8.0"
+pydantic = ">=1.8.0,<2"
 
 
 [tool.poetry.scripts]
@@ -61,9 +62,13 @@ help = "Run tests"
 cmd  = "mypy src --ignore-missing-imports"
 help = "Check types with mypy"
 
+[tool.poe.tasks]
+_black = "black . --exclude tests/output_ --target-version py310"
+_isort = "isort . --extend-skip-glob 'tests/output_*/**/*'"
+
 [tool.poe.tasks.format]
-cmd  = "black . --exclude tests/output_ --target-version py310"
-help = "Apply black formatting to source code"
+sequence  = ["_black", "_isort"]
+help = "Apply black and isort formatting to source code"
 
 [tool.poe.tasks.docs]
 cmd  = "sphinx-build docs docs/build"