Skip to content

Allow ruff-vscode to fix notebooks again #2047

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
visr merged 1 commit into from
Feb 10, 2025
Merged

Allow ruff-vscode to fix notebooks again #2047

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Comment on lines +5 to +8
Copy link
Member Author

@visr visr Feb 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was disabled due to the linked issue. Prefixing notebook as suggested there fixes the problem for me. The postfix ruff is removed, It is a way for ruff-vscode to avoid allowing other extensions to run on-save. That is not the default way to do it and I don't think there is an issue with that.

},
"[python]": {
"editor.defaultFormatter": "charliermarsh.ruff",
"editor.formatOnSave": true,
"editor.codeActionsOnSave": {
"source.fixAll": "explicit"
"source.fixAll": "explicit",
"source.organizeImports": "explicit"
Comment on lines +14 to +15
Copy link
Member Author

@visr visr Feb 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lets do this as well, rather than wait for pre-commit to do it.

}
},
"mypy-type-checker.importStrategy": "fromEnvironment",
Expand Down
2 changes: 1 addition & 1 deletion pixi.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "" } }
Copy link
Member Author

@visr visr Feb 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unrelated, but this is needed to be able to use branches in our Manifest.toml, found in #2046.

Copy link
Member

@evetion evetion Feb 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could this break other uses cases (TC?) and if needed, for branches, it would probably be required for all Julia related tasks, not just core-cov?

Copy link
Member Author

@visr visr Feb 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No this is just when Pkg uses LibGit2 to checkout a branch. The other tasks that may need this already have this set. We can remove this again when JuliaLang/julia#56924 is merged.

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",
Expand Down
1 change: 0 additions & 1 deletion ruff.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
exclude = ["ribasim_qgis/tomllib/*"]
extend-include = ["*.ipynb"]
Copy link
Member Author

@visr visr Feb 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This has been the default since ruff 0.6: https://astral.sh/blog/ruff-v0.6.0#jupyter-notebooks-are-now-linted-and-formatted-by-default

target-version = "py311"

[lint]
Expand Down
Loading