Merge branch 'master' into develop_regularisation-icones

PlotPyStack · May 6, 2024 · 63ed529 · 63ed529
2 parents 2243ed6 + e4f23c6
commit 63ed529
Show file tree

Hide file tree

Showing 71 changed files with 2,942 additions and 1,176 deletions.
diff --git a/.coveragerc b/.coveragerc
@@ -8,4 +8,5 @@ omit =
 
 [report]
 exclude_lines =
-    if __name__ == .__main__.:
+    if __name__ == .__main__.:
+    if TYPE_CHECKING:
diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
@@ -21,7 +21,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.8", "3.11", "3.12"]
 
     steps:
     - uses: actions/checkout@v3
@@ -45,4 +45,4 @@ jobs:
         flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
     - name: Test with pytest
       run: |
-        pytest guidata
+        pytest
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -18,25 +18,15 @@
     "files.trimTrailingWhitespace": true,
     "python.defaultInterpreterPath": "${env:PPSTACK_PYTHONEXE}",
     "editor.formatOnSave": true,
-    "isort.args": [
-        "--profile",
-        "black"
-    ],
-    "[python]": {
-        "editor.codeActionsOnSave": {
-            "source.organizeImports": "explicit"
-        },
-        "editor.defaultFormatter": "ms-python.black-formatter"
-    },
-    "esbonio.sphinx.confDir": "",
+    "python.analysis.autoFormatStrings": true,
     "python.testing.unittestEnabled": false,
     "python.testing.pytestEnabled": true,
     "python.testing.pytestPath": "pytest",
-    "python.testing.pytestArgs": [
-        "-v",
-        "--cov",
-        "--cov-report=html",
-        "guidata"
-    ],
-    "python.analysis.autoFormatStrings": true,
+    "python.testing.pytestArgs": [],
+    "[python]": {
+        "editor.defaultFormatter": "charliermarsh.ruff"
+    },
+    "editor.codeActionsOnSave": {
+        "source.organizeImports": "explicit",
+    },
 }
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -200,6 +200,34 @@
                 "clear": true
             }
         },
+        {
+            "label": "Run Ruff",
+            "type": "shell",
+            "command": "cmd",
+            "args": [
+                "/c",
+                "run_ruff.bat",
+            ],
+            "options": {
+                "cwd": "scripts",
+                "env": {
+                    "PYTHON": "${env:PPSTACK_PYTHONEXE}",
+                    "UNATTENDED": "1"
+                }
+            },
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            },
+            "presentation": {
+                "echo": true,
+                "reveal": "always",
+                "focus": false,
+                "panel": "dedicated",
+                "showReuseMessage": true,
+                "clear": true
+            }
+        },
         {
             "label": "Build documentation",
             "type": "shell",