2
0
Эх сурвалжийг харах

SCons: Consolidate pysettings via `pyproject.toml`

Thaddeus Crews 1 жил өмнө
parent
commit
f4e58691c2

+ 0 - 3
.pre-commit-config.yaml

@@ -23,8 +23,6 @@ repos:
       - id: black
       - id: black
         files: (\.py$|SConstruct|SCsub)
         files: (\.py$|SConstruct|SCsub)
         types_or: [text]
         types_or: [text]
-        args:
-          - --line-length=120
 
 
   - repo: https://github.com/pre-commit/mirrors-mypy
   - repo: https://github.com/pre-commit/mirrors-mypy
     rev: v0.971
     rev: v0.971
@@ -32,7 +30,6 @@ repos:
       - id: mypy
       - id: mypy
         files: \.py$
         files: \.py$
         types_or: [text]
         types_or: [text]
-        args: [--config-file=./misc/scripts/mypy.ini]
 
 
   - repo: https://github.com/codespell-project/codespell
   - repo: https://github.com/codespell-project/codespell
     rev: v2.2.6
     rev: v2.2.6

+ 0 - 13
misc/scripts/mypy.ini

@@ -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)

+ 16 - 0
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/.*"