From 61b459022e6d379dba0768220cc9db4c583104a2 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Fri, 12 Jan 2024 19:01:17 +0100 Subject: [PATCH] MAINT: autoupdate pre-commit hooks (#26) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: GitHub Co-authored-by: Remco de Boer <29308176+redeboer@users.noreply.github.com> --- .gitignore | 1 + .pre-commit-config.yaml | 49 ++++++++--------- .vscode/extensions.json | 3 +- .vscode/settings.json | 4 +- binder/requirements.txt | 26 ++++----- environment.yml | 2 + requirements.txt | 116 ++++++++++++++++++++-------------------- 7 files changed, 104 insertions(+), 97 deletions(-) diff --git a/.gitignore b/.gitignore index b691493..9727aa9 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ .ipynb_checkpoints/ .tox/ condaenv.*.requirements.txt +node_modules/ diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index b492731..85d0579 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -2,6 +2,7 @@ ci: autoupdate_commit_msg: "MAINT: autoupdate pre-commit hooks" autoupdate_schedule: quarterly skip: + - prettier - taplo repos: @@ -10,25 +11,8 @@ 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-merge-conflict - - id: check-toml - - id: check-vcs-permalinks - - id: check-yaml - - id: end-of-file-fixer - exclude: > - (?x)^( - \.cspell\.json - )$ - - id: mixed-line-ending - - id: trailing-whitespace - - - repo: https://github.com/ComPWA/repo-maintenance - rev: 0.1.0 + - repo: https://github.com/ComPWA/policy + rev: 0.2.0 hooks: - id: check-dev-files args: @@ -45,7 +29,7 @@ repos: - id: colab-toc-visible - repo: https://github.com/nbQA-dev/nbQA - rev: 1.7.0 + rev: 1.7.1 hooks: - id: nbqa-flake8 - id: nbqa-isort @@ -53,8 +37,25 @@ repos: args: - --py36-plus + - repo: https://github.com/pre-commit/pre-commit-hooks + rev: v4.5.0 + hooks: + - id: check-case-conflict + - id: check-json + - id: check-merge-conflict + - id: check-toml + - id: check-vcs-permalinks + - id: check-yaml + - id: end-of-file-fixer + exclude: > + (?x)^( + \.cspell\.json + )$ + - id: mixed-line-ending + - id: trailing-whitespace + - repo: https://github.com/psf/black - rev: 23.9.1 + rev: 23.12.1 hooks: - id: black-jupyter @@ -64,12 +65,12 @@ repos: - id: blacken-docs - repo: https://github.com/streetsidesoftware/cspell-cli - rev: v7.3.1 + rev: v8.3.0 hooks: - id: cspell - repo: https://github.com/editorconfig-checker/editorconfig-checker.python - rev: 2.7.2 + rev: 2.7.3 hooks: - id: editorconfig-checker name: editorconfig @@ -101,7 +102,7 @@ repos: metadata.vscode - repo: https://github.com/pre-commit/mirrors-prettier - rev: v3.0.3 + rev: v4.0.0-alpha.8 hooks: - id: prettier diff --git a/.vscode/extensions.json b/.vscode/extensions.json index cc98fcc..45e739d 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -3,7 +3,6 @@ "eamodio.gitlens", "editorconfig.editorconfig", "esbenp.prettier-vscode", - "garaioag.garaio-vscode-unwanted-recommendations", "github.vscode-github-actions", "ms-python.black-formatter", "ms-python.flake8", @@ -11,6 +10,7 @@ "ms-python.python", "ms-vsliveshare.vsliveshare", "redhat.vscode-yaml", + "Soulcode.vscode-unwanted-extensions", "stkb.rewrap", "streetsidesoftware.code-spell-checker", "tamasfe.even-better-toml", @@ -20,6 +20,7 @@ "unwantedRecommendations": [ "bungcip.better-toml", "davidanson.vscode-markdownlint", + "garaioag.garaio-vscode-unwanted-recommendations", "ms-python.pylint", "travisillig.vscode-json-stable-stringify" ] diff --git a/.vscode/settings.json b/.vscode/settings.json index 986a1dc..6d3efae 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -20,16 +20,18 @@ }, "[python]": { "editor.codeActionsOnSave": { - "source.organizeImports": true + "source.organizeImports": "explicit" } }, "[yaml]": { "editor.defaultFormatter": "esbenp.prettier-vscode" }, "cSpell.enabled": true, + "diffEditor.experimental.showMoves": true, "editor.formatOnSave": true, "git.rebaseWhenSync": true, "github-actions.workflows.pinned.workflows": [".github/workflows/ci.yml"], + "multiDiffEditor.experimental.enabled": true, "python.analysis.autoImportCompletions": false, "python.languageServer": "Pylance", "python.testing.unittestEnabled": false, diff --git a/binder/requirements.txt b/binder/requirements.txt index 84902ba..6d2c017 100644 --- a/binder/requirements.txt +++ b/binder/requirements.txt @@ -4,38 +4,38 @@ # # pip-compile --no-annotate --strip-extras binder/requirements.in # -asttokens==2.4.0 +asttokens==2.4.1 backcall==0.2.0 -comm==0.1.4 +comm==0.2.1 contourpy==1.1.1 cycler==0.12.1 decorator==5.1.1 -executing==2.0.0 -fonttools==4.43.1 -importlib-resources==6.1.0 +executing==2.0.1 +fonttools==4.47.2 +importlib-resources==6.1.1 ipython==8.12.3 ipywidgets==8.1.1 jedi==0.19.1 jupyterlab-widgets==3.0.9 kiwisolver==1.4.5 -matplotlib==3.7.3 +matplotlib==3.7.4 matplotlib-inline==0.1.6 numpy==1.24.4 packaging==23.2 parso==0.8.3 -pexpect==4.8.0 +pexpect==4.9.0 pickleshare==0.7.5 -pillow==10.0.1 -prompt-toolkit==3.0.39 +pillow==10.2.0 +prompt-toolkit==3.0.43 ptyprocess==0.7.0 pure-eval==0.2.2 -pygments==2.16.1 +pygments==2.17.2 pyparsing==3.1.1 python-dateutil==2.8.2 six==1.16.0 stack-data==0.6.3 -traitlets==5.11.2 -typing-extensions==4.8.0 -wcwidth==0.2.8 +traitlets==5.14.1 +typing-extensions==4.9.0 +wcwidth==0.2.13 widgetsnbextension==4.0.9 zipp==3.17.0 diff --git a/environment.yml b/environment.yml index ff3164b..d08d9df 100644 --- a/environment.yml +++ b/environment.yml @@ -7,3 +7,5 @@ dependencies: - >- -c requirements.txt -r requirements.in +variables: + PRETTIER_LEGACY_CLI: "1" diff --git a/requirements.txt b/requirements.txt index f3abd2f..1524fa6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,73 +6,73 @@ # aiofiles==22.1.0 aiosqlite==0.19.0 -anyio==4.0.0 +anyio==4.2.0 argon2-cffi==23.1.0 argon2-cffi-bindings==21.2.0 arrow==1.3.0 -asttokens==2.4.0 +asttokens==2.4.1 async-lru==2.0.4 -attrs==23.1.0 -babel==2.13.0 +attrs==23.2.0 +babel==2.14.0 backcall==0.2.0 beautifulsoup4==4.12.2 -black==23.9.1 +black==23.12.1 bleach==6.1.0 -cachetools==5.3.1 -certifi==2023.7.22 +cachetools==5.3.2 +certifi==2023.11.17 cffi==1.16.0 cfgv==3.4.0 chardet==5.2.0 -charset-normalizer==3.3.0 +charset-normalizer==3.3.2 click==8.1.7 colorama==0.4.6 -comm==0.1.4 +comm==0.2.1 contourpy==1.1.1 cycler==0.12.1 debugpy==1.8.0 decorator==5.1.1 defusedxml==0.7.1 -distlib==0.3.7 -exceptiongroup==1.1.3 -executing==2.0.0 -fastjsonschema==2.18.1 -filelock==3.12.4 -fonttools==4.43.1 +distlib==0.3.8 +exceptiongroup==1.2.0 +executing==2.0.1 +fastjsonschema==2.19.1 +filelock==3.13.1 +fonttools==4.47.2 fqdn==1.5.1 -identify==2.5.30 -idna==3.4 -importlib-metadata==6.8.0 -importlib-resources==6.1.0 -ipykernel==6.25.2 +identify==2.5.33 +idna==3.6 +importlib-metadata==7.0.1 +importlib-resources==6.1.1 +ipykernel==6.28.0 ipython==8.12.3 ipywidgets==8.1.1 isoduration==20.11.0 -isort==5.12.0 +isort==5.13.2 jedi==0.19.1 -jinja2==3.1.2 +jinja2==3.1.3 json5==0.9.14 jsonpointer==2.4 -jsonschema==4.19.1 -jsonschema-specifications==2023.7.1 -jupyter-client==8.3.1 -jupyter-core==5.3.2 -jupyter-events==0.7.0 -jupyter-lsp==2.2.0 -jupyter-server==2.7.3 -jupyter-server-terminals==0.4.4 -jupyterlab==4.0.6 +jsonschema==4.20.0 +jsonschema-specifications==2023.12.1 +jupyter-client==8.6.0 +jupyter-core==5.7.1 +jupyter-events==0.9.0 +jupyter-lsp==2.2.1 +jupyter-server==2.12.4 +jupyter-server-terminals==0.5.1 +jupyterlab==4.0.10 jupyterlab-code-formatter==2.2.1 -jupyterlab-pygments==0.2.2 -jupyterlab-server==2.25.0 +jupyterlab-pygments==0.3.0 +jupyterlab-server==2.25.2 jupyterlab-widgets==3.0.9 kiwisolver==1.4.5 markupsafe==2.1.3 -matplotlib==3.7.3 +matplotlib==3.7.4 matplotlib-inline==0.1.6 mistune==3.0.2 mypy-extensions==1.0.0 -nbclient==0.8.0 -nbconvert==7.9.2 +nbclient==0.9.0 +nbconvert==7.14.1 nbformat==5.9.2 nest-asyncio==1.5.8 nodeenv==1.8.0 @@ -82,53 +82,53 @@ overrides==7.4.0 packaging==23.2 pandocfilters==1.5.0 parso==0.8.3 -pathspec==0.11.2 -pexpect==4.8.0 +pathspec==0.12.1 +pexpect==4.9.0 pickleshare==0.7.5 -pillow==10.0.1 +pillow==10.2.0 pkgutil-resolve-name==1.3.10 -platformdirs==3.11.0 +platformdirs==4.1.0 pluggy==1.3.0 -pre-commit==3.4.0 -prometheus-client==0.17.1 -prompt-toolkit==3.0.39 -psutil==5.9.5 +pre-commit==3.5.0 +prometheus-client==0.19.0 +prompt-toolkit==3.0.43 +psutil==5.9.7 ptyprocess==0.7.0 pure-eval==0.2.2 pycparser==2.21 -pygments==2.16.1 +pygments==2.17.2 pyparsing==3.1.1 pyproject-api==1.6.1 python-dateutil==2.8.2 python-json-logger==2.0.7 pytz==2023.3.post1 pyyaml==6.0.1 -pyzmq==25.1.1 -referencing==0.30.2 +pyzmq==25.1.2 +referencing==0.32.1 requests==2.31.0 rfc3339-validator==0.1.4 rfc3986-validator==0.1.1 -rpds-py==0.10.4 +rpds-py==0.16.2 send2trash==1.8.2 six==1.16.0 sniffio==1.3.0 soupsieve==2.5 stack-data==0.6.3 -terminado==0.17.1 +terminado==0.18.0 tinycss2==1.2.1 tomli==2.0.1 -tornado==6.3.3 -tox==4.11.3 -traitlets==5.11.2 -types-python-dateutil==2.8.19.14 -typing-extensions==4.8.0 +tornado==6.4 +tox==4.12.0 +traitlets==5.14.1 +types-python-dateutil==2.8.19.20240106 +typing-extensions==4.9.0 uri-template==1.3.0 -urllib3==2.0.6 -virtualenv==20.24.5 -wcwidth==0.2.8 +urllib3==2.1.0 +virtualenv==20.25.0 +wcwidth==0.2.13 webcolors==1.13 webencodings==0.5.1 -websocket-client==1.6.4 +websocket-client==1.7.0 widgetsnbextension==4.0.9 y-py==0.5.9 ypy-websocket==0.8.2