diff --git a/.vscode/settings.json b/.vscode/settings.json index 3865d5886..ebbc9d26a 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -2,17 +2,17 @@ "[julia]": { "editor.formatOnSave": true }, - "notebook.formatOnSave.enabled": false, + "notebook.formatOnSave.enabled": true, "notebook.codeActionsOnSave": { - // https://github.com/astral-sh/ruff-vscode/issues/593 - "source.fixAll.ruff": "never", - "source.organizeImports.ruff": "never" + "notebook.source.fixAll": "explicit", + "notebook.source.organizeImports": "explicit" }, "[python]": { "editor.defaultFormatter": "charliermarsh.ruff", "editor.formatOnSave": true, "editor.codeActionsOnSave": { - "source.fixAll": "explicit" + "source.fixAll": "explicit", + "source.organizeImports": "explicit" } }, "mypy-type-checker.importStrategy": "fromEnvironment", diff --git a/pixi.toml b/pixi.toml index e27a5ebcc..682899e50 100644 --- a/pixi.toml +++ b/pixi.toml @@ -79,7 +79,7 @@ test-ribasim-core = { cmd = "julia --project=core --eval 'using Pkg; Pkg.test()' test-ribasim-migration = { cmd = "pytest --numprocesses=4 -m regression python/ribasim/tests" } test-ribasim-core-cov = { cmd = "julia --project=core --eval 'using Pkg; Pkg.test(coverage=true, julia_args=[\"--check-bounds=yes\"])'", depends-on = [ "generate-testmodels", -] } +], env = { SSL_CERT_DIR = "", JULIA_SSL_CA_ROOTS_PATH = "" } } test-ribasim-regression = { cmd = "julia --project=core --eval 'using Pkg; Pkg.test(julia_args=[\"--check-bounds=yes\"], test_args=[\"regression\"])'", depends-on = [ "generate-testmodels", "test-ribasim-migration", diff --git a/ruff.toml b/ruff.toml index 9df710dc0..8dbd4f71b 100644 --- a/ruff.toml +++ b/ruff.toml @@ -1,5 +1,4 @@ exclude = ["ribasim_qgis/tomllib/*"] -extend-include = ["*.ipynb"] target-version = "py311" [lint]