From 9f82a7344fcf94e5279451347122e97222114d21 Mon Sep 17 00:00:00 2001 From: Remco de Boer <29308176+redeboer@users.noreply.github.com> Date: Fri, 7 Jul 2023 00:57:56 +0200 Subject: [PATCH] DX: allow C408 error --- docs/comparison/d2kkk.ipynb | 6 +++--- docs/comparison/jpsi2phipipi.ipynb | 6 +++--- docs/comparison/jpsi2pipipi.ipynb | 6 +++--- docs/conf.py | 1 - pyproject.toml | 1 + src/ampform_dpd/io.py | 3 +-- tests/test_decay.py | 2 +- tests/test_io.py | 6 +++--- 8 files changed, 15 insertions(+), 16 deletions(-) diff --git a/docs/comparison/d2kkk.ipynb b/docs/comparison/d2kkk.ipynb index e635024d..dcec4204 100644 --- a/docs/comparison/d2kkk.ipynb +++ b/docs/comparison/d2kkk.ipynb @@ -650,7 +650,7 @@ "source": [ "def create_sliders() -> dict[str, ToggleButtons]:\n", " all_parameters = dict(ampform_model.parameter_defaults.items())\n", - " all_parameters.update(dpd_model.parameter_defaults.items())\n", + " all_parameters.update(dpd_model.parameter_defaults)\n", " sliders = {}\n", " for symbol, value in all_parameters.items():\n", " value = \"+1\"\n", @@ -899,8 +899,8 @@ " )\n", "\n", " global lines\n", - " amp_kwargs = {\"color\": \"r\", \"label\": \"ampform\", \"linestyle\": \"solid\"}\n", - " dpd_kwargs = {\"color\": \"blue\", \"label\": \"dpd\", \"linestyle\": \"dotted\"}\n", + " amp_kwargs = dict(color=\"r\", label=\"ampform\", linestyle=\"solid\")\n", + " dpd_kwargs = dict(color=\"blue\", label=\"dpd\", linestyle=\"dotted\")\n", " if lines is None:\n", " sx = (s_edges[:-1] + s_edges[1:]) / 2\n", " tx = (t_edges[:-1] + t_edges[1:]) / 2\n", diff --git a/docs/comparison/jpsi2phipipi.ipynb b/docs/comparison/jpsi2phipipi.ipynb index c8d16ef4..869f28a4 100644 --- a/docs/comparison/jpsi2phipipi.ipynb +++ b/docs/comparison/jpsi2phipipi.ipynb @@ -633,7 +633,7 @@ "source": [ "def create_sliders() -> dict[str, ToggleButtons]:\n", " all_parameters = dict(ampform_model.parameter_defaults.items())\n", - " all_parameters.update(dpd_model.parameter_defaults.items())\n", + " all_parameters.update(dpd_model.parameter_defaults)\n", " sliders = {}\n", " for symbol, value in all_parameters.items():\n", " value = \"+1\"\n", @@ -883,8 +883,8 @@ " )\n", "\n", " global lines\n", - " amp_kwargs = {\"color\": \"r\", \"label\": \"ampform\", \"linestyle\": \"solid\"}\n", - " dpd_kwargs = {\"color\": \"blue\", \"label\": \"dpd\", \"linestyle\": \"dotted\"}\n", + " amp_kwargs = dict(color=\"r\", label=\"ampform\", linestyle=\"solid\")\n", + " dpd_kwargs = dict(color=\"blue\", label=\"dpd\", linestyle=\"dotted\")\n", " if lines is None:\n", " sx1 = (s1_edges[:-1] + s1_edges[1:]) / 2\n", " sx23 = (s23_edges[:-1] + s23_edges[1:]) / 2\n", diff --git a/docs/comparison/jpsi2pipipi.ipynb b/docs/comparison/jpsi2pipipi.ipynb index b8d133d6..92acc26d 100644 --- a/docs/comparison/jpsi2pipipi.ipynb +++ b/docs/comparison/jpsi2pipipi.ipynb @@ -633,7 +633,7 @@ "source": [ "def create_sliders() -> dict[str, ToggleButtons]:\n", " all_parameters = dict(ampform_model.parameter_defaults.items())\n", - " all_parameters.update(dict(dpd_model.parameter_defaults.items()))\n", + " all_parameters.update(dpd_model.parameter_defaults)\n", " sliders = {}\n", " for symbol, value in all_parameters.items():\n", " value = \"+1\"\n", @@ -882,8 +882,8 @@ " )\n", "\n", " global lines\n", - " amp_kwargs = {\"color\": \"r\", \"label\": \"ampform\", \"linestyle\": \"solid\"}\n", - " dpd_kwargs = {\"color\": \"blue\", \"label\": \"dpd\", \"linestyle\": \"dotted\"}\n", + " amp_kwargs = dict(color=\"r\", label=\"ampform\", linestyle=\"solid\")\n", + " dpd_kwargs = dict(color=\"blue\", label=\"dpd\", linestyle=\"dotted\")\n", " if lines is None:\n", " sx = (s_edges[:-1] + s_edges[1:]) / 2\n", " tx = (t_edges[:-1] + t_edges[1:]) / 2\n", diff --git a/docs/conf.py b/docs/conf.py index a533ac6b..05ec2219 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -43,7 +43,6 @@ def get_logo_path() -> str | None: url="https://raw.githubusercontent.com/ComPWA/ComPWA/04e5199/doc/images/logo.svg", output_path=path, ) - if os.path.exists(path): return path return None diff --git a/pyproject.toml b/pyproject.toml index 1ef9a3ff..5fd81195 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -130,6 +130,7 @@ extend-select = [ ] ignore = [ "B028", # missing explicit stacklevel keyword + "C408", "D101", "D102", "D103", diff --git a/src/ampform_dpd/io.py b/src/ampform_dpd/io.py index f0b38678..13593299 100644 --- a/src/ampform_dpd/io.py +++ b/src/ampform_dpd/io.py @@ -213,8 +213,7 @@ def _create_markdown_table_header(column_names: list[str]): def _create_markdown_table_row(items: Iterable): - items = (f"{i}" for i in items) - return "| " + " | ".join(items) + " |\n" + return "| " + " | ".join(f"{i}" for i in items) + " |\n" def perform_cached_doit( diff --git a/tests/test_decay.py b/tests/test_decay.py index 455bb0f0..68377963 100644 --- a/tests/test_decay.py +++ b/tests/test_decay.py @@ -1,7 +1,7 @@ from ampform_dpd.decay import IsobarNode, Particle # https://compwa-org--129.org.readthedocs.build/report/018.html#resonances-and-ls-scheme -dummy_args = {"mass": 0, "width": 0} +dummy_args = dict(mass=0, width=0) Λc = Particle("Λc", latex=R"\Lambda_c^+", spin=0.5, parity=+1, **dummy_args) p = Particle("p", latex="p", spin=0.5, parity=+1, **dummy_args) π = Particle("π+", latex=R"\pi^+", spin=0, parity=-1, **dummy_args) diff --git a/tests/test_io.py b/tests/test_io.py index ba832de7..f11760ae 100644 --- a/tests/test_io.py +++ b/tests/test_io.py @@ -53,9 +53,9 @@ def test_aslatex_isobar_node(): @pytest.mark.parametrize( ("assumptions", "expected_hash"), [ - ({}, "pythonhashseed-0+7459658071388516764"), - ({"real": True}, "pythonhashseed-0+3665410414623666716"), - ({"rational": True}, "pythonhashseed-0-7926839224244779605"), + (dict(), "pythonhashseed-0+7459658071388516764"), + (dict(real=True), "pythonhashseed-0+3665410414623666716"), + (dict(rational=True), "pythonhashseed-0-7926839224244779605"), ], ) def test_get_readable_hash(assumptions, expected_hash, caplog: LogCaptureFixture):