[pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
ComPWA · Jul 4, 2023 · 508ac7b · 508ac7b
1 parent 28160f0
commit 508ac7b
Show file tree

Hide file tree

Showing 18 changed files with 211 additions and 193 deletions.
diff --git a/.cspell.json b/.cspell.json
@@ -22,14 +22,11 @@
     "*particle*.*ml",
     ".constraints/*.txt",
     ".editorconfig",
-    ".flake8*",
     ".gitignore",
     ".gitpod.*",
     ".mypy.ini",
     ".pre-commit-config.yaml",
     ".prettierignore",
-    ".pydocstyle*",
-    ".pylintrc",
     ".readthedocs.yml",
     ".vscode/*",
     ".vscode/.gitignore",

diff --git a/.gitpod.yml b/.gitpod.yml
@@ -13,9 +13,11 @@ github:
 
 vscode:
   extensions:
+    - charliermarsh.ruff
     - eamodio.gitlens
     - editorconfig.editorconfig
     - esbenp.prettier-vscode
+    - garaioag.garaio-vscode-unwanted-recommendations
     - github.vscode-github-actions
     - github.vscode-pull-request-github
     - ms-python.python

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -44,12 +44,14 @@ repos:
       - id: nbqa-black
         additional_dependencies:
           - black>=22.1.0
-      - id: nbqa-flake8
-      - id: nbqa-isort
       - id: nbqa-pyupgrade
         args:
           - --py37-plus
 
+      - id: nbqa-ruff
+        args:
+          - --fix
+
   - repo: https://github.com/psf/black
     rev: 23.3.0
     hooks:
@@ -71,11 +73,6 @@ repos:
             .*\.py
           )$
 
-  - repo: https://github.com/pycqa/isort
-    rev: 5.12.0
-    hooks:
-      - id: isort
-
   - repo: https://github.com/kynan/nbstripout
     rev: 0.6.1
     hooks:
@@ -117,6 +114,13 @@ repos:
         args:
           - --py37-plus
 
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: ""
+    hooks:
+      - id: ruff
+        args:
+          - --fix
+
   - repo: https://github.com/ComPWA/mirrors-taplo
     rev: v0.8.0
     hooks:

diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -1,8 +1,10 @@
 {
   "recommendations": [
+    "charliermarsh.ruff",
     "eamodio.gitlens",
     "editorconfig.editorconfig",
     "esbenp.prettier-vscode",
+    "garaioag.garaio-vscode-unwanted-recommendations",
     "github.vscode-github-actions",
     "github.vscode-pull-request-github",
     "ms-python.python",
@@ -17,5 +19,12 @@
     "tamasfe.even-better-toml",
     "tyriar.sort-lines",
     "yzhang.markdown-all-in-one"
+  ],
+  "unwantedRecommendations": [
+    "bungcip.better-toml",
+    "ms-python.flake8",
+    "ms-python.isort",
+    "ms-python.pylint",
+    "travisillig.vscode-json-stable-stringify"
   ]
 }
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -34,15 +34,19 @@
   "github-actions.workflows.pinned.workflows": [".github/workflows/ci.yml"],
   "livePreview.defaultPreviewPath": "docs/_build/html",
   "python.analysis.autoImportCompletions": false,
-  "python.analysis.diagnosticMode": "workspace",
   "python.analysis.inlayHints.pytestParameters": true,
   "python.analysis.typeCheckingMode": "strict",
   "python.formatting.provider": "black",
   "python.linting.enabled": true,
+  "python.linting.flake8Enabled": false,
+  "python.linting.pydocstyleEnabled": false,
+  "python.linting.pylintEnabled": false,
   "python.testing.pytestArgs": ["--color=no"],
   "python.testing.pytestEnabled": true,
   "python.testing.unittestEnabled": false,
   "rewrap.wrappingColumn": 88,
+  "ruff.enable": true,
+  "ruff.organizeImports": true,
   "yaml.schemas": {
     "https://json.schemastore.org/github-workflow.json": ".github/workflows/requirements.yml"
   }

diff --git a/README.md b/README.md
@@ -1,5 +1,6 @@
 # Symbolic Dalitz-Plot Decomposition
 
