From f4e58691c2e189a2fb9543737dda2cc874f3e1b4 Mon Sep 17 00:00:00 2001 From: Thaddeus Crews Date: Tue, 14 May 2024 11:04:46 -0500 Subject: [PATCH] SCons: Consolidate pysettings via `pyproject.toml` --- .pre-commit-config.yaml | 3 --- misc/scripts/mypy.ini | 13 ------------- pyproject.toml | 16 ++++++++++++++++ 3 files changed, 16 insertions(+), 16 deletions(-) delete mode 100644 misc/scripts/mypy.ini create mode 100644 pyproject.toml diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index e59419ac086..5c0c0b69177 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -23,8 +23,6 @@ repos: - id: black files: (\.py$|SConstruct|SCsub) types_or: [text] - args: - - --line-length=120 - repo: https://github.com/pre-commit/mirrors-mypy rev: v0.971 @@ -32,7 +30,6 @@ repos: - id: mypy files: \.py$ types_or: [text] - args: [--config-file=./misc/scripts/mypy.ini] - repo: https://github.com/codespell-project/codespell rev: v2.2.6 diff --git a/misc/scripts/mypy.ini b/misc/scripts/mypy.ini deleted file mode 100644 index 45f048f1184..00000000000 --- a/misc/scripts/mypy.ini +++ /dev/null @@ -1,13 +0,0 @@ -[mypy] -ignore_missing_imports = True -disallow_any_generics = True -no_implicit_optional = True -pretty = True -show_column_numbers = True -warn_redundant_casts = True -warn_return_any = True -warn_unreachable = True - -namespace_packages = True -explicit_package_bases = True -exclude = (?x)(^thirdparty) diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 00000000000..f1ea10fbaec --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,16 @@ +[tool.mypy] +ignore_missing_imports = true +disallow_any_generics = true +no_implicit_optional = true +pretty = true +show_column_numbers = true +warn_redundant_casts = true +warn_return_any = true +warn_unreachable = true +namespace_packages = true +explicit_package_bases = true +exclude = ["thirdparty/"] + +[tool.black] +line-length = 120 +extend-exclude = ".*thirdparty/.*"