diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index f54f1a4..91772aa 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -2,6 +2,7 @@ ci: autoupdate_commit_msg: "MAINT: update pre-commit config file" autoupdate_schedule: quarterly skip: + - prettier - taplo repos: @@ -10,17 +11,6 @@ repos: - id: check-hooks-apply - id: check-useless-excludes - - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.5.0 - hooks: - - id: check-case-conflict - - id: check-json - - id: check-toml - - id: check-yaml - - id: end-of-file-fixer - - id: mixed-line-ending - - id: trailing-whitespace - - repo: https://github.com/ComPWA/repo-maintenance rev: 0.1.11 hooks: @@ -45,6 +35,17 @@ repos: - id: nbqa-pyupgrade args: [--py38-plus] + - repo: https://github.com/pre-commit/pre-commit-hooks + rev: v4.5.0 + hooks: + - id: check-case-conflict + - id: check-json + - id: check-toml + - id: check-yaml + - id: end-of-file-fixer + - id: mixed-line-ending + - id: trailing-whitespace + - repo: https://github.com/psf/black-pre-commit-mirror rev: 23.12.1 hooks: diff --git a/.vscode/settings.json b/.vscode/settings.json index 86d5f07..c037b7f 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -23,10 +23,12 @@ "editor.defaultFormatter": "esbenp.prettier-vscode" }, "black-formatter.importStrategy": "useBundled", + "diffEditor.experimental.showMoves": true, "editor.formatOnSave": true, "github-actions.workflows.pinned.workflows": [".github/workflows/ci.yml"], "isort.args": ["--profile", "black"], "livePreview.defaultPreviewPath": "docs/_build/html", + "multiDiffEditor.experimental.enabled": true, "notebook.gotoSymbols.showAllSymbols": true, "rewrap.wrappingColumn": 88 } diff --git a/environment.yml b/environment.yml index a294d2d..1f84d85 100644 --- a/environment.yml +++ b/environment.yml @@ -1,8 +1,8 @@ name: strong2020-salamanca dependencies: - - python==3.10.* + - python==3.8.* - pip - pip: - - | - -c .constraints/py3.10.txt - -e .[dev] + - -c .constraints/py3.8.txt -e .[dev] +variables: + PRETTIER_LEGACY_CLI: "1" diff --git a/pyproject.toml b/pyproject.toml index 0a24f6c..36b4a37 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -55,11 +55,15 @@ format = [ "isort", ] jupyter = [ + "isort", "jupyterlab", "jupyterlab-code-formatter", + "jupyterlab-git", "jupyterlab-lsp", "jupyterlab-myst", + "python-lsp-ruff", "python-lsp-server[flake8,rope]", + "python-lsp-server[rope]", ] sty = [ "pre-commit",