From 543dea16e40bc0772a3aa01422bce46df9fc32e1 Mon Sep 17 00:00:00 2001 From: Remco de Boer <29308176+redeboer@users.noreply.github.com> Date: Mon, 9 Oct 2023 14:08:52 +0200 Subject: [PATCH] MAINT: revert Ruff setup --- .pre-commit-config.yaml | 17 ++++++++++------- .vscode/extensions.json | 5 +++-- pyproject.toml | 8 ++++++++ 3 files changed, 21 insertions(+), 9 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 4b6ecaf..5024961 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -38,11 +38,21 @@ repos: - --no-prettierrc - --no-pypi - --no-python + - --no-ruff - --no-version-branches - --repo-name=ComPWA-demo - --repo-title="ComPWA demos" - id: colab-toc-visible + - repo: https://github.com/nbQA-dev/nbQA + rev: 1.7.0 + hooks: + - id: nbqa-flake8 + - id: nbqa-isort + - id: nbqa-pyupgrade + args: + - --py36-plus + - repo: https://github.com/psf/black rev: 23.9.1 hooks: @@ -65,13 +75,6 @@ repos: name: editorconfig alias: ec - - repo: https://github.com/nbQA-dev/nbQA - rev: 1.7.0 - hooks: - - id: nbqa-pyupgrade - args: - - --py36-plus - - repo: https://github.com/kynan/nbstripout rev: 0.6.1 hooks: diff --git a/.vscode/extensions.json b/.vscode/extensions.json index f968664..cc98fcc 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -5,6 +5,9 @@ "esbenp.prettier-vscode", "garaioag.garaio-vscode-unwanted-recommendations", "github.vscode-github-actions", + "ms-python.black-formatter", + "ms-python.flake8", + "ms-python.isort", "ms-python.python", "ms-vsliveshare.vsliveshare", "redhat.vscode-yaml", @@ -17,8 +20,6 @@ "unwantedRecommendations": [ "bungcip.better-toml", "davidanson.vscode-markdownlint", - "ms-python.flake8", - "ms-python.isort", "ms-python.pylint", "travisillig.vscode-json-stable-stringify" ] diff --git a/pyproject.toml b/pyproject.toml index e344cb9..b79391c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,6 +6,14 @@ target-version = [ "py39", ] +[tool.isort] +profile = "black" + +[tool.nbqa.addopts] +flake8 = [ + "--extend-ignore=E402,E501", +] + [tool.pytest.ini_options] addopts = [ "--durations=0",