From 51eafd918a2f2001e8ab12f508d341ed129331f9 Mon Sep 17 00:00:00 2001 From: blakeNaccarato Date: Sat, 21 Oct 2023 16:22:18 -0700 Subject: [PATCH] Unsuppress other projects, migrate unsupported folder settings to workspace settings --- .vscode/settings.json | 2 +- boiler.code-workspace | 25 ++++++++++++++++++------- pyproject.toml | 4 ++++ 3 files changed, 23 insertions(+), 8 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 97e3a1f..2a091c8 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -184,7 +184,7 @@ }, //* IPYNB "[ipynb]": { - "editor.defaultFormatter": "ms-python.black-formatter" + "editor.defaultFormatter": "charliermarsh.ruff" }, //* TXT "[plaintext]": { diff --git a/boiler.code-workspace b/boiler.code-workspace index df59fc2..b751e15 100644 --- a/boiler.code-workspace +++ b/boiler.code-workspace @@ -5,15 +5,26 @@ }, { "path": "../boilercv" + }, + { + "path": "../boilerdaq" + }, + { + "path": "../boilerdata" } - // { - // "path": "../boilerdaq" - // }, - // { - // "path": "../boilerdata" - // } ], "settings": { - "explorer.fileNesting.expand": false + "terminal.integrated.defaultProfile.linux": "pwsh", + "python.languageServer": "Pylance", + "explorer.fileNesting.expand": false, + "notebook.codeActionsOnSave": { + "source.organizeImports": "explicit", + "source.fixAll": "explicit" + }, + "ruff.importStrategy": "fromEnvironment", + "ruff.enableExperimentalFormatter": true, + "git.inputValidationSubjectLength": 88, + "git.inputValidationLength": 1e100, + "yaml.format.printWidth": 88 } } diff --git a/pyproject.toml b/pyproject.toml index a03310e..ff82668 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -49,6 +49,10 @@ ignore_unused = [ "gmpy2", # for faster sympy computations ] +# Use ruff for sorting, but configure this in case isort is being used in IDE tooling +[tool.isort] +profile = "black" + [tool.pyright] # * -------------------------------------------------------------------------------- * #