fix: Liskov substition violation

Signed-off-by: rjdbcm <rjdbcm@outlook.com>
OZI-Project · Oct 28, 2024 · 03ee532 · 03ee532
1 parent c48b18d
commit 03ee532
Show file tree

Hide file tree

Showing 2 changed files with 78 additions and 10 deletions.
diff --git a/ozi_spec/project.py b/ozi_spec/project.py
@@ -8,11 +8,9 @@
 from ozi_spec.base import Default
 from ozi_spec.ci import CI
 from ozi_spec.ci import Build
-from ozi_spec.ci import CheckpointSuite
 from ozi_spec.ci import ClassicDist
 from ozi_spec.ci import ClassicLint
 from ozi_spec.ci import ClassicTest
-from ozi_spec.ci import RuffLint
 from ozi_spec.pkg import Pkg
 from ozi_spec.python import Support
 from ozi_spec.src import Src
@@ -24,9 +22,9 @@ class PythonProject(Default):
 
     ci: CI = CI()
     support: Support = Support()
-    dist: CheckpointSuite = ClassicDist()
-    lint: CheckpointSuite = ClassicLint()
-    test: CheckpointSuite = ClassicTest()
+    dist: ClassicDist = ClassicDist()
+    lint: ClassicLint = ClassicLint()
+    test: ClassicTest = ClassicTest()
     build: Build = Build()
     pkg: Pkg = Pkg()
     src: Src = Src()
@@ -41,4 +39,39 @@ class ClassicProject(PythonProject):
 class RuffProject(PythonProject):
     """Alternative to classic project using ruff for linting and formatting."""
 
-    lint: RuffLint = RuffLint()
+    lint: ClassicLint = ClassicLint(
+        exclude=('meson-private',),
+        module=('ruff', 'mypy', 'pyright'),
+        plugin={},
+        utility={'ruff': 'ruff>=0.1.6', 'mypy': 'mypy', 'pyright': 'pyright'},
+        ignore=(
+            'A003',
+            'ARG',
+            'ANN401',
+            'TRY003',
+            'B028',
+            'B905',
+            'D1',
+            'D2',
+            'D101',
+            'D4',
+            'FLY',
+            'FBT',
+            'PGH003',
+            'PLR',
+            'RET',
+            'EM',
+            'PLW',
+            'PTH',
+            'RUF009',
+            'RUF012',
+            'RUF015',
+            'RUF200',
+            'SIM',
+            'T201',
+            'TCH002',
+            'TCH004',
+            'UP',
+            'PERF203',
+        ),
+    )
diff --git a/ozi_spec/project.pyi b/ozi_spec/project.pyi
@@ -23,9 +23,9 @@ class PythonProject(Default):
 
     ci: CI = CI()
     support: Support = Support()
-    dist: CheckpointSuite = ClassicDist()
-    lint: CheckpointSuite = ClassicLint()
-    test: CheckpointSuite = ClassicTest()
+    dist: ClassicDist = ClassicDist()
+    lint: ClassicLint = ClassicLint()
+    test: ClassicTest = ClassicTest()
     build: Build = Build()
     pkg: Pkg = Pkg()
     src: Src = Src()
@@ -40,4 +40,39 @@ class ClassicProject(PythonProject):
 class RuffProject(PythonProject):
     """Alternative to classic project using ruff for linting and formatting."""
 
-    lint: RuffLint = RuffLint()
+    lint: ClassicLint = ClassicLint(
+        exclude=('meson-private',),
+        module=('ruff', 'mypy', 'pyright'),
+        plugin={},
+        utility={'ruff': 'ruff>=0.1.6', 'mypy': 'mypy', 'pyright': 'pyright'},
+        ignore=(
+            'A003',
+            'ARG',
+            'ANN401',
+            'TRY003',
+            'B028',
+            'B905',
+            'D1',
+            'D2',
+            'D101',
+            'D4',
+            'FLY',
+            'FBT',
+            'PGH003',
+            'PLR',
+            'RET',
+            'EM',
+            'PLW',
+            'PTH',
+            'RUF009',
+            'RUF012',
+            'RUF015',
+            'RUF200',
+            'SIM',
+            'T201',
+            'TCH002',
+            'TCH004',
+            'UP',
+            'PERF203',
+        ),
+    )