Merge branch 'main' into feat/read_study_api

AntaresSimulatorTeam · Dec 3, 2024 · e605d28 · e605d28
2 parents 7d35ba7 + 1821e00
commit e605d28
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -29,7 +29,9 @@ jobs:
 
       - name: Performs Ubuntu tests
         if: matrix.os != 'windows-latest'
-        run: tox -p
+        run: |
+          tox -e lint-ci
+          tox -p
 
       - name: Performs Windows tests
         if: matrix.os == 'windows-latest'

diff --git a/tox.ini b/tox.ini
@@ -1,7 +1,6 @@
 [tox]
 env_list =
     py3.{9,10,12}-test
-    lint
 
 [testenv]
 deps =
@@ -27,3 +26,12 @@ commands =
     ruff format src/ tests/ {posargs}
     mypy {posargs}
 
+[testenv:lint-ci]
+description = Linting and formatting with ruff, typing with mypy
+skip_install = True
+commands =
+    python scripts/license_checker_and_adder.py --path=src --action=check-strict
+    python scripts/license_checker_and_adder.py --path=tests --action=check-strict
+    ruff check src/ tests/ {posargs}
+    ruff format --check src/ tests/ {posargs}
+    mypy {posargs}