+[![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/charliermarsh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff)
 [![GPLv3+ license](https://img.shields.io/badge/License-GPLv3+-blue.svg)](https://www.gnu.org/licenses/gpl-3.0-standalone.html)
 
 [![PyPI package](https://badge.fury.io/py/ampform-dpd.svg)](https://pypi.org/project/ampform-dpd)

diff --git a/docs/_unsrt_et_al.py b/docs/_unsrt_et_al.py
@@ -1,17 +1,10 @@
 from pybtex.database import Entry
 from pybtex.richtext import Tag, Text
 from pybtex.style.formatting.unsrt import Style as UnsrtStyle
-from pybtex.style.template import _format_list  # pyright: ignore[reportPrivateUsage]
-from pybtex.style.template import (
-    FieldIsMissing,
-    Node,
-    field,
-    href,
-    join,
-    node,
-    sentence,
-    words,
-)
+from pybtex.style.template import \
+    _format_list  # pyright: ignore[reportPrivateUsage]
+from pybtex.style.template import (FieldIsMissing, Node, field, href, join,
+                                   node, sentence, words)
 
 
 class MyStyle(UnsrtStyle):  # type: ignore[reportUntypedBaseClass]

diff --git a/docs/comparison/d2kkk.ipynb b/docs/comparison/d2kkk.ipynb
@@ -48,37 +48,22 @@
     "from ampform.kinematics import FourMomentumSymbol, InvariantMass\n",
     "from ampform.sympy import perform_cached_doit\n",
     "from IPython.display import SVG, Latex, Markdown, clear_output, display\n",
-    "from ipywidgets import (\n",
-    "    Accordion,\n",
-    "    Checkbox,\n",
-    "    GridBox,\n",
-    "    HBox,\n",
-    "    Layout,\n",
-    "    SelectMultiple,\n",
-    "    Tab,\n",
-    "    ToggleButtons,\n",
-    "    VBox,\n",
-    "    interactive_output,\n",
-    ")\n",
+    "from ipywidgets import (Accordion, Checkbox, GridBox, HBox, Layout,\n",
+    "                        SelectMultiple, Tab, ToggleButtons, VBox,\n",
+    "                        interactive_output)\n",
     "from qrules.transition import ReactionInfo\n",
     "from tensorwaves.data.phasespace import TFPhaseSpaceGenerator\n",
     "from tensorwaves.data.rng import TFUniformRealNumberGenerator\n",
     "from tensorwaves.data.transform import SympyDataTransformer\n",
-    "from tensorwaves.interface import DataSample, ParameterValue, ParametrizedFunction\n",
-    "\n",
-    "from ampform_dpd import DalitzPlotDecompositionBuilder, simplify_latex_rendering\n",
-    "from ampform_dpd.decay import (\n",
-    "    IsobarNode,\n",
-    "    Particle,\n",
-    "    ThreeBodyDecay,\n",
-    "    ThreeBodyDecayChain,\n",
-    ")\n",
-    "from ampform_dpd.io import (\n",
-    "    as_markdown_table,\n",
-    "    aslatex,\n",
-    "    get_readable_hash,\n",
-    "    perform_cached_lambdify,\n",
-    ")\n",
+    "from tensorwaves.interface import (DataSample, ParameterValue,\n",
+    "                                   ParametrizedFunction)\n",
+    "\n",
+    "from ampform_dpd import (DalitzPlotDecompositionBuilder,\n",
+    "                         simplify_latex_rendering)\n",
+    "from ampform_dpd.decay import (IsobarNode, Particle, ThreeBodyDecay,\n",
+    "                               ThreeBodyDecayChain)\n",
+    "from ampform_dpd.io import (as_markdown_table, aslatex, get_readable_hash,\n",
+    "                            perform_cached_lambdify)\n",
     "from ampform_dpd.spin import filter_parity_violating_ls, generate_ls_couplings\n",
     "\n",
     "simplify_latex_rendering()\n",

diff --git a/docs/comparison/jpsi2phipipi.ipynb b/docs/comparison/jpsi2phipipi.ipynb
@@ -48,37 +48,22 @@
     "from ampform.kinematics import FourMomentumSymbol, InvariantMass\n",
     "from ampform.sympy import perform_cached_doit\n",
     "from IPython.display import SVG, Latex, Markdown, clear_output, display\n",
-    "from ipywidgets import (\n",
-    "    Accordion,\n",
-    "    Checkbox,\n",
-    "    GridBox,\n",
-    "    HBox,\n",
-    "    Layout,\n",
-    "    SelectMultiple,\n",
-    "    Tab,\n",
-    "    ToggleButtons,\n",
-    "    VBox,\n",
-    "    interactive_output,\n",
-    ")\n",
+    "from ipywidgets import (Accordion, Checkbox, GridBox, HBox, Layout,\n",
+    "                        SelectMultiple, Tab, ToggleButtons, VBox,\n",
+    "                        interactive_output)\n",
     "from qrules.transition import ReactionInfo\n",
     "from tensorwaves.data.phasespace import TFPhaseSpaceGenerator\n",
     "from tensorwaves.data.rng import TFUniformRealNumberGenerator\n",
     "from tensorwaves.data.transform import SympyDataTransformer\n",
-    "from tensorwaves.interface import DataSample, ParameterValue, ParametrizedFunction\n",
-    "\n",
-    "from ampform_dpd import DalitzPlotDecompositionBuilder, simplify_latex_rendering\n",
-    "from ampform_dpd.decay import (\n",
-    "    IsobarNode,\n",
-    "    Particle,\n",
-    "    ThreeBodyDecay,\n",
-    "    ThreeBodyDecayChain,\n",
-    ")\n",
-    "from ampform_dpd.io import (\n",
-    "    as_markdown_table,\n",
-    "    aslatex,\n",
-    "    get_readable_hash,\n",
-    "    perform_cached_lambdify,\n",
-    ")\n",
+    "from tensorwaves.interface import (DataSample, ParameterValue,\n",
+    "                                   ParametrizedFunction)\n",
+    "\n",
+    "from ampform_dpd import (DalitzPlotDecompositionBuilder,\n",
+    "                         simplify_latex_rendering)\n",
+    "from ampform_dpd.decay import (IsobarNode, Particle, ThreeBodyDecay,\n",
+    "                               ThreeBodyDecayChain)\n",
+    "from ampform_dpd.io import (as_markdown_table, aslatex, get_readable_hash,\n",
+    "                            perform_cached_lambdify)\n",
     "from ampform_dpd.spin import filter_parity_violating_ls, generate_ls_couplings\n",
     "\n",
     "simplify_latex_rendering()\n",

diff --git a/docs/comparison/jpsi2pipipi.ipynb b/docs/comparison/jpsi2pipipi.ipynb
@@ -48,37 +48,22 @@
     "from ampform.kinematics import FourMomentumSymbol, InvariantMass\n",
     "from ampform.sympy import perform_cached_doit\n",
     "from IPython.display import SVG, Latex, Markdown, clear_output, display\n",
-    "from ipywidgets import (\n",
-    "    Accordion,\n",
-    "    Checkbox,\n",
-    "    GridBox,\n",
-    "    HBox,\n",
-    "    Layout,\n",
-    "    SelectMultiple,\n",
-    "    Tab,\n",
-    "    ToggleButtons,\n",
-    "    VBox,\n",
-    "    interactive_output,\n",
-    ")\n",
+    "from ipywidgets import (Accordion, Checkbox, GridBox, HBox, Layout,\n",
+    "                        SelectMultiple, Tab, ToggleButtons, VBox,\n",
+    "                        interactive_output)\n",
     "from qrules.transition import ReactionInfo\n",
     "from tensorwaves.data.phasespace import TFPhaseSpaceGenerator\n",
     "from tensorwaves.data.rng import TFUniformRealNumberGenerator\n",
     "from tensorwaves.data.transform import SympyDataTransformer\n",
-    "from tensorwaves.interface import DataSample, ParameterValue, ParametrizedFunction\n",
-    "\n",
-    "from ampform_dpd import DalitzPlotDecompositionBuilder, simplify_latex_rendering\n",
-    "from ampform_dpd.decay import (\n",
-    "    IsobarNode,\n",
-    "    Particle,\n",
-    "    ThreeBodyDecay,\n",
-    "    ThreeBodyDecayChain,\n",
-    ")\n",
-    "from ampform_dpd.io import (\n",
-    "    as_markdown_table,\n",
-    "    aslatex,\n",
-    "    get_readable_hash,\n",
-    "    perform_cached_lambdify,\n",
-    ")\n",
+    "from tensorwaves.interface import (DataSample, ParameterValue,\n",
+    "                                   ParametrizedFunction)\n",
+    "\n",
+    "from ampform_dpd import (DalitzPlotDecompositionBuilder,\n",
+    "                         simplify_latex_rendering)\n",
+    "from ampform_dpd.decay import (IsobarNode, Particle, ThreeBodyDecay,\n",
+    "                               ThreeBodyDecayChain)\n",
+    "from ampform_dpd.io import (as_markdown_table, aslatex, get_readable_hash,\n",
+    "                            perform_cached_lambdify)\n",
     "from ampform_dpd.spin import filter_parity_violating_ls, generate_ls_couplings\n",
     "\n",
     "simplify_latex_rendering()\n",

diff --git a/docs/jpsi2ksp.ipynb b/docs/jpsi2ksp.ipynb
@@ -37,29 +37,18 @@
     "import sympy as sp\n",
     "from ampform.dynamics import EnergyDependentWidth, formulate_form_factor\n",
     "from ampform.kinematics.phasespace import compute_third_mandelstam\n",
-    "from ampform.sympy import (\n",
-    "    UnevaluatedExpression,\n",
-    "    create_expression,\n",
-    "    implement_doit_method,\n",
-    "    make_commutative,\n",
-    "    perform_cached_doit,\n",
-    ")\n",
+    "from ampform.sympy import (UnevaluatedExpression, create_expression,\n",
+    "                           implement_doit_method, make_commutative,\n",
+    "                           perform_cached_doit)\n",
     "from IPython.display import Latex, Markdown\n",
     "from tensorwaves.data.transform import SympyDataTransformer\n",
     "from tensorwaves.interface import DataSample, ParametrizedFunction\n",
     "from tqdm.auto import tqdm\n",
     "\n",
-    "from ampform_dpd import (\n",
-    "    DalitzPlotDecompositionBuilder,\n",
-    "    _get_particle,\n",
-    "    simplify_latex_rendering,\n",
-    ")\n",
-    "from ampform_dpd.decay import (\n",
-    "    IsobarNode,\n",
-    "    Particle,\n",
-    "    ThreeBodyDecay,\n",
-    "    ThreeBodyDecayChain,\n",
-    ")\n",
+    "from ampform_dpd import (DalitzPlotDecompositionBuilder, _get_particle,\n",
+    "                         simplify_latex_rendering)\n",
+    "from ampform_dpd.decay import (IsobarNode, Particle, ThreeBodyDecay,\n",
+    "                               ThreeBodyDecayChain)\n",
     "from ampform_dpd.io import as_markdown_table, aslatex, perform_cached_lambdify\n",
     "from ampform_dpd.spin import filter_parity_violating_ls, generate_ls_couplings\n",
     "\n",

diff --git a/docs/lc2pkpi.ipynb b/docs/lc2pkpi.ipynb
@@ -33,13 +33,10 @@
     "import sympy as sp\n",
     "from IPython.display import Latex, Markdown\n",
     "\n",
-    "from ampform_dpd import DalitzPlotDecompositionBuilder, simplify_latex_rendering\n",
-    "from ampform_dpd.decay import (\n",
-    "    IsobarNode,\n",
-    "    Particle,\n",
-    "    ThreeBodyDecay,\n",
-    "    ThreeBodyDecayChain,\n",
-    ")\n",
+    "from ampform_dpd import (DalitzPlotDecompositionBuilder,\n",
+    "                         simplify_latex_rendering)\n",
+    "from ampform_dpd.decay import (IsobarNode, Particle, ThreeBodyDecay,\n",
+    "                               ThreeBodyDecayChain)\n",
     "from ampform_dpd.dynamics import BreitWignerMinL\n",
     "from ampform_dpd.io import as_markdown_table, aslatex\n",
     "from ampform_dpd.spin import filter_parity_violating_ls, generate_ls_couplings\n",