From b2e2cd95215b4a89e87bbfc678d4489aacf923fa Mon Sep 17 00:00:00 2001 From: GitHub Date: Wed, 27 Sep 2023 13:25:03 +0000 Subject: [PATCH 01/27] MAINT: update pip constraints and pre-commit --- .constraints/py3.10.txt | 30 +++++++++++++++--------------- .constraints/py3.11.txt | 30 +++++++++++++++--------------- .constraints/py3.7.txt | 8 ++++---- .constraints/py3.8.txt | 16 ++++++++-------- .constraints/py3.9.txt | 30 +++++++++++++++--------------- .pre-commit-config.yaml | 4 ++-- 6 files changed, 59 insertions(+), 59 deletions(-) diff --git a/.constraints/py3.10.txt b/.constraints/py3.10.txt index 9521bc9d..e74aa90a 100644 --- a/.constraints/py3.10.txt +++ b/.constraints/py3.10.txt @@ -52,8 +52,8 @@ filelock==3.12.4 flatbuffers==23.5.26 fonttools==4.42.1 fqdn==1.5.1 -gast==0.4.0 -google-auth==2.23.0 +gast==0.5.4 +google-auth==2.23.1 google-auth-oauthlib==1.0.0 google-pasta==0.2.0 graphviz==0.20.1 @@ -83,7 +83,7 @@ jsonschema==4.19.1 jsonschema-specifications==2023.7.1 jupyter-cache==0.6.1 jupyter-client==7.4.9 -jupyter-core==5.3.1 +jupyter-core==5.3.2 jupyter-events==0.7.0 jupyter-lsp==2.2.0 jupyter-server==2.7.3 @@ -91,14 +91,14 @@ jupyter-server-fileid==0.9.0 jupyter-server-terminals==0.4.4 jupyter-server-ydoc==0.8.0 jupyter-ydoc==0.2.5 -jupyterlab==3.6.5 +jupyterlab==3.6.6 jupyterlab-code-formatter==2.2.1 jupyterlab-lsp==4.3.0 jupyterlab-myst==2.0.2 jupyterlab-pygments==0.2.2 jupyterlab-server==2.25.0 jupyterlab-widgets==3.0.9 -keras==2.13.1 +keras==2.14.0 kiwisolver==1.4.5 latexcodec==2.0.1 libclang==16.0.6 @@ -111,7 +111,7 @@ matplotlib-inline==0.1.6 mdit-py-plugins==0.3.5 mdurl==0.1.2 mistune==3.0.1 -ml-dtypes==0.3.0 +ml-dtypes==0.2.0 mpmath==1.3.0 mypy-extensions==1.0.0 myst-nb==0.17.2 @@ -125,7 +125,7 @@ nest-asyncio==1.5.8 nodeenv==1.8.0 notebook==6.5.6 notebook-shim==0.2.3 -numpy==1.24.3 +numpy==1.26.0 oauthlib==3.2.2 opt-einsum==3.3.0 overrides==7.4.0 @@ -162,7 +162,7 @@ pytest-xdist==3.3.1 python-constraint==1.4.0 python-dateutil==2.8.2 python-json-logger==2.0.7 -python-lsp-jsonrpc==1.1.1 +python-lsp-jsonrpc==1.1.2 python-lsp-server==1.8.0 pytoolconfig==1.2.5 pyyaml==6.0.1 @@ -176,7 +176,7 @@ rfc3986-validator==0.1.1 rope==1.9.0 rpds-py==0.10.3 rsa==4.9 -ruff==0.0.290 +ruff==0.0.291 scipy==1.11.2 send2trash==1.8.2 six==1.16.0 @@ -201,10 +201,10 @@ sqlalchemy==2.0.21 stack-data==0.6.2 sympy==1.12 tabulate==0.9.0 -tensorboard==2.13.0 +tensorboard==2.14.0 tensorboard-data-server==0.7.1 -tensorflow==2.13.0 -tensorflow-estimator==2.13.0 +tensorflow==2.14.0 +tensorflow-estimator==2.14.0 tensorflow-io-gcs-filesystem==0.34.0 tensorflow-probability==0.21.0 tensorwaves==0.4.10 @@ -215,11 +215,11 @@ tomli==2.0.1 tornado==6.3.3 tox==4.11.3 tqdm==4.66.1 -traitlets==5.10.0 +traitlets==5.10.1 typing-extensions==4.5.0 ujson==5.8.0 uri-template==1.3.0 -urllib3==1.26.16 +urllib3==2.0.5 virtualenv==20.24.5 wcwidth==0.2.6 webcolors==1.13 @@ -228,7 +228,7 @@ websocket-client==1.6.3 werkzeug==2.3.7 wheel==0.41.2 widgetsnbextension==4.0.9 -wrapt==1.15.0 +wrapt==1.14.1 y-py==0.6.0 ypy-websocket==0.8.4 zipp==3.17.0 diff --git a/.constraints/py3.11.txt b/.constraints/py3.11.txt index 550e872f..8cae2f3c 100644 --- a/.constraints/py3.11.txt +++ b/.constraints/py3.11.txt @@ -51,8 +51,8 @@ filelock==3.12.4 flatbuffers==23.5.26 fonttools==4.42.1 fqdn==1.5.1 -gast==0.4.0 -google-auth==2.23.0 +gast==0.5.4 +google-auth==2.23.1 google-auth-oauthlib==1.0.0 google-pasta==0.2.0 graphviz==0.20.1 @@ -82,7 +82,7 @@ jsonschema==4.19.1 jsonschema-specifications==2023.7.1 jupyter-cache==0.6.1 jupyter-client==7.4.9 -jupyter-core==5.3.1 +jupyter-core==5.3.2 jupyter-events==0.7.0 jupyter-lsp==2.2.0 jupyter-server==2.7.3 @@ -90,14 +90,14 @@ jupyter-server-fileid==0.9.0 jupyter-server-terminals==0.4.4 jupyter-server-ydoc==0.8.0 jupyter-ydoc==0.2.5 -jupyterlab==3.6.5 +jupyterlab==3.6.6 jupyterlab-code-formatter==2.2.1 jupyterlab-lsp==4.3.0 jupyterlab-myst==2.0.2 jupyterlab-pygments==0.2.2 jupyterlab-server==2.25.0 jupyterlab-widgets==3.0.9 -keras==2.13.1 +keras==2.14.0 kiwisolver==1.4.5 latexcodec==2.0.1 libclang==16.0.6 @@ -110,7 +110,7 @@ matplotlib-inline==0.1.6 mdit-py-plugins==0.3.5 mdurl==0.1.2 mistune==3.0.1 -ml-dtypes==0.3.0 +ml-dtypes==0.2.0 mpmath==1.3.0 mypy-extensions==1.0.0 myst-nb==0.17.2 @@ -124,7 +124,7 @@ nest-asyncio==1.5.8 nodeenv==1.8.0 notebook==6.5.6 notebook-shim==0.2.3 -numpy==1.24.3 +numpy==1.26.0 oauthlib==3.2.2 opt-einsum==3.3.0 overrides==7.4.0 @@ -161,7 +161,7 @@ pytest-xdist==3.3.1 python-constraint==1.4.0 python-dateutil==2.8.2 python-json-logger==2.0.7 -python-lsp-jsonrpc==1.1.1 +python-lsp-jsonrpc==1.1.2 python-lsp-server==1.8.0 pytoolconfig==1.2.5 pyyaml==6.0.1 @@ -175,7 +175,7 @@ rfc3986-validator==0.1.1 rope==1.9.0 rpds-py==0.10.3 rsa==4.9 -ruff==0.0.290 +ruff==0.0.291 scipy==1.11.2 send2trash==1.8.2 six==1.16.0 @@ -200,10 +200,10 @@ sqlalchemy==2.0.21 stack-data==0.6.2 sympy==1.12 tabulate==0.9.0 -tensorboard==2.13.0 +tensorboard==2.14.0 tensorboard-data-server==0.7.1 -tensorflow==2.13.0 -tensorflow-estimator==2.13.0 +tensorflow==2.14.0 +tensorflow-estimator==2.14.0 tensorflow-io-gcs-filesystem==0.34.0 tensorflow-probability==0.21.0 tensorwaves==0.4.10 @@ -213,11 +213,11 @@ tinycss2==1.2.1 tornado==6.3.3 tox==4.11.3 tqdm==4.66.1 -traitlets==5.10.0 +traitlets==5.10.1 typing-extensions==4.5.0 ujson==5.8.0 uri-template==1.3.0 -urllib3==1.26.16 +urllib3==2.0.5 virtualenv==20.24.5 wcwidth==0.2.6 webcolors==1.13 @@ -226,7 +226,7 @@ websocket-client==1.6.3 werkzeug==2.3.7 wheel==0.41.2 widgetsnbextension==4.0.9 -wrapt==1.15.0 +wrapt==1.14.1 y-py==0.6.0 ypy-websocket==0.8.4 zipp==3.17.0 diff --git a/.constraints/py3.7.txt b/.constraints/py3.7.txt index 421f7548..df689c07 100644 --- a/.constraints/py3.7.txt +++ b/.constraints/py3.7.txt @@ -51,7 +51,7 @@ flatbuffers==23.5.26 fonttools==4.38.0 fqdn==1.5.1 gast==0.4.0 -google-auth==2.23.0 +google-auth==2.23.1 google-auth-oauthlib==0.4.6 google-pasta==0.2.0 graphviz==0.20.1 @@ -88,7 +88,7 @@ jupyter-server==1.24.0 jupyter-server-fileid==0.9.0 jupyter-server-ydoc==0.8.0 jupyter-ydoc==0.2.4 -jupyterlab==3.6.5 +jupyterlab==3.6.6 jupyterlab-code-formatter==2.2.1 jupyterlab-lsp==3.10.2 jupyterlab-myst==1.2.0 @@ -172,7 +172,7 @@ rfc3339-validator==0.1.4 rfc3986-validator==0.1.1 rope==1.9.0 rsa==4.9 -ruff==0.0.290 +ruff==0.0.291 scipy==1.7.3 send2trash==1.8.2 singledispatchmethod==1.0 @@ -217,7 +217,7 @@ typed-ast==1.5.5 typing-extensions==4.7.1 ; python_version < "3.8.0" ujson==5.7.0 uri-template==1.3.0 -urllib3==1.26.16 +urllib3==2.0.5 virtualenv==20.24.5 wcwidth==0.2.6 webcolors==1.13 diff --git a/.constraints/py3.8.txt b/.constraints/py3.8.txt index 7657312e..6ca97d81 100644 --- a/.constraints/py3.8.txt +++ b/.constraints/py3.8.txt @@ -53,7 +53,7 @@ flatbuffers==23.5.26 fonttools==4.42.1 fqdn==1.5.1 gast==0.4.0 -google-auth==2.23.0 +google-auth==2.23.1 google-auth-oauthlib==1.0.0 google-pasta==0.2.0 graphviz==0.20.1 @@ -84,7 +84,7 @@ jsonschema==4.19.1 jsonschema-specifications==2023.7.1 jupyter-cache==0.6.1 jupyter-client==7.4.9 -jupyter-core==5.3.1 +jupyter-core==5.3.2 jupyter-events==0.7.0 jupyter-lsp==2.2.0 jupyter-server==2.7.3 @@ -92,7 +92,7 @@ jupyter-server-fileid==0.9.0 jupyter-server-terminals==0.4.4 jupyter-server-ydoc==0.8.0 jupyter-ydoc==0.2.5 -jupyterlab==3.6.5 +jupyterlab==3.6.6 jupyterlab-code-formatter==2.2.1 jupyterlab-lsp==4.3.0 jupyterlab-myst==2.0.2 @@ -164,7 +164,7 @@ pytest-xdist==3.3.1 python-constraint==1.4.0 python-dateutil==2.8.2 python-json-logger==2.0.7 -python-lsp-jsonrpc==1.1.1 +python-lsp-jsonrpc==1.1.2 python-lsp-server==1.8.0 pytoolconfig==1.2.5 pytz==2023.3.post1 @@ -179,7 +179,7 @@ rfc3986-validator==0.1.1 rope==1.9.0 rpds-py==0.10.3 rsa==4.9 -ruff==0.0.290 +ruff==0.0.291 scipy==1.10.1 send2trash==1.8.2 six==1.16.0 @@ -206,7 +206,7 @@ sympy==1.12 tabulate==0.9.0 tensorboard==2.13.0 tensorboard-data-server==0.7.1 -tensorflow==2.13.0 +tensorflow==2.13.1 tensorflow-estimator==2.13.0 tensorflow-io-gcs-filesystem==0.34.0 tensorflow-probability==0.21.0 @@ -218,11 +218,11 @@ tomli==2.0.1 tornado==6.3.3 tox==4.11.3 tqdm==4.66.1 -traitlets==5.10.0 +traitlets==5.10.1 typing-extensions==4.5.0 ujson==5.8.0 uri-template==1.3.0 -urllib3==1.26.16 +urllib3==2.0.5 virtualenv==20.24.5 wcwidth==0.2.6 webcolors==1.13 diff --git a/.constraints/py3.9.txt b/.constraints/py3.9.txt index e4eee840..05d816b7 100644 --- a/.constraints/py3.9.txt +++ b/.constraints/py3.9.txt @@ -52,8 +52,8 @@ filelock==3.12.4 flatbuffers==23.5.26 fonttools==4.42.1 fqdn==1.5.1 -gast==0.4.0 -google-auth==2.23.0 +gast==0.5.4 +google-auth==2.23.1 google-auth-oauthlib==1.0.0 google-pasta==0.2.0 graphviz==0.20.1 @@ -84,7 +84,7 @@ jsonschema==4.19.1 jsonschema-specifications==2023.7.1 jupyter-cache==0.6.1 jupyter-client==7.4.9 -jupyter-core==5.3.1 +jupyter-core==5.3.2 jupyter-events==0.7.0 jupyter-lsp==2.2.0 jupyter-server==2.7.3 @@ -92,14 +92,14 @@ jupyter-server-fileid==0.9.0 jupyter-server-terminals==0.4.4 jupyter-server-ydoc==0.8.0 jupyter-ydoc==0.2.5 -jupyterlab==3.6.5 +jupyterlab==3.6.6 jupyterlab-code-formatter==2.2.1 jupyterlab-lsp==4.3.0 jupyterlab-myst==2.0.2 jupyterlab-pygments==0.2.2 jupyterlab-server==2.25.0 jupyterlab-widgets==3.0.9 -keras==2.13.1 +keras==2.14.0 kiwisolver==1.4.5 latexcodec==2.0.1 libclang==16.0.6 @@ -112,7 +112,7 @@ matplotlib-inline==0.1.6 mdit-py-plugins==0.3.5 mdurl==0.1.2 mistune==3.0.1 -ml-dtypes==0.3.0 +ml-dtypes==0.2.0 mpmath==1.3.0 mypy-extensions==1.0.0 myst-nb==0.17.2 @@ -126,7 +126,7 @@ nest-asyncio==1.5.8 nodeenv==1.8.0 notebook==6.5.6 notebook-shim==0.2.3 -numpy==1.24.3 +numpy==1.26.0 oauthlib==3.2.2 opt-einsum==3.3.0 overrides==7.4.0 @@ -163,7 +163,7 @@ pytest-xdist==3.3.1 python-constraint==1.4.0 python-dateutil==2.8.2 python-json-logger==2.0.7 -python-lsp-jsonrpc==1.1.1 +python-lsp-jsonrpc==1.1.2 python-lsp-server==1.8.0 pytoolconfig==1.2.5 pyyaml==6.0.1 @@ -177,7 +177,7 @@ rfc3986-validator==0.1.1 rope==1.9.0 rpds-py==0.10.3 rsa==4.9 -ruff==0.0.290 +ruff==0.0.291 scipy==1.11.2 send2trash==1.8.2 six==1.16.0 @@ -202,10 +202,10 @@ sqlalchemy==2.0.21 stack-data==0.6.2 sympy==1.12 tabulate==0.9.0 -tensorboard==2.13.0 +tensorboard==2.14.0 tensorboard-data-server==0.7.1 -tensorflow==2.13.0 -tensorflow-estimator==2.13.0 +tensorflow==2.14.0 +tensorflow-estimator==2.14.0 tensorflow-io-gcs-filesystem==0.34.0 tensorflow-probability==0.21.0 tensorwaves==0.4.10 @@ -216,11 +216,11 @@ tomli==2.0.1 tornado==6.3.3 tox==4.11.3 tqdm==4.66.1 -traitlets==5.10.0 +traitlets==5.10.1 typing-extensions==4.5.0 ujson==5.8.0 uri-template==1.3.0 -urllib3==1.26.16 +urllib3==2.0.5 virtualenv==20.24.5 wcwidth==0.2.6 webcolors==1.13 @@ -229,7 +229,7 @@ websocket-client==1.6.3 werkzeug==2.3.7 wheel==0.41.2 widgetsnbextension==4.0.9 -wrapt==1.15.0 +wrapt==1.14.1 y-py==0.6.0 ypy-websocket==0.8.4 zipp==3.17.0 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 1aec3b8d..9adc96c1 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -107,14 +107,14 @@ repos: - id: pyright - repo: https://github.com/asottile/pyupgrade - rev: v3.11.2 + rev: v3.13.0 hooks: - id: pyupgrade args: - --py37-plus - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.0.290 + rev: v0.0.291 hooks: - id: ruff args: From fd536d2edd5d0e1dcff42a837e61fe88fa4569ba Mon Sep 17 00:00:00 2001 From: GitHub Date: Wed, 27 Sep 2023 13:53:34 +0000 Subject: [PATCH 02/27] MAINT: update pip constraints and pre-commit --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 9adc96c1..66817ae7 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -27,7 +27,7 @@ repos: - id: trailing-whitespace - repo: https://github.com/ComPWA/repo-maintenance - rev: 0.0.197 + rev: 0.0.198 hooks: - id: check-dev-files args: From 58cf80894b6525781507a6e7e5e8b721d65aa42b Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Wed, 27 Sep 2023 13:54:51 +0000 Subject: [PATCH 03/27] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- .pre-commit-config.yaml | 9 ++++++--- .vscode/extensions.json | 1 + docs/comparison/d2kkk.ipynb | 14 ++++---------- docs/comparison/jpsi2phipipi.ipynb | 14 ++++---------- docs/comparison/jpsi2pipipi.ipynb | 14 ++++---------- docs/jpsi2ksp.ipynb | 8 ++------ pyproject.toml | 1 - 7 files changed, 21 insertions(+), 40 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 66817ae7..7eb1db45 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -41,9 +41,6 @@ repos: - repo: https://github.com/nbQA-dev/nbQA rev: 1.7.0 hooks: - - id: nbqa-black - additional_dependencies: - - black>=22.1.0 - id: nbqa-pyupgrade args: - --py37-plus @@ -55,6 +52,11 @@ repos: rev: 23.9.1 hooks: - id: black + - id: black-jupyter + args: + - --line-length=85 + types_or: + - jupyter - repo: https://github.com/streetsidesoftware/cspell-cli rev: v7.3.0 @@ -82,6 +84,7 @@ repos: cell.attachments cell.metadata.code_folding cell.metadata.id + cell.metadata.pycharm cell.metadata.user_expressions metadata.celltoolbar metadata.colab.name diff --git a/.vscode/extensions.json b/.vscode/extensions.json index 3274def2..5a53fe2e 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -23,6 +23,7 @@ ], "unwantedRecommendations": [ "bungcip.better-toml", + "davidanson.vscode-markdownlint", "ms-python.flake8", "ms-python.isort", "ms-python.mypy-type-checker", diff --git a/docs/comparison/d2kkk.ipynb b/docs/comparison/d2kkk.ipynb index dcec4204..ca593d51 100644 --- a/docs/comparison/d2kkk.ipynb +++ b/docs/comparison/d2kkk.ipynb @@ -514,9 +514,7 @@ }, "outputs": [], "source": [ - "def generate_phase_space(\n", - " reaction: ReactionInfo, size: int\n", - ") -> dict[str, jnp.ndarray]:\n", + "def generate_phase_space(reaction: ReactionInfo, size: int) -> dict[str, jnp.ndarray]:\n", " rng = TFUniformRealNumberGenerator(seed=0)\n", " phsp_generator = TFPhaseSpaceGenerator(\n", " initial_state_mass=reaction.initial_state[-1].mass,\n", @@ -551,8 +549,7 @@ "def unfold_intensity(model: HelicityModel) -> sp.Expr:\n", " unfolded_intensity = perform_cached_doit(model.intensity)\n", " unfolded_amplitudes = {\n", - " symbol: perform_cached_doit(expr)\n", - " for symbol, expr in model.amplitudes.items()\n", + " symbol: perform_cached_doit(expr) for symbol, expr in model.amplitudes.items()\n", " }\n", " return unfolded_intensity.xreplace(unfolded_amplitudes)\n", "\n", @@ -655,8 +652,7 @@ " for symbol, value in all_parameters.items():\n", " value = \"+1\"\n", " if (\n", - " symbol.name.startswith(R\"\\mathcal{H}^\\mathrm{decay}\")\n", - " and \"+\" in symbol.name\n", + " symbol.name.startswith(R\"\\mathcal{H}^\\mathrm{decay}\") and \"+\" in symbol.name\n", " ) and any(s in symbol.name for s in [\"{1}\", \"*\", \"rho\"]):\n", " value = \"-1\"\n", " sliders[symbol.name] = ToggleButtons(\n", @@ -830,9 +826,7 @@ " ampform_intensities = compute_sub_intensities(\n", " ampform_func, ampform_phsp, selected_resonances\n", " )\n", - " dpd_intensities = compute_sub_intensities(\n", - " dpd_func, dpd_phsp, selected_resonances\n", - " )\n", + " dpd_intensities = compute_sub_intensities(dpd_func, dpd_phsp, selected_resonances)\n", "\n", " s_edges = jnp.linspace(0.98, 1.38, num=50)\n", " amp_values_s1, _ = jnp.histogram(\n", diff --git a/docs/comparison/jpsi2phipipi.ipynb b/docs/comparison/jpsi2phipipi.ipynb index 869f28a4..e6d2a564 100644 --- a/docs/comparison/jpsi2phipipi.ipynb +++ b/docs/comparison/jpsi2phipipi.ipynb @@ -497,9 +497,7 @@ }, "outputs": [], "source": [ - "def generate_phase_space(\n", - " reaction: ReactionInfo, size: int\n", - ") -> dict[str, jnp.ndarray]:\n", + "def generate_phase_space(reaction: ReactionInfo, size: int) -> dict[str, jnp.ndarray]:\n", " rng = TFUniformRealNumberGenerator(seed=0)\n", " phsp_generator = TFPhaseSpaceGenerator(\n", " initial_state_mass=reaction.initial_state[-1].mass,\n", @@ -534,8 +532,7 @@ "def unfold_intensity(model: HelicityModel) -> sp.Expr:\n", " unfolded_intensity = perform_cached_doit(model.intensity)\n", " unfolded_amplitudes = {\n", - " symbol: perform_cached_doit(expr)\n", - " for symbol, expr in model.amplitudes.items()\n", + " symbol: perform_cached_doit(expr) for symbol, expr in model.amplitudes.items()\n", " }\n", " return unfolded_intensity.xreplace(unfolded_amplitudes)\n", "\n", @@ -638,8 +635,7 @@ " for symbol, value in all_parameters.items():\n", " value = \"+1\"\n", " if (\n", - " symbol.name.startswith(R\"\\mathcal{H}^\\mathrm{decay}\")\n", - " and \"+\" in symbol.name\n", + " symbol.name.startswith(R\"\\mathcal{H}^\\mathrm{decay}\") and \"+\" in symbol.name\n", " ) and any(s in symbol.name for s in [\"{1}\", \"*\", \"rho\"]):\n", " value = \"-1\"\n", " sliders[symbol.name] = ToggleButtons(\n", @@ -813,9 +809,7 @@ " ampform_intensities = compute_sub_intensities(\n", " ampform_func, ampform_phsp, selected_resonances\n", " )\n", - " dpd_intensities = compute_sub_intensities(\n", - " dpd_func, dpd_phsp, selected_resonances\n", - " )\n", + " dpd_intensities = compute_sub_intensities(dpd_func, dpd_phsp, selected_resonances)\n", "\n", " s1_edges = jnp.linspace(0.2, 2.1, num=50)\n", " s23_edges = jnp.linspace(1.1, 3.0, num=50)\n", diff --git a/docs/comparison/jpsi2pipipi.ipynb b/docs/comparison/jpsi2pipipi.ipynb index 92acc26d..a33db85e 100644 --- a/docs/comparison/jpsi2pipipi.ipynb +++ b/docs/comparison/jpsi2pipipi.ipynb @@ -497,9 +497,7 @@ }, "outputs": [], "source": [ - "def generate_phase_space(\n", - " reaction: ReactionInfo, size: int\n", - ") -> dict[str, jnp.ndarray]:\n", + "def generate_phase_space(reaction: ReactionInfo, size: int) -> dict[str, jnp.ndarray]:\n", " rng = TFUniformRealNumberGenerator(seed=0)\n", " phsp_generator = TFPhaseSpaceGenerator(\n", " initial_state_mass=reaction.initial_state[-1].mass,\n", @@ -534,8 +532,7 @@ "def unfold_intensity(model: HelicityModel) -> sp.Expr:\n", " unfolded_intensity = perform_cached_doit(model.intensity)\n", " unfolded_amplitudes = {\n", - " symbol: perform_cached_doit(expr)\n", - " for symbol, expr in model.amplitudes.items()\n", + " symbol: perform_cached_doit(expr) for symbol, expr in model.amplitudes.items()\n", " }\n", " return unfolded_intensity.xreplace(unfolded_amplitudes)\n", "\n", @@ -638,8 +635,7 @@ " for symbol, value in all_parameters.items():\n", " value = \"+1\"\n", " if (\n", - " symbol.name.startswith(R\"\\mathcal{H}^\\mathrm{decay}\")\n", - " and \"+\" in symbol.name\n", + " symbol.name.startswith(R\"\\mathcal{H}^\\mathrm{decay}\") and \"+\" in symbol.name\n", " ) and any(s in symbol.name for s in [\"{1}\", \"*\", \"rho\"]):\n", " value = \"-1\"\n", " sliders[symbol.name] = ToggleButtons(\n", @@ -813,9 +809,7 @@ " ampform_intensities = compute_sub_intensities(\n", " ampform_func, ampform_phsp, selected_resonances\n", " )\n", - " dpd_intensities = compute_sub_intensities(\n", - " dpd_func, dpd_phsp, selected_resonances\n", - " )\n", + " dpd_intensities = compute_sub_intensities(dpd_func, dpd_phsp, selected_resonances)\n", "\n", " s_edges = jnp.linspace(0.2, 3.0, num=50)\n", " amp_values_s1, _ = jnp.histogram(\n", diff --git a/docs/jpsi2ksp.ipynb b/docs/jpsi2ksp.ipynb index 705223fd..88e441fa 100644 --- a/docs/jpsi2ksp.ipynb +++ b/docs/jpsi2ksp.ipynb @@ -190,9 +190,7 @@ " child1, child2, spectator = Σ, pbar, K\n", " else:\n", " raise NotImplementedError\n", - " prod_ls_couplings = _generate_ls(\n", - " Jpsi, resonance, spectator, conserve_parity=False\n", - " )\n", + " prod_ls_couplings = _generate_ls(Jpsi, resonance, spectator, conserve_parity=False)\n", " dec_ls_couplings = _generate_ls(resonance, child1, child2, conserve_parity=True)\n", " if min_ls:\n", " decay = IsobarNode(\n", @@ -380,9 +378,7 @@ " decay_chain: ThreeBodyDecayChain,\n", ") -> tuple[sp.Expr, dict[sp.Symbol, float]]:\n", " production_node = decay_chain.decay\n", - " assert isinstance(\n", - " production_node.child1, IsobarNode\n", - " ), \"Not a 3-body isobar decay\"\n", + " assert isinstance(production_node.child1, IsobarNode), \"Not a 3-body isobar decay\"\n", " decay_node = production_node.child1\n", "\n", " s = _get_mandelstam_s(decay_chain)\n", diff --git a/pyproject.toml b/pyproject.toml index 5fd81195..8f30ef32 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -33,7 +33,6 @@ target-version = [ ] [tool.nbqa.addopts] -black = ["--line-length=85"] ruff = [ "--extend-ignore=B018", "--extend-ignore=C90", From c4ced383a963815408e1ed7279d80422dee56944 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Wed, 27 Sep 2023 20:20:21 +0000 Subject: [PATCH 04/27] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- docs/comparison/d2kkk.ipynb | 14 ++++++++++---- docs/comparison/jpsi2phipipi.ipynb | 14 ++++++++++---- docs/comparison/jpsi2pipipi.ipynb | 14 ++++++++++---- docs/jpsi2ksp.ipynb | 8 ++++++-- 4 files changed, 36 insertions(+), 14 deletions(-) diff --git a/docs/comparison/d2kkk.ipynb b/docs/comparison/d2kkk.ipynb index ca593d51..dcec4204 100644 --- a/docs/comparison/d2kkk.ipynb +++ b/docs/comparison/d2kkk.ipynb @@ -514,7 +514,9 @@ }, "outputs": [], "source": [ - "def generate_phase_space(reaction: ReactionInfo, size: int) -> dict[str, jnp.ndarray]:\n", + "def generate_phase_space(\n", + " reaction: ReactionInfo, size: int\n", + ") -> dict[str, jnp.ndarray]:\n", " rng = TFUniformRealNumberGenerator(seed=0)\n", " phsp_generator = TFPhaseSpaceGenerator(\n", " initial_state_mass=reaction.initial_state[-1].mass,\n", @@ -549,7 +551,8 @@ "def unfold_intensity(model: HelicityModel) -> sp.Expr:\n", " unfolded_intensity = perform_cached_doit(model.intensity)\n", " unfolded_amplitudes = {\n", - " symbol: perform_cached_doit(expr) for symbol, expr in model.amplitudes.items()\n", + " symbol: perform_cached_doit(expr)\n", + " for symbol, expr in model.amplitudes.items()\n", " }\n", " return unfolded_intensity.xreplace(unfolded_amplitudes)\n", "\n", @@ -652,7 +655,8 @@ " for symbol, value in all_parameters.items():\n", " value = \"+1\"\n", " if (\n", - " symbol.name.startswith(R\"\\mathcal{H}^\\mathrm{decay}\") and \"+\" in symbol.name\n", + " symbol.name.startswith(R\"\\mathcal{H}^\\mathrm{decay}\")\n", + " and \"+\" in symbol.name\n", " ) and any(s in symbol.name for s in [\"{1}\", \"*\", \"rho\"]):\n", " value = \"-1\"\n", " sliders[symbol.name] = ToggleButtons(\n", @@ -826,7 +830,9 @@ " ampform_intensities = compute_sub_intensities(\n", " ampform_func, ampform_phsp, selected_resonances\n", " )\n", - " dpd_intensities = compute_sub_intensities(dpd_func, dpd_phsp, selected_resonances)\n", + " dpd_intensities = compute_sub_intensities(\n", + " dpd_func, dpd_phsp, selected_resonances\n", + " )\n", "\n", " s_edges = jnp.linspace(0.98, 1.38, num=50)\n", " amp_values_s1, _ = jnp.histogram(\n", diff --git a/docs/comparison/jpsi2phipipi.ipynb b/docs/comparison/jpsi2phipipi.ipynb index e6d2a564..869f28a4 100644 --- a/docs/comparison/jpsi2phipipi.ipynb +++ b/docs/comparison/jpsi2phipipi.ipynb @@ -497,7 +497,9 @@ }, "outputs": [], "source": [ - "def generate_phase_space(reaction: ReactionInfo, size: int) -> dict[str, jnp.ndarray]:\n", + "def generate_phase_space(\n", + " reaction: ReactionInfo, size: int\n", + ") -> dict[str, jnp.ndarray]:\n", " rng = TFUniformRealNumberGenerator(seed=0)\n", " phsp_generator = TFPhaseSpaceGenerator(\n", " initial_state_mass=reaction.initial_state[-1].mass,\n", @@ -532,7 +534,8 @@ "def unfold_intensity(model: HelicityModel) -> sp.Expr:\n", " unfolded_intensity = perform_cached_doit(model.intensity)\n", " unfolded_amplitudes = {\n", - " symbol: perform_cached_doit(expr) for symbol, expr in model.amplitudes.items()\n", + " symbol: perform_cached_doit(expr)\n", + " for symbol, expr in model.amplitudes.items()\n", " }\n", " return unfolded_intensity.xreplace(unfolded_amplitudes)\n", "\n", @@ -635,7 +638,8 @@ " for symbol, value in all_parameters.items():\n", " value = \"+1\"\n", " if (\n", - " symbol.name.startswith(R\"\\mathcal{H}^\\mathrm{decay}\") and \"+\" in symbol.name\n", + " symbol.name.startswith(R\"\\mathcal{H}^\\mathrm{decay}\")\n", + " and \"+\" in symbol.name\n", " ) and any(s in symbol.name for s in [\"{1}\", \"*\", \"rho\"]):\n", " value = \"-1\"\n", " sliders[symbol.name] = ToggleButtons(\n", @@ -809,7 +813,9 @@ " ampform_intensities = compute_sub_intensities(\n", " ampform_func, ampform_phsp, selected_resonances\n", " )\n", - " dpd_intensities = compute_sub_intensities(dpd_func, dpd_phsp, selected_resonances)\n", + " dpd_intensities = compute_sub_intensities(\n", + " dpd_func, dpd_phsp, selected_resonances\n", + " )\n", "\n", " s1_edges = jnp.linspace(0.2, 2.1, num=50)\n", " s23_edges = jnp.linspace(1.1, 3.0, num=50)\n", diff --git a/docs/comparison/jpsi2pipipi.ipynb b/docs/comparison/jpsi2pipipi.ipynb index a33db85e..92acc26d 100644 --- a/docs/comparison/jpsi2pipipi.ipynb +++ b/docs/comparison/jpsi2pipipi.ipynb @@ -497,7 +497,9 @@ }, "outputs": [], "source": [ - "def generate_phase_space(reaction: ReactionInfo, size: int) -> dict[str, jnp.ndarray]:\n", + "def generate_phase_space(\n", + " reaction: ReactionInfo, size: int\n", + ") -> dict[str, jnp.ndarray]:\n", " rng = TFUniformRealNumberGenerator(seed=0)\n", " phsp_generator = TFPhaseSpaceGenerator(\n", " initial_state_mass=reaction.initial_state[-1].mass,\n", @@ -532,7 +534,8 @@ "def unfold_intensity(model: HelicityModel) -> sp.Expr:\n", " unfolded_intensity = perform_cached_doit(model.intensity)\n", " unfolded_amplitudes = {\n", - " symbol: perform_cached_doit(expr) for symbol, expr in model.amplitudes.items()\n", + " symbol: perform_cached_doit(expr)\n", + " for symbol, expr in model.amplitudes.items()\n", " }\n", " return unfolded_intensity.xreplace(unfolded_amplitudes)\n", "\n", @@ -635,7 +638,8 @@ " for symbol, value in all_parameters.items():\n", " value = \"+1\"\n", " if (\n", - " symbol.name.startswith(R\"\\mathcal{H}^\\mathrm{decay}\") and \"+\" in symbol.name\n", + " symbol.name.startswith(R\"\\mathcal{H}^\\mathrm{decay}\")\n", + " and \"+\" in symbol.name\n", " ) and any(s in symbol.name for s in [\"{1}\", \"*\", \"rho\"]):\n", " value = \"-1\"\n", " sliders[symbol.name] = ToggleButtons(\n", @@ -809,7 +813,9 @@ " ampform_intensities = compute_sub_intensities(\n", " ampform_func, ampform_phsp, selected_resonances\n", " )\n", - " dpd_intensities = compute_sub_intensities(dpd_func, dpd_phsp, selected_resonances)\n", + " dpd_intensities = compute_sub_intensities(\n", + " dpd_func, dpd_phsp, selected_resonances\n", + " )\n", "\n", " s_edges = jnp.linspace(0.2, 3.0, num=50)\n", " amp_values_s1, _ = jnp.histogram(\n", diff --git a/docs/jpsi2ksp.ipynb b/docs/jpsi2ksp.ipynb index 88e441fa..705223fd 100644 --- a/docs/jpsi2ksp.ipynb +++ b/docs/jpsi2ksp.ipynb @@ -190,7 +190,9 @@ " child1, child2, spectator = Σ, pbar, K\n", " else:\n", " raise NotImplementedError\n", - " prod_ls_couplings = _generate_ls(Jpsi, resonance, spectator, conserve_parity=False)\n", + " prod_ls_couplings = _generate_ls(\n", + " Jpsi, resonance, spectator, conserve_parity=False\n", + " )\n", " dec_ls_couplings = _generate_ls(resonance, child1, child2, conserve_parity=True)\n", " if min_ls:\n", " decay = IsobarNode(\n", @@ -378,7 +380,9 @@ " decay_chain: ThreeBodyDecayChain,\n", ") -> tuple[sp.Expr, dict[sp.Symbol, float]]:\n", " production_node = decay_chain.decay\n", - " assert isinstance(production_node.child1, IsobarNode), \"Not a 3-body isobar decay\"\n", + " assert isinstance(\n", + " production_node.child1, IsobarNode\n", + " ), \"Not a 3-body isobar decay\"\n", " decay_node = production_node.child1\n", "\n", " s = _get_mandelstam_s(decay_chain)\n", From 66abd3b3495487f1cc02afd3918cb423d6c8936b Mon Sep 17 00:00:00 2001 From: GitHub Date: Wed, 27 Sep 2023 20:24:06 +0000 Subject: [PATCH 05/27] MAINT: update pip constraints and pre-commit --- .constraints/py3.7.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.constraints/py3.7.txt b/.constraints/py3.7.txt index df689c07..8ec52d60 100644 --- a/.constraints/py3.7.txt +++ b/.constraints/py3.7.txt @@ -147,7 +147,7 @@ pyasn1-modules==0.3.0 pybtex==0.24.0 pybtex-docutils==1.0.3 pycparser==2.21 -pydantic==1.10.12 +pydantic==1.10.13 pydata-sphinx-theme==0.13.3 pygments==2.16.1 pyparsing==3.1.1 From 538781109c1b1423aa7e7d079b1ff7696766379e Mon Sep 17 00:00:00 2001 From: Remco de Boer <29308176+redeboer@users.noreply.github.com> Date: Thu, 28 Sep 2023 13:41:18 +0200 Subject: [PATCH 06/27] DOC: make Colab TOC visible by default --- .pre-commit-config.yaml | 3 ++- docs/comparison/d2kkk.ipynb | 3 +++ docs/comparison/jpsi2phipipi.ipynb | 3 +++ docs/comparison/jpsi2pipipi.ipynb | 3 +++ docs/jpsi2ksp.ipynb | 3 +++ docs/lc2pkpi.ipynb | 3 +++ 6 files changed, 17 insertions(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 7eb1db45..53a1c520 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -27,7 +27,7 @@ repos: - id: trailing-whitespace - repo: https://github.com/ComPWA/repo-maintenance - rev: 0.0.198 + rev: 0.0.199 hooks: - id: check-dev-files args: @@ -36,6 +36,7 @@ repos: - --pin-requirements=bimonthly - --repo-name=ampform-dpd - --repo-title=AmpForm-DPD + - id: colab-toc-visible - id: format-setup-cfg - repo: https://github.com/nbQA-dev/nbQA diff --git a/docs/comparison/d2kkk.ipynb b/docs/comparison/d2kkk.ipynb index dcec4204..17f05074 100644 --- a/docs/comparison/d2kkk.ipynb +++ b/docs/comparison/d2kkk.ipynb @@ -1019,6 +1019,9 @@ } ], "metadata": { + "colab": { + "toc_visible": true + }, "kernelspec": { "display_name": "Python 3 (ipykernel)", "language": "python", diff --git a/docs/comparison/jpsi2phipipi.ipynb b/docs/comparison/jpsi2phipipi.ipynb index 869f28a4..7da3a48c 100644 --- a/docs/comparison/jpsi2phipipi.ipynb +++ b/docs/comparison/jpsi2phipipi.ipynb @@ -1004,6 +1004,9 @@ } ], "metadata": { + "colab": { + "toc_visible": true + }, "kernelspec": { "display_name": "Python 3 (ipykernel)", "language": "python", diff --git a/docs/comparison/jpsi2pipipi.ipynb b/docs/comparison/jpsi2pipipi.ipynb index 92acc26d..9dc35ebf 100644 --- a/docs/comparison/jpsi2pipipi.ipynb +++ b/docs/comparison/jpsi2pipipi.ipynb @@ -1002,6 +1002,9 @@ } ], "metadata": { + "colab": { + "toc_visible": true + }, "kernelspec": { "display_name": "Python 3 (ipykernel)", "language": "python", diff --git a/docs/jpsi2ksp.ipynb b/docs/jpsi2ksp.ipynb index 705223fd..6a1c27c7 100644 --- a/docs/jpsi2ksp.ipynb +++ b/docs/jpsi2ksp.ipynb @@ -955,6 +955,9 @@ } ], "metadata": { + "colab": { + "toc_visible": true + }, "kernelspec": { "display_name": "Python 3 (ipykernel)", "language": "python", diff --git a/docs/lc2pkpi.ipynb b/docs/lc2pkpi.ipynb index d5147f1e..de41f112 100644 --- a/docs/lc2pkpi.ipynb +++ b/docs/lc2pkpi.ipynb @@ -358,6 +358,9 @@ } ], "metadata": { + "colab": { + "toc_visible": true + }, "kernelspec": { "display_name": "Python 3 (ipykernel)", "language": "python", From 15eeae34f5a5c6eb3dd8a6f1032e60bdb9d24e6f Mon Sep 17 00:00:00 2001 From: GitHub Date: Thu, 28 Sep 2023 11:43:42 +0000 Subject: [PATCH 07/27] MAINT: update pip constraints and pre-commit --- .constraints/py3.10.txt | 6 +++--- .constraints/py3.11.txt | 6 +++--- .constraints/py3.8.txt | 2 +- .constraints/py3.9.txt | 6 +++--- .pre-commit-config.yaml | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.constraints/py3.10.txt b/.constraints/py3.10.txt index e74aa90a..f513ba11 100644 --- a/.constraints/py3.10.txt +++ b/.constraints/py3.10.txt @@ -173,11 +173,11 @@ requests==2.31.0 requests-oauthlib==1.3.1 rfc3339-validator==0.1.4 rfc3986-validator==0.1.1 -rope==1.9.0 +rope==1.10.0 rpds-py==0.10.3 rsa==4.9 ruff==0.0.291 -scipy==1.11.2 +scipy==1.11.3 send2trash==1.8.2 six==1.16.0 sniffio==1.3.0 @@ -201,7 +201,7 @@ sqlalchemy==2.0.21 stack-data==0.6.2 sympy==1.12 tabulate==0.9.0 -tensorboard==2.14.0 +tensorboard==2.14.1 tensorboard-data-server==0.7.1 tensorflow==2.14.0 tensorflow-estimator==2.14.0 diff --git a/.constraints/py3.11.txt b/.constraints/py3.11.txt index 8cae2f3c..62e8d2cb 100644 --- a/.constraints/py3.11.txt +++ b/.constraints/py3.11.txt @@ -172,11 +172,11 @@ requests==2.31.0 requests-oauthlib==1.3.1 rfc3339-validator==0.1.4 rfc3986-validator==0.1.1 -rope==1.9.0 +rope==1.10.0 rpds-py==0.10.3 rsa==4.9 ruff==0.0.291 -scipy==1.11.2 +scipy==1.11.3 send2trash==1.8.2 six==1.16.0 sniffio==1.3.0 @@ -200,7 +200,7 @@ sqlalchemy==2.0.21 stack-data==0.6.2 sympy==1.12 tabulate==0.9.0 -tensorboard==2.14.0 +tensorboard==2.14.1 tensorboard-data-server==0.7.1 tensorflow==2.14.0 tensorflow-estimator==2.14.0 diff --git a/.constraints/py3.8.txt b/.constraints/py3.8.txt index 6ca97d81..fbcdec02 100644 --- a/.constraints/py3.8.txt +++ b/.constraints/py3.8.txt @@ -176,7 +176,7 @@ requests==2.31.0 requests-oauthlib==1.3.1 rfc3339-validator==0.1.4 rfc3986-validator==0.1.1 -rope==1.9.0 +rope==1.10.0 rpds-py==0.10.3 rsa==4.9 ruff==0.0.291 diff --git a/.constraints/py3.9.txt b/.constraints/py3.9.txt index 05d816b7..8baded07 100644 --- a/.constraints/py3.9.txt +++ b/.constraints/py3.9.txt @@ -174,11 +174,11 @@ requests==2.31.0 requests-oauthlib==1.3.1 rfc3339-validator==0.1.4 rfc3986-validator==0.1.1 -rope==1.9.0 +rope==1.10.0 rpds-py==0.10.3 rsa==4.9 ruff==0.0.291 -scipy==1.11.2 +scipy==1.11.3 send2trash==1.8.2 six==1.16.0 sniffio==1.3.0 @@ -202,7 +202,7 @@ sqlalchemy==2.0.21 stack-data==0.6.2 sympy==1.12 tabulate==0.9.0 -tensorboard==2.14.0 +tensorboard==2.14.1 tensorboard-data-server==0.7.1 tensorflow==2.14.0 tensorflow-estimator==2.14.0 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 53a1c520..b60efdc0 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -106,7 +106,7 @@ repos: - id: prettier - repo: https://github.com/ComPWA/mirrors-pyright - rev: v1.1.328 + rev: v1.1.329 hooks: - id: pyright From 132528aef17f01be9a841e5bba4695487fe678c0 Mon Sep 17 00:00:00 2001 From: Remco de Boer <29308176+redeboer@users.noreply.github.com> Date: Thu, 28 Sep 2023 16:55:43 +0200 Subject: [PATCH 08/27] MAINT: put `black-jupyter` arguments on same line --- .pre-commit-config.yaml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index b60efdc0..c283f500 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -54,10 +54,8 @@ repos: hooks: - id: black - id: black-jupyter - args: - - --line-length=85 - types_or: - - jupyter + args: [--line-length=85] + types_or: [jupyter] - repo: https://github.com/streetsidesoftware/cspell-cli rev: v7.3.0 From 99545d9a5307b886a73b7310671ec3bccaf335b7 Mon Sep 17 00:00:00 2001 From: Remco de Boer <29308176+redeboer@users.noreply.github.com> Date: Thu, 28 Sep 2023 22:42:35 +0200 Subject: [PATCH 09/27] DX: remove GitHub Issue templates --- .github/ISSUE_TEMPLATE/bug_report.md | 32 ----------------------- .github/ISSUE_TEMPLATE/feature_request.md | 22 ---------------- .github/pull_request_template.md | 11 -------- .pre-commit-config.yaml | 2 +- 4 files changed, 1 insertion(+), 66 deletions(-) delete mode 100644 .github/ISSUE_TEMPLATE/bug_report.md delete mode 100644 .github/ISSUE_TEMPLATE/feature_request.md delete mode 100644 .github/pull_request_template.md diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md deleted file mode 100644 index d0cc61cd..00000000 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ /dev/null @@ -1,32 +0,0 @@ ---- -name: Bug report -about: Create a report to help us improve -title: "" -labels: Bug -assignees: "" ---- - -## Bug description - - - - - -## How to reproduce? - -Steps to reproduce the behavior: - -1. - -## Expected behavior - - - -## System info - -Bug resulted on the following system: - -- OS: -- Version -- Python version: -- Virtual environment: diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md deleted file mode 100644 index 049eb32b..00000000 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -name: Feature request -about: Suggest an idea for this project -title: "" -labels: "✨ Enhancement" -assignees: "" ---- - -## Problem description - - - -## Proposed solution - - - - - - - diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md deleted file mode 100644 index 14b80852..00000000 --- a/.github/pull_request_template.md +++ /dev/null @@ -1,11 +0,0 @@ - - - - - diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index c283f500..f3a20297 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -27,7 +27,7 @@ repos: - id: trailing-whitespace - repo: https://github.com/ComPWA/repo-maintenance - rev: 0.0.199 + rev: 0.0.200 hooks: - id: check-dev-files args: From 342cc3f782e6e99673c4b22176bee2278edeb894 Mon Sep 17 00:00:00 2001 From: GitHub Date: Thu, 28 Sep 2023 20:45:04 +0000 Subject: [PATCH 10/27] MAINT: update pip constraints and pre-commit --- .constraints/py3.10.txt | 4 ++-- .constraints/py3.11.txt | 4 ++-- .constraints/py3.7.txt | 2 +- .constraints/py3.8.txt | 4 ++-- .constraints/py3.9.txt | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.constraints/py3.10.txt b/.constraints/py3.10.txt index f513ba11..477f1f8f 100644 --- a/.constraints/py3.10.txt +++ b/.constraints/py3.10.txt @@ -24,7 +24,7 @@ black==23.9.1 bleach==6.0.0 cachetools==5.3.1 certifi==2023.7.22 -cffi==1.15.1 +cffi==1.16.0 cfgv==3.4.0 chardet==5.2.0 charset-normalizer==3.2.0 @@ -53,7 +53,7 @@ flatbuffers==23.5.26 fonttools==4.42.1 fqdn==1.5.1 gast==0.5.4 -google-auth==2.23.1 +google-auth==2.23.2 google-auth-oauthlib==1.0.0 google-pasta==0.2.0 graphviz==0.20.1 diff --git a/.constraints/py3.11.txt b/.constraints/py3.11.txt index 62e8d2cb..aea3630b 100644 --- a/.constraints/py3.11.txt +++ b/.constraints/py3.11.txt @@ -24,7 +24,7 @@ black==23.9.1 bleach==6.0.0 cachetools==5.3.1 certifi==2023.7.22 -cffi==1.15.1 +cffi==1.16.0 cfgv==3.4.0 chardet==5.2.0 charset-normalizer==3.2.0 @@ -52,7 +52,7 @@ flatbuffers==23.5.26 fonttools==4.42.1 fqdn==1.5.1 gast==0.5.4 -google-auth==2.23.1 +google-auth==2.23.2 google-auth-oauthlib==1.0.0 google-pasta==0.2.0 graphviz==0.20.1 diff --git a/.constraints/py3.7.txt b/.constraints/py3.7.txt index 8ec52d60..cf5d3924 100644 --- a/.constraints/py3.7.txt +++ b/.constraints/py3.7.txt @@ -51,7 +51,7 @@ flatbuffers==23.5.26 fonttools==4.38.0 fqdn==1.5.1 gast==0.4.0 -google-auth==2.23.1 +google-auth==2.23.2 google-auth-oauthlib==0.4.6 google-pasta==0.2.0 graphviz==0.20.1 diff --git a/.constraints/py3.8.txt b/.constraints/py3.8.txt index fbcdec02..be0f13f1 100644 --- a/.constraints/py3.8.txt +++ b/.constraints/py3.8.txt @@ -24,7 +24,7 @@ black==23.9.1 bleach==6.0.0 cachetools==5.3.1 certifi==2023.7.22 -cffi==1.15.1 +cffi==1.16.0 cfgv==3.4.0 chardet==5.2.0 charset-normalizer==3.2.0 @@ -53,7 +53,7 @@ flatbuffers==23.5.26 fonttools==4.42.1 fqdn==1.5.1 gast==0.4.0 -google-auth==2.23.1 +google-auth==2.23.2 google-auth-oauthlib==1.0.0 google-pasta==0.2.0 graphviz==0.20.1 diff --git a/.constraints/py3.9.txt b/.constraints/py3.9.txt index 8baded07..286c874e 100644 --- a/.constraints/py3.9.txt +++ b/.constraints/py3.9.txt @@ -24,7 +24,7 @@ black==23.9.1 bleach==6.0.0 cachetools==5.3.1 certifi==2023.7.22 -cffi==1.15.1 +cffi==1.16.0 cfgv==3.4.0 chardet==5.2.0 charset-normalizer==3.2.0 @@ -53,7 +53,7 @@ flatbuffers==23.5.26 fonttools==4.42.1 fqdn==1.5.1 gast==0.5.4 -google-auth==2.23.1 +google-auth==2.23.2 google-auth-oauthlib==1.0.0 google-pasta==0.2.0 graphviz==0.20.1 From 8376fca4fc9af03e0f5b83926427f23e7b808a2f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 1 Oct 2023 14:07:18 +0200 Subject: [PATCH 11/27] Build(deps): bump actions/checkout from 3 to 4 (#80) Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/pr-linting.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr-linting.yml b/.github/workflows/pr-linting.yml index b7437b6a..e71c708d 100644 --- a/.github/workflows/pr-linting.yml +++ b/.github/workflows/pr-linting.yml @@ -27,7 +27,7 @@ jobs: name: Check title runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - run: npm install @commitlint/config-conventional # cspell:ignore commitlint kode - uses: JulienKode/pull-request-name-linter-action@v0.5.0 From 2ac44091b0bde9df693f0fded2052ba9afae1189 Mon Sep 17 00:00:00 2001 From: GitHub Date: Sun, 1 Oct 2023 12:09:46 +0000 Subject: [PATCH 12/27] MAINT: update pip constraints and pre-commit --- .constraints/py3.10.txt | 27 ++++++++++++++------------- .constraints/py3.11.txt | 27 ++++++++++++++------------- .constraints/py3.7.txt | 10 +++++----- .constraints/py3.8.txt | 27 ++++++++++++++------------- .constraints/py3.9.txt | 27 ++++++++++++++------------- .pre-commit-config.yaml | 4 ++-- 6 files changed, 63 insertions(+), 59 deletions(-) diff --git a/.constraints/py3.10.txt b/.constraints/py3.10.txt index 477f1f8f..e74bd777 100644 --- a/.constraints/py3.10.txt +++ b/.constraints/py3.10.txt @@ -13,7 +13,7 @@ ampform==0.14.6 anyio==4.0.0 argon2-cffi==23.1.0 argon2-cffi-bindings==21.2.0 -arrow==1.2.3 +arrow==1.3.0 asttokens==2.4.0 astunparse==1.6.3 attrs==23.1.0 @@ -27,14 +27,14 @@ certifi==2023.7.22 cffi==1.16.0 cfgv==3.4.0 chardet==5.2.0 -charset-normalizer==3.2.0 +charset-normalizer==3.3.0 click==8.1.7 cloudpickle==2.2.1 colorama==0.4.6 comm==0.1.4 contourpy==1.1.1 coverage==7.3.1 -cycler==0.11.0 +cycler==0.12.0 debugpy==1.8.0 decorator==5.1.1 defusedxml==0.7.1 @@ -46,11 +46,11 @@ docutils==0.17.1 entrypoints==0.4 exceptiongroup==1.1.3 execnet==2.0.2 -executing==1.2.0 -fastjsonschema==2.18.0 +executing==2.0.0 +fastjsonschema==2.18.1 filelock==3.12.4 flatbuffers==23.5.26 -fonttools==4.42.1 +fonttools==4.43.0 fqdn==1.5.1 gast==0.5.4 google-auth==2.23.2 @@ -58,10 +58,10 @@ google-auth-oauthlib==1.0.0 google-pasta==0.2.0 graphviz==0.20.1 greenlet==2.0.2 -grpcio==1.58.0 +grpcio==1.59.0 h5py==3.9.0 hepunits==2.3.2 -identify==2.5.29 +identify==2.5.30 idna==3.4 imagesize==1.4.1 iminuit==2.24.0 @@ -69,7 +69,7 @@ importlib-metadata==6.8.0 iniconfig==2.0.0 ipykernel==6.25.2 ipympl==0.9.3 -ipython==8.15.0 +ipython==8.16.0 ipython-genutils==0.2.0 ipywidgets==8.1.1 isoduration==20.11.0 @@ -110,7 +110,7 @@ matplotlib==3.8.0 matplotlib-inline==0.1.6 mdit-py-plugins==0.3.5 mdurl==0.1.2 -mistune==3.0.1 +mistune==3.0.2 ml-dtypes==0.2.0 mpmath==1.3.0 mypy-extensions==1.0.0 @@ -198,7 +198,7 @@ sphinxcontrib-jsmath==1.0.1 sphinxcontrib-qthelp==1.0.6 sphinxcontrib-serializinghtml==1.1.9 sqlalchemy==2.0.21 -stack-data==0.6.2 +stack-data==0.6.3 sympy==1.12 tabulate==0.9.0 tensorboard==2.14.1 @@ -216,16 +216,17 @@ tornado==6.3.3 tox==4.11.3 tqdm==4.66.1 traitlets==5.10.1 +types-python-dateutil==2.8.19.14 typing-extensions==4.5.0 ujson==5.8.0 uri-template==1.3.0 urllib3==2.0.5 virtualenv==20.24.5 -wcwidth==0.2.6 +wcwidth==0.2.8 webcolors==1.13 webencodings==0.5.1 websocket-client==1.6.3 -werkzeug==2.3.7 +werkzeug==3.0.0 wheel==0.41.2 widgetsnbextension==4.0.9 wrapt==1.14.1 diff --git a/.constraints/py3.11.txt b/.constraints/py3.11.txt index aea3630b..6ed6c797 100644 --- a/.constraints/py3.11.txt +++ b/.constraints/py3.11.txt @@ -13,7 +13,7 @@ ampform==0.14.6 anyio==4.0.0 argon2-cffi==23.1.0 argon2-cffi-bindings==21.2.0 -arrow==1.2.3 +arrow==1.3.0 asttokens==2.4.0 astunparse==1.6.3 attrs==23.1.0 @@ -27,14 +27,14 @@ certifi==2023.7.22 cffi==1.16.0 cfgv==3.4.0 chardet==5.2.0 -charset-normalizer==3.2.0 +charset-normalizer==3.3.0 click==8.1.7 cloudpickle==2.2.1 colorama==0.4.6 comm==0.1.4 contourpy==1.1.1 coverage==7.3.1 -cycler==0.11.0 +cycler==0.12.0 debugpy==1.8.0 decorator==5.1.1 defusedxml==0.7.1 @@ -45,11 +45,11 @@ docstring-to-markdown==0.12 docutils==0.17.1 entrypoints==0.4 execnet==2.0.2 -executing==1.2.0 -fastjsonschema==2.18.0 +executing==2.0.0 +fastjsonschema==2.18.1 filelock==3.12.4 flatbuffers==23.5.26 -fonttools==4.42.1 +fonttools==4.43.0 fqdn==1.5.1 gast==0.5.4 google-auth==2.23.2 @@ -57,10 +57,10 @@ google-auth-oauthlib==1.0.0 google-pasta==0.2.0 graphviz==0.20.1 greenlet==2.0.2 -grpcio==1.58.0 +grpcio==1.59.0 h5py==3.9.0 hepunits==2.3.2 -identify==2.5.29 +identify==2.5.30 idna==3.4 imagesize==1.4.1 iminuit==2.24.0 @@ -68,7 +68,7 @@ importlib-metadata==6.8.0 iniconfig==2.0.0 ipykernel==6.25.2 ipympl==0.9.3 -ipython==8.15.0 +ipython==8.16.0 ipython-genutils==0.2.0 ipywidgets==8.1.1 isoduration==20.11.0 @@ -109,7 +109,7 @@ matplotlib==3.8.0 matplotlib-inline==0.1.6 mdit-py-plugins==0.3.5 mdurl==0.1.2 -mistune==3.0.1 +mistune==3.0.2 ml-dtypes==0.2.0 mpmath==1.3.0 mypy-extensions==1.0.0 @@ -197,7 +197,7 @@ sphinxcontrib-jsmath==1.0.1 sphinxcontrib-qthelp==1.0.6 sphinxcontrib-serializinghtml==1.1.9 sqlalchemy==2.0.21 -stack-data==0.6.2 +stack-data==0.6.3 sympy==1.12 tabulate==0.9.0 tensorboard==2.14.1 @@ -214,16 +214,17 @@ tornado==6.3.3 tox==4.11.3 tqdm==4.66.1 traitlets==5.10.1 +types-python-dateutil==2.8.19.14 typing-extensions==4.5.0 ujson==5.8.0 uri-template==1.3.0 urllib3==2.0.5 virtualenv==20.24.5 -wcwidth==0.2.6 +wcwidth==0.2.8 webcolors==1.13 webencodings==0.5.1 websocket-client==1.6.3 -werkzeug==2.3.7 +werkzeug==3.0.0 wheel==0.41.2 widgetsnbextension==4.0.9 wrapt==1.14.1 diff --git a/.constraints/py3.7.txt b/.constraints/py3.7.txt index cf5d3924..0c5f5525 100644 --- a/.constraints/py3.7.txt +++ b/.constraints/py3.7.txt @@ -27,7 +27,7 @@ certifi==2023.7.22 cffi==1.15.1 cfgv==3.3.1 chardet==5.2.0 -charset-normalizer==3.2.0 +charset-normalizer==3.3.0 click==8.1.7 cloudpickle==2.2.1 colorama==0.4.6 @@ -45,7 +45,7 @@ docutils==0.17.1 entrypoints==0.4 exceptiongroup==1.1.3 execnet==2.0.2 -fastjsonschema==2.18.0 +fastjsonschema==2.18.1 filelock==3.12.2 flatbuffers==23.5.26 fonttools==4.38.0 @@ -56,7 +56,7 @@ google-auth-oauthlib==0.4.6 google-pasta==0.2.0 graphviz==0.20.1 greenlet==2.0.2 -grpcio==1.58.0 +grpcio==1.59.0 h5py==3.8.0 hepunits==2.3.2 identify==2.5.24 @@ -107,7 +107,7 @@ matplotlib==3.5.3 matplotlib-inline==0.1.6 mdit-py-plugins==0.3.5 mdurl==0.1.2 -mistune==3.0.1 +mistune==3.0.2 mpmath==1.3.0 mypy-extensions==1.0.0 myst-nb==0.17.2 @@ -219,7 +219,7 @@ ujson==5.7.0 uri-template==1.3.0 urllib3==2.0.5 virtualenv==20.24.5 -wcwidth==0.2.6 +wcwidth==0.2.8 webcolors==1.13 webencodings==0.5.1 websocket-client==1.6.1 diff --git a/.constraints/py3.8.txt b/.constraints/py3.8.txt index be0f13f1..df3c933d 100644 --- a/.constraints/py3.8.txt +++ b/.constraints/py3.8.txt @@ -13,7 +13,7 @@ ampform==0.14.6 anyio==4.0.0 argon2-cffi==23.1.0 argon2-cffi-bindings==21.2.0 -arrow==1.2.3 +arrow==1.3.0 asttokens==2.4.0 astunparse==1.6.3 attrs==23.1.0 @@ -27,14 +27,14 @@ certifi==2023.7.22 cffi==1.16.0 cfgv==3.4.0 chardet==5.2.0 -charset-normalizer==3.2.0 +charset-normalizer==3.3.0 click==8.1.7 cloudpickle==2.2.1 colorama==0.4.6 comm==0.1.4 contourpy==1.1.1 coverage==7.3.1 -cycler==0.11.0 +cycler==0.12.0 debugpy==1.8.0 decorator==5.1.1 defusedxml==0.7.1 @@ -46,11 +46,11 @@ docutils==0.17.1 entrypoints==0.4 exceptiongroup==1.1.3 execnet==2.0.2 -executing==1.2.0 -fastjsonschema==2.18.0 +executing==2.0.0 +fastjsonschema==2.18.1 filelock==3.12.4 flatbuffers==23.5.26 -fonttools==4.42.1 +fonttools==4.43.0 fqdn==1.5.1 gast==0.4.0 google-auth==2.23.2 @@ -58,10 +58,10 @@ google-auth-oauthlib==1.0.0 google-pasta==0.2.0 graphviz==0.20.1 greenlet==2.0.2 -grpcio==1.58.0 +grpcio==1.59.0 h5py==3.9.0 hepunits==2.3.2 -identify==2.5.29 +identify==2.5.30 idna==3.4 imagesize==1.4.1 iminuit==2.24.0 @@ -70,7 +70,7 @@ importlib-resources==6.1.0 iniconfig==2.0.0 ipykernel==6.25.2 ipympl==0.9.3 -ipython==8.12.2 +ipython==8.12.3 ipython-genutils==0.2.0 ipywidgets==8.1.1 isoduration==20.11.0 @@ -111,7 +111,7 @@ matplotlib==3.7.3 matplotlib-inline==0.1.6 mdit-py-plugins==0.3.5 mdurl==0.1.2 -mistune==3.0.1 +mistune==3.0.2 ml-dtypes==0.2.0 mpmath==1.3.0 mypy-extensions==1.0.0 @@ -201,7 +201,7 @@ sphinxcontrib-jsmath==1.0.1 sphinxcontrib-qthelp==1.0.3 sphinxcontrib-serializinghtml==1.1.5 sqlalchemy==2.0.21 -stack-data==0.6.2 +stack-data==0.6.3 sympy==1.12 tabulate==0.9.0 tensorboard==2.13.0 @@ -219,16 +219,17 @@ tornado==6.3.3 tox==4.11.3 tqdm==4.66.1 traitlets==5.10.1 +types-python-dateutil==2.8.19.14 typing-extensions==4.5.0 ujson==5.8.0 uri-template==1.3.0 urllib3==2.0.5 virtualenv==20.24.5 -wcwidth==0.2.6 +wcwidth==0.2.8 webcolors==1.13 webencodings==0.5.1 websocket-client==1.6.3 -werkzeug==2.3.7 +werkzeug==3.0.0 wheel==0.41.2 widgetsnbextension==4.0.9 wrapt==1.15.0 diff --git a/.constraints/py3.9.txt b/.constraints/py3.9.txt index 286c874e..c2e4405b 100644 --- a/.constraints/py3.9.txt +++ b/.constraints/py3.9.txt @@ -13,7 +13,7 @@ ampform==0.14.6 anyio==4.0.0 argon2-cffi==23.1.0 argon2-cffi-bindings==21.2.0 -arrow==1.2.3 +arrow==1.3.0 asttokens==2.4.0 astunparse==1.6.3 attrs==23.1.0 @@ -27,14 +27,14 @@ certifi==2023.7.22 cffi==1.16.0 cfgv==3.4.0 chardet==5.2.0 -charset-normalizer==3.2.0 +charset-normalizer==3.3.0 click==8.1.7 cloudpickle==2.2.1 colorama==0.4.6 comm==0.1.4 contourpy==1.1.1 coverage==7.3.1 -cycler==0.11.0 +cycler==0.12.0 debugpy==1.8.0 decorator==5.1.1 defusedxml==0.7.1 @@ -46,11 +46,11 @@ docutils==0.17.1 entrypoints==0.4 exceptiongroup==1.1.3 execnet==2.0.2 -executing==1.2.0 -fastjsonschema==2.18.0 +executing==2.0.0 +fastjsonschema==2.18.1 filelock==3.12.4 flatbuffers==23.5.26 -fonttools==4.42.1 +fonttools==4.43.0 fqdn==1.5.1 gast==0.5.4 google-auth==2.23.2 @@ -58,10 +58,10 @@ google-auth-oauthlib==1.0.0 google-pasta==0.2.0 graphviz==0.20.1 greenlet==2.0.2 -grpcio==1.58.0 +grpcio==1.59.0 h5py==3.9.0 hepunits==2.3.2 -identify==2.5.29 +identify==2.5.30 idna==3.4 imagesize==1.4.1 iminuit==2.24.0 @@ -70,7 +70,7 @@ importlib-resources==6.1.0 iniconfig==2.0.0 ipykernel==6.25.2 ipympl==0.9.3 -ipython==8.15.0 +ipython==8.16.0 ipython-genutils==0.2.0 ipywidgets==8.1.1 isoduration==20.11.0 @@ -111,7 +111,7 @@ matplotlib==3.8.0 matplotlib-inline==0.1.6 mdit-py-plugins==0.3.5 mdurl==0.1.2 -mistune==3.0.1 +mistune==3.0.2 ml-dtypes==0.2.0 mpmath==1.3.0 mypy-extensions==1.0.0 @@ -199,7 +199,7 @@ sphinxcontrib-jsmath==1.0.1 sphinxcontrib-qthelp==1.0.6 sphinxcontrib-serializinghtml==1.1.9 sqlalchemy==2.0.21 -stack-data==0.6.2 +stack-data==0.6.3 sympy==1.12 tabulate==0.9.0 tensorboard==2.14.1 @@ -217,16 +217,17 @@ tornado==6.3.3 tox==4.11.3 tqdm==4.66.1 traitlets==5.10.1 +types-python-dateutil==2.8.19.14 typing-extensions==4.5.0 ujson==5.8.0 uri-template==1.3.0 urllib3==2.0.5 virtualenv==20.24.5 -wcwidth==0.2.6 +wcwidth==0.2.8 webcolors==1.13 webencodings==0.5.1 websocket-client==1.6.3 -werkzeug==2.3.7 +werkzeug==3.0.0 wheel==0.41.2 widgetsnbextension==4.0.9 wrapt==1.14.1 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index f3a20297..69a412cb 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -27,7 +27,7 @@ repos: - id: trailing-whitespace - repo: https://github.com/ComPWA/repo-maintenance - rev: 0.0.200 + rev: 0.0.201 hooks: - id: check-dev-files args: @@ -58,7 +58,7 @@ repos: types_or: [jupyter] - repo: https://github.com/streetsidesoftware/cspell-cli - rev: v7.3.0 + rev: v7.3.1 hooks: - id: cspell From 0b15ecf52f5db075099a33837f084fec21549d85 Mon Sep 17 00:00:00 2001 From: GitHub Date: Tue, 3 Oct 2023 19:49:33 +0000 Subject: [PATCH 13/27] MAINT: update pip constraints and pre-commit --- .constraints/py3.10.txt | 24 ++++++++++++------------ .constraints/py3.11.txt | 24 ++++++++++++------------ .constraints/py3.7.txt | 12 ++++++------ .constraints/py3.8.txt | 20 ++++++++++---------- .constraints/py3.9.txt | 24 ++++++++++++------------ .pre-commit-config.yaml | 6 +++--- 6 files changed, 55 insertions(+), 55 deletions(-) diff --git a/.constraints/py3.10.txt b/.constraints/py3.10.txt index e74bd777..02c8c3a8 100644 --- a/.constraints/py3.10.txt +++ b/.constraints/py3.10.txt @@ -17,7 +17,7 @@ arrow==1.3.0 asttokens==2.4.0 astunparse==1.6.3 attrs==23.1.0 -babel==2.12.1 +babel==2.13.0 backcall==0.2.0 beautifulsoup4==4.12.2 black==23.9.1 @@ -33,7 +33,7 @@ cloudpickle==2.2.1 colorama==0.4.6 comm==0.1.4 contourpy==1.1.1 -coverage==7.3.1 +coverage==7.3.2 cycler==0.12.0 debugpy==1.8.0 decorator==5.1.1 @@ -57,7 +57,7 @@ google-auth==2.23.2 google-auth-oauthlib==1.0.0 google-pasta==0.2.0 graphviz==0.20.1 -greenlet==2.0.2 +greenlet==3.0.0 grpcio==1.59.0 h5py==3.9.0 hepunits==2.3.2 @@ -69,13 +69,13 @@ importlib-metadata==6.8.0 iniconfig==2.0.0 ipykernel==6.25.2 ipympl==0.9.3 -ipython==8.16.0 +ipython==8.16.1 ipython-genutils==0.2.0 ipywidgets==8.1.1 isoduration==20.11.0 jax==0.4.16 jaxlib==0.4.16 -jedi==0.19.0 +jedi==0.19.1 jinja2==3.1.2 json5==0.9.14 jsonpointer==2.4 @@ -120,7 +120,7 @@ nbclassic==1.0.0 nbclient==0.6.8 nbconvert==7.8.0 nbformat==5.9.2 -nbmake==1.4.3 +nbmake==1.4.5 nest-asyncio==1.5.8 nodeenv==1.8.0 notebook==6.5.6 @@ -129,7 +129,7 @@ numpy==1.26.0 oauthlib==3.2.2 opt-einsum==3.3.0 overrides==7.4.0 -packaging==23.1 +packaging==23.2 pandocfilters==1.5.0 parso==0.8.3 particle==0.23.0 @@ -138,7 +138,7 @@ pexpect==4.8.0 phasespace==1.9.0 pickleshare==0.7.5 pillow==10.0.1 -platformdirs==3.10.0 +platformdirs==3.11.0 pluggy==1.3.0 pre-commit==3.4.0 prometheus-client==0.17.1 @@ -176,7 +176,7 @@ rfc3986-validator==0.1.1 rope==1.10.0 rpds-py==0.10.3 rsa==4.9 -ruff==0.0.291 +ruff==0.0.292 scipy==1.11.3 send2trash==1.8.2 six==1.16.0 @@ -206,7 +206,7 @@ tensorboard-data-server==0.7.1 tensorflow==2.14.0 tensorflow-estimator==2.14.0 tensorflow-io-gcs-filesystem==0.34.0 -tensorflow-probability==0.21.0 +tensorflow-probability==0.22.0 tensorwaves==0.4.10 termcolor==2.3.0 terminado==0.17.1 @@ -215,12 +215,12 @@ tomli==2.0.1 tornado==6.3.3 tox==4.11.3 tqdm==4.66.1 -traitlets==5.10.1 +traitlets==5.11.1 types-python-dateutil==2.8.19.14 typing-extensions==4.5.0 ujson==5.8.0 uri-template==1.3.0 -urllib3==2.0.5 +urllib3==2.0.6 virtualenv==20.24.5 wcwidth==0.2.8 webcolors==1.13 diff --git a/.constraints/py3.11.txt b/.constraints/py3.11.txt index 6ed6c797..7b7688e6 100644 --- a/.constraints/py3.11.txt +++ b/.constraints/py3.11.txt @@ -17,7 +17,7 @@ arrow==1.3.0 asttokens==2.4.0 astunparse==1.6.3 attrs==23.1.0 -babel==2.12.1 +babel==2.13.0 backcall==0.2.0 beautifulsoup4==4.12.2 black==23.9.1 @@ -33,7 +33,7 @@ cloudpickle==2.2.1 colorama==0.4.6 comm==0.1.4 contourpy==1.1.1 -coverage==7.3.1 +coverage==7.3.2 cycler==0.12.0 debugpy==1.8.0 decorator==5.1.1 @@ -56,7 +56,7 @@ google-auth==2.23.2 google-auth-oauthlib==1.0.0 google-pasta==0.2.0 graphviz==0.20.1 -greenlet==2.0.2 +greenlet==3.0.0 grpcio==1.59.0 h5py==3.9.0 hepunits==2.3.2 @@ -68,13 +68,13 @@ importlib-metadata==6.8.0 iniconfig==2.0.0 ipykernel==6.25.2 ipympl==0.9.3 -ipython==8.16.0 +ipython==8.16.1 ipython-genutils==0.2.0 ipywidgets==8.1.1 isoduration==20.11.0 jax==0.4.16 jaxlib==0.4.16 -jedi==0.19.0 +jedi==0.19.1 jinja2==3.1.2 json5==0.9.14 jsonpointer==2.4 @@ -119,7 +119,7 @@ nbclassic==1.0.0 nbclient==0.6.8 nbconvert==7.8.0 nbformat==5.9.2 -nbmake==1.4.3 +nbmake==1.4.5 nest-asyncio==1.5.8 nodeenv==1.8.0 notebook==6.5.6 @@ -128,7 +128,7 @@ numpy==1.26.0 oauthlib==3.2.2 opt-einsum==3.3.0 overrides==7.4.0 -packaging==23.1 +packaging==23.2 pandocfilters==1.5.0 parso==0.8.3 particle==0.23.0 @@ -137,7 +137,7 @@ pexpect==4.8.0 phasespace==1.9.0 pickleshare==0.7.5 pillow==10.0.1 -platformdirs==3.10.0 +platformdirs==3.11.0 pluggy==1.3.0 pre-commit==3.4.0 prometheus-client==0.17.1 @@ -175,7 +175,7 @@ rfc3986-validator==0.1.1 rope==1.10.0 rpds-py==0.10.3 rsa==4.9 -ruff==0.0.291 +ruff==0.0.292 scipy==1.11.3 send2trash==1.8.2 six==1.16.0 @@ -205,7 +205,7 @@ tensorboard-data-server==0.7.1 tensorflow==2.14.0 tensorflow-estimator==2.14.0 tensorflow-io-gcs-filesystem==0.34.0 -tensorflow-probability==0.21.0 +tensorflow-probability==0.22.0 tensorwaves==0.4.10 termcolor==2.3.0 terminado==0.17.1 @@ -213,12 +213,12 @@ tinycss2==1.2.1 tornado==6.3.3 tox==4.11.3 tqdm==4.66.1 -traitlets==5.10.1 +traitlets==5.11.1 types-python-dateutil==2.8.19.14 typing-extensions==4.5.0 ujson==5.8.0 uri-template==1.3.0 -urllib3==2.0.5 +urllib3==2.0.6 virtualenv==20.24.5 wcwidth==0.2.8 webcolors==1.13 diff --git a/.constraints/py3.7.txt b/.constraints/py3.7.txt index 0c5f5525..6bf28cf9 100644 --- a/.constraints/py3.7.txt +++ b/.constraints/py3.7.txt @@ -16,7 +16,7 @@ argon2-cffi-bindings==21.2.0 arrow==1.2.3 astunparse==1.6.3 attrs==23.1.0 -babel==2.12.1 +babel==2.13.0 backcall==0.2.0 beautifulsoup4==4.12.2 black==23.3.0 @@ -55,7 +55,7 @@ google-auth==2.23.2 google-auth-oauthlib==0.4.6 google-pasta==0.2.0 graphviz==0.20.1 -greenlet==2.0.2 +greenlet==3.0.0 grpcio==1.59.0 h5py==3.8.0 hepunits==2.3.2 @@ -124,7 +124,7 @@ notebook-shim==0.2.3 numpy==1.21.6 oauthlib==3.2.2 opt-einsum==3.3.0 -packaging==23.1 +packaging==23.2 pandocfilters==1.5.0 parso==0.8.3 particle==0.23.0 @@ -134,7 +134,7 @@ phasespace==1.9.0 pickleshare==0.7.5 pillow==9.5.0 pkgutil-resolve-name==1.3.10 -platformdirs==3.10.0 +platformdirs==3.11.0 pluggy==1.2.0 pre-commit==2.21.0 prometheus-client==0.17.1 @@ -172,7 +172,7 @@ rfc3339-validator==0.1.4 rfc3986-validator==0.1.1 rope==1.9.0 rsa==4.9 -ruff==0.0.291 +ruff==0.0.292 scipy==1.7.3 send2trash==1.8.2 singledispatchmethod==1.0 @@ -217,7 +217,7 @@ typed-ast==1.5.5 typing-extensions==4.7.1 ; python_version < "3.8.0" ujson==5.7.0 uri-template==1.3.0 -urllib3==2.0.5 +urllib3==2.0.6 virtualenv==20.24.5 wcwidth==0.2.8 webcolors==1.13 diff --git a/.constraints/py3.8.txt b/.constraints/py3.8.txt index df3c933d..8a14cbdb 100644 --- a/.constraints/py3.8.txt +++ b/.constraints/py3.8.txt @@ -17,7 +17,7 @@ arrow==1.3.0 asttokens==2.4.0 astunparse==1.6.3 attrs==23.1.0 -babel==2.12.1 +babel==2.13.0 backcall==0.2.0 beautifulsoup4==4.12.2 black==23.9.1 @@ -33,7 +33,7 @@ cloudpickle==2.2.1 colorama==0.4.6 comm==0.1.4 contourpy==1.1.1 -coverage==7.3.1 +coverage==7.3.2 cycler==0.12.0 debugpy==1.8.0 decorator==5.1.1 @@ -57,7 +57,7 @@ google-auth==2.23.2 google-auth-oauthlib==1.0.0 google-pasta==0.2.0 graphviz==0.20.1 -greenlet==2.0.2 +greenlet==3.0.0 grpcio==1.59.0 h5py==3.9.0 hepunits==2.3.2 @@ -76,7 +76,7 @@ ipywidgets==8.1.1 isoduration==20.11.0 jax==0.4.13 jaxlib==0.4.13 -jedi==0.19.0 +jedi==0.19.1 jinja2==3.1.2 json5==0.9.14 jsonpointer==2.4 @@ -121,7 +121,7 @@ nbclassic==1.0.0 nbclient==0.6.8 nbconvert==7.8.0 nbformat==5.9.2 -nbmake==1.4.3 +nbmake==1.4.5 nest-asyncio==1.5.8 nodeenv==1.8.0 notebook==6.5.6 @@ -130,7 +130,7 @@ numpy==1.24.3 oauthlib==3.2.2 opt-einsum==3.3.0 overrides==7.4.0 -packaging==23.1 +packaging==23.2 pandocfilters==1.5.0 parso==0.8.3 particle==0.23.0 @@ -140,7 +140,7 @@ phasespace==1.9.0 pickleshare==0.7.5 pillow==10.0.1 pkgutil-resolve-name==1.3.10 -platformdirs==3.10.0 +platformdirs==3.11.0 pluggy==1.3.0 pre-commit==3.4.0 prometheus-client==0.17.1 @@ -179,7 +179,7 @@ rfc3986-validator==0.1.1 rope==1.10.0 rpds-py==0.10.3 rsa==4.9 -ruff==0.0.291 +ruff==0.0.292 scipy==1.10.1 send2trash==1.8.2 six==1.16.0 @@ -218,12 +218,12 @@ tomli==2.0.1 tornado==6.3.3 tox==4.11.3 tqdm==4.66.1 -traitlets==5.10.1 +traitlets==5.11.1 types-python-dateutil==2.8.19.14 typing-extensions==4.5.0 ujson==5.8.0 uri-template==1.3.0 -urllib3==2.0.5 +urllib3==2.0.6 virtualenv==20.24.5 wcwidth==0.2.8 webcolors==1.13 diff --git a/.constraints/py3.9.txt b/.constraints/py3.9.txt index c2e4405b..c6a41183 100644 --- a/.constraints/py3.9.txt +++ b/.constraints/py3.9.txt @@ -17,7 +17,7 @@ arrow==1.3.0 asttokens==2.4.0 astunparse==1.6.3 attrs==23.1.0 -babel==2.12.1 +babel==2.13.0 backcall==0.2.0 beautifulsoup4==4.12.2 black==23.9.1 @@ -33,7 +33,7 @@ cloudpickle==2.2.1 colorama==0.4.6 comm==0.1.4 contourpy==1.1.1 -coverage==7.3.1 +coverage==7.3.2 cycler==0.12.0 debugpy==1.8.0 decorator==5.1.1 @@ -57,7 +57,7 @@ google-auth==2.23.2 google-auth-oauthlib==1.0.0 google-pasta==0.2.0 graphviz==0.20.1 -greenlet==2.0.2 +greenlet==3.0.0 grpcio==1.59.0 h5py==3.9.0 hepunits==2.3.2 @@ -70,13 +70,13 @@ importlib-resources==6.1.0 iniconfig==2.0.0 ipykernel==6.25.2 ipympl==0.9.3 -ipython==8.16.0 +ipython==8.16.1 ipython-genutils==0.2.0 ipywidgets==8.1.1 isoduration==20.11.0 jax==0.4.16 jaxlib==0.4.16 -jedi==0.19.0 +jedi==0.19.1 jinja2==3.1.2 json5==0.9.14 jsonpointer==2.4 @@ -121,7 +121,7 @@ nbclassic==1.0.0 nbclient==0.6.8 nbconvert==7.8.0 nbformat==5.9.2 -nbmake==1.4.3 +nbmake==1.4.5 nest-asyncio==1.5.8 nodeenv==1.8.0 notebook==6.5.6 @@ -130,7 +130,7 @@ numpy==1.26.0 oauthlib==3.2.2 opt-einsum==3.3.0 overrides==7.4.0 -packaging==23.1 +packaging==23.2 pandocfilters==1.5.0 parso==0.8.3 particle==0.23.0 @@ -139,7 +139,7 @@ pexpect==4.8.0 phasespace==1.9.0 pickleshare==0.7.5 pillow==10.0.1 -platformdirs==3.10.0 +platformdirs==3.11.0 pluggy==1.3.0 pre-commit==3.4.0 prometheus-client==0.17.1 @@ -177,7 +177,7 @@ rfc3986-validator==0.1.1 rope==1.10.0 rpds-py==0.10.3 rsa==4.9 -ruff==0.0.291 +ruff==0.0.292 scipy==1.11.3 send2trash==1.8.2 six==1.16.0 @@ -207,7 +207,7 @@ tensorboard-data-server==0.7.1 tensorflow==2.14.0 tensorflow-estimator==2.14.0 tensorflow-io-gcs-filesystem==0.34.0 -tensorflow-probability==0.21.0 +tensorflow-probability==0.22.0 tensorwaves==0.4.10 termcolor==2.3.0 terminado==0.17.1 @@ -216,12 +216,12 @@ tomli==2.0.1 tornado==6.3.3 tox==4.11.3 tqdm==4.66.1 -traitlets==5.10.1 +traitlets==5.11.1 types-python-dateutil==2.8.19.14 typing-extensions==4.5.0 ujson==5.8.0 uri-template==1.3.0 -urllib3==2.0.5 +urllib3==2.0.6 virtualenv==20.24.5 wcwidth==0.2.8 webcolors==1.13 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 69a412cb..6c119286 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -27,7 +27,7 @@ repos: - id: trailing-whitespace - repo: https://github.com/ComPWA/repo-maintenance - rev: 0.0.201 + rev: 0.0.202 hooks: - id: check-dev-files args: @@ -109,14 +109,14 @@ repos: - id: pyright - repo: https://github.com/asottile/pyupgrade - rev: v3.13.0 + rev: v3.14.0 hooks: - id: pyupgrade args: - --py37-plus - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.0.291 + rev: v0.0.292 hooks: - id: ruff args: From 9600cb22c7597ed02505226f52c255d6c3e75f0a Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 3 Oct 2023 19:50:08 +0000 Subject: [PATCH 14/27] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- .pre-commit-config.yaml | 9 ++- .taplo.toml | 3 + pyproject.toml | 143 +++++++++++++++++++++++++++++++++++++++- setup.cfg | 111 ------------------------------- setup.py | 6 -- 5 files changed, 151 insertions(+), 121 deletions(-) delete mode 100644 setup.cfg delete mode 100644 setup.py diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 6c119286..cb9df31b 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -37,8 +37,6 @@ repos: - --repo-name=ampform-dpd - --repo-title=AmpForm-DPD - id: colab-toc-visible - - id: format-setup-cfg - - repo: https://github.com/nbQA-dev/nbQA rev: 1.7.0 hooks: @@ -126,3 +124,10 @@ repos: rev: v0.8.1 hooks: - id: taplo + + - repo: https://github.com/pappasam/toml-sort + rev: PLEASE-UPDATE + hooks: + - id: toml-sort + args: + - --in-place diff --git a/.taplo.toml b/.taplo.toml index f5caabee..424b7469 100644 --- a/.taplo.toml +++ b/.taplo.toml @@ -6,11 +6,14 @@ exclude = [ ] [formatting] +align_comments = false align_entries = false +allowed_blank_lines = 1 array_auto_collapse = false array_auto_expand = true array_trailing_comma = true column_width = 88 +compact_inline_tables = true indent_string = " " reorder_arrays = true reorder_keys = true diff --git a/pyproject.toml b/pyproject.toml index 8f30ef32..cf09e0c0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,9 +1,9 @@ [build-system] requires = [ - "setuptools>=36.2.1", # environment markers + "setuptools>=61.2", "setuptools_scm", - "wheel", ] +build-backend = "setuptools.build_meta" [tool.setuptools_scm] write_to = "src/ampform_dpd/version.py" @@ -188,3 +188,142 @@ ignore-names = [ [tool.ruff.pydocstyle] convention = "google" + +[tool.tomlsort] +all = false +ignore_case = true +in_place = true +sort_first = [ + "build-system", + "project", + "tool.setuptools", + "tool.setuptools_scm", +] +sort_table_keys = true +spaces_indent_inline_array = 4 +trailing_comma_inline_array = true + +[tool.setuptools] +package-dir = {"" = "src"} +include-package-data = false + +[tool.setuptools.packages.find] +where = ["src"] +namespaces = false + +[tool.setuptools.package-data] +ampform_dpd = ["py.typed"] + +[project] +name = "ampform-dpd" +description = "Symbolic expressions for Dalitz-Plot Decomposition" +authors = [{name = "Common Partial Wave Analysis", email = "compwa-admin@ep1.rub.de"}] +license = {text = "GPLv3 or later"} +classifiers = [ + "Development Status :: 3 - Alpha", + "Intended Audience :: Developers", + "Intended Audience :: Education", + "Intended Audience :: Science/Research", + "License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)", + "Natural Language :: English", + "Operating System :: OS Independent", + "Programming Language :: Python", + "Programming Language :: Python :: 3.7", + "Programming Language :: Python :: 3.8", + "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", + "Topic :: Scientific/Engineering", + "Topic :: Scientific/Engineering :: Physics", + "Typing :: Typed", +] +requires-python = ">=3.7" +dependencies = [ + "ampform ~=0.14.4", # Kibble and Kallen functions, perform_cached_doit + "attrs >=20.1.0", # on_setattr and https://www.attrs.org/en/stable/api.html#next-gen + "cloudpickle", + "sympy >=1.10", # module sympy.printing.numpy and array expressions with shape kwarg + "tensorwaves[jax]", + 'typing-extensions; python_version <"3.8.0"', +] +dynamic = ["version"] + +[project.readme] +file = "README.md" +content-type = "text/markdown" + +[project.urls] +Tracker = "https://github.com/ComPWA/ampform-dpd/issues" +Changelog = "https://github.com/ComPWA/ampform-dpd/releases" +Documentation = "https://compwa.github.io/ampform-dpd" +Source = "https://github.com/ComPWA/ampform-dpd" + +[project.optional-dependencies] +jax = [ + "tensorwaves[jax]", +] +numba = [ + "tensorwaves[numba]", +] +tf = [ + "tensorwaves[tf]", +] +tensorflow = [ + "ampform-dpd[tf]", +] +doc = [ + "graphviz", + "ipympl", + "ipywidgets", + 'importlib-metadata; python_version <"3.8.0"', + "matplotlib", + "myst-nb >=0.14", # nb_render_markdown_format for Markdown tables + "sphinx-book-theme", + "sphinx-codeautolink[ipython]", + "sphinx-copybutton", + "sphinx-design", + "sphinx-togglebutton", + "sphinxcontrib-bibtex", + "tensorwaves[phsp]", + "tqdm", +] +jupyter = [ + "ampform-dpd[doc]", + "jupyterlab >=3.0", + "jupyterlab-code-formatter", + "jupyterlab-lsp", + "jupyterlab-myst", + "python-lsp-server[rope]", + 'ypy-websocket <0.8.3; python_version <"3.8.0"', +] +test = [ + "nbmake", + 'nbmake <1.3; python_version <"3.8.0"', + "numpy", + "pytest >=6.0", # pyproject.toml + "pytest-cov", + "pytest-xdist", +] +format = [ + "black", +] +lint = [ + "ruff", +] +sty = [ + "ampform-dpd[format]", + "ampform-dpd[lint]", + "ampform-dpd[test]", # for pytest type hints + "docutils", + "pre-commit >=1.4.0", + "pybtex", + "sphinx", +] +dev = [ + "ampform-dpd[doc]", + "ampform-dpd[jupyter]", + "ampform-dpd[sty]", + "ampform-dpd[test]", + "sphinx-autobuild", + "tox >=1.9", # for skip_install, use_develop +] diff --git a/setup.cfg b/setup.cfg deleted file mode 100644 index 5e4037b0..00000000 --- a/setup.cfg +++ /dev/null @@ -1,111 +0,0 @@ -[metadata] -name = ampform-dpd -description = Symbolic expressions for Dalitz-Plot Decomposition -author = Common Partial Wave Analysis -author_email = compwa-admin@ep1.rub.de -long_description = file: README.md -long_description_content_type = text/markdown -license = GPLv3 or later -project_urls = - Tracker = https://github.com/ComPWA/ampform-dpd/issues - Changelog = https://github.com/ComPWA/ampform-dpd/releases - Documentation = https://compwa.github.io/ampform-dpd - Source = https://github.com/ComPWA/ampform-dpd -classifiers = - Development Status :: 3 - Alpha - Intended Audience :: Developers - Intended Audience :: Education - Intended Audience :: Science/Research - License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+) - Natural Language :: English - Operating System :: OS Independent - Programming Language :: Python - Programming Language :: Python :: 3.7 - Programming Language :: Python :: 3.8 - Programming Language :: Python :: 3.9 - Programming Language :: Python :: 3.10 - Programming Language :: Python :: 3.11 - Topic :: Scientific/Engineering - Topic :: Scientific/Engineering :: Physics - Typing :: Typed - -[options] -python_requires = >=3.7 -setup_requires = - setuptools_scm -install_requires = - ampform ~=0.14.4 # Kibble and Kallen functions, perform_cached_doit - attrs >=20.1.0 # on_setattr and https://www.attrs.org/en/stable/api.html#next-gen - cloudpickle - sympy >=1.10 # module sympy.printing.numpy and array expressions with shape kwarg - tensorwaves[jax] - typing-extensions; python_version <"3.8.0" -packages = find: -package_dir = - =src - -[options.extras_require] -jax = - tensorwaves[jax] -numba = - tensorwaves[numba] -tf = - tensorwaves[tf] -tensorflow = - %(tf)s -doc = - graphviz - ipympl - ipywidgets - importlib-metadata; python_version <"3.8.0" - matplotlib - myst-nb >=0.14 # nb_render_markdown_format for Markdown tables - sphinx-book-theme - sphinx-codeautolink[ipython] - sphinx-copybutton - sphinx-design - sphinx-togglebutton - sphinxcontrib-bibtex - tensorwaves[phsp] - tqdm -jupyter = - %(doc)s - jupyterlab >=3.0 - jupyterlab-code-formatter - jupyterlab-lsp - jupyterlab-myst - python-lsp-server[rope] - ypy-websocket <0.8.3; python_version <"3.8.0" -test = - nbmake - nbmake <1.3; python_version <"3.8.0" - numpy - pytest >=6.0 # pyproject.toml - pytest-cov - pytest-xdist -format = - black -lint = - ruff -sty = - %(format)s - %(lint)s - %(test)s # for pytest type hints - docutils - pre-commit >=1.4.0 - pybtex - sphinx -dev = - %(doc)s - %(jupyter)s - %(sty)s - %(test)s - sphinx-autobuild - tox >=1.9 # for skip_install, use_develop - -[options.packages.find] -where = src - -[options.package_data] -ampform_dpd = - py.typed diff --git a/setup.py b/setup.py deleted file mode 100644 index f7b80f8d..00000000 --- a/setup.py +++ /dev/null @@ -1,6 +0,0 @@ -import setuptools - -setuptools.setup( - setup_requires=["setuptools_scm"], - use_scm_version=True, -) From 69df2041c3884a2af3869875dfa135c8d04f01df Mon Sep 17 00:00:00 2001 From: GitHub Date: Tue, 3 Oct 2023 19:59:25 +0000 Subject: [PATCH 15/27] MAINT: update pip constraints and pre-commit --- .constraints/py3.10.txt | 3 ++- .constraints/py3.11.txt | 3 ++- .constraints/py3.7.txt | 9 +++++---- .constraints/py3.8.txt | 3 ++- .constraints/py3.9.txt | 3 ++- .pre-commit-config.yaml | 2 +- 6 files changed, 14 insertions(+), 9 deletions(-) diff --git a/.constraints/py3.10.txt b/.constraints/py3.10.txt index 02c8c3a8..4e36fe41 100644 --- a/.constraints/py3.10.txt +++ b/.constraints/py3.10.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile with Python 3.10 # by the following command: # -# pip-compile --extra=dev --no-annotate --output-file=.constraints/py3.10.txt --strip-extras +# pip-compile --extra=dev --no-annotate --output-file=.constraints/py3.10.txt --strip-extras --unsafe-package=ampform-dpd --unsafe-package=pip --unsafe-package=setuptools # absl-py==2.0.0 accessible-pygments==0.0.4 @@ -235,4 +235,5 @@ ypy-websocket==0.8.4 zipp==3.17.0 # The following packages are considered to be unsafe in a requirements file: +# ampform-dpd # setuptools diff --git a/.constraints/py3.11.txt b/.constraints/py3.11.txt index 7b7688e6..d45bcd0a 100644 --- a/.constraints/py3.11.txt +++ b/.constraints/py3.11.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile with Python 3.11 # by the following command: # -# pip-compile --extra=dev --no-annotate --output-file=.constraints/py3.11.txt --strip-extras +# pip-compile --extra=dev --no-annotate --output-file=.constraints/py3.11.txt --strip-extras --unsafe-package=ampform-dpd --unsafe-package=pip --unsafe-package=setuptools # absl-py==2.0.0 accessible-pygments==0.0.4 @@ -233,4 +233,5 @@ ypy-websocket==0.8.4 zipp==3.17.0 # The following packages are considered to be unsafe in a requirements file: +# ampform-dpd # setuptools diff --git a/.constraints/py3.7.txt b/.constraints/py3.7.txt index 6bf28cf9..89b5c780 100644 --- a/.constraints/py3.7.txt +++ b/.constraints/py3.7.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile with Python 3.7 # by the following command: # -# pip-compile --extra=dev --no-annotate --output-file=.constraints/py3.7.txt --resolver=backtracking --strip-extras +# pip-compile --extra=dev --no-annotate --output-file=.constraints/py3.7.txt --resolver=backtracking --strip-extras --unsafe-package=ampform-dpd --unsafe-package=pip --unsafe-package=setuptools # absl-py==2.0.0 accessible-pygments==0.0.4 @@ -63,7 +63,7 @@ identify==2.5.24 idna==3.4 imagesize==1.4.1 iminuit==2.18.0 -importlib-metadata==6.7.0 ; python_version < "3.8.0" +importlib-metadata==6.7.0 importlib-resources==5.12.0 iniconfig==2.0.0 ipykernel==6.16.2 @@ -116,7 +116,7 @@ nbclassic==1.0.0 nbclient==0.5.13 nbconvert==7.6.0 nbformat==5.8.0 -nbmake==1.2.1 ; python_version < "3.8.0" +nbmake==1.2.1 nest-asyncio==1.5.8 nodeenv==1.8.0 notebook==6.5.6 @@ -228,8 +228,9 @@ wheel==0.41.2 widgetsnbextension==4.0.9 wrapt==1.15.0 y-py==0.5.9 -ypy-websocket==0.8.2 ; python_version < "3.8.0" +ypy-websocket==0.8.2 zipp==3.15.0 # The following packages are considered to be unsafe in a requirements file: +# ampform-dpd # setuptools diff --git a/.constraints/py3.8.txt b/.constraints/py3.8.txt index 8a14cbdb..94938805 100644 --- a/.constraints/py3.8.txt +++ b/.constraints/py3.8.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile with Python 3.8 # by the following command: # -# pip-compile --extra=dev --no-annotate --output-file=.constraints/py3.8.txt --strip-extras +# pip-compile --extra=dev --no-annotate --output-file=.constraints/py3.8.txt --strip-extras --unsafe-package=ampform-dpd --unsafe-package=pip --unsafe-package=setuptools # absl-py==2.0.0 accessible-pygments==0.0.4 @@ -238,4 +238,5 @@ ypy-websocket==0.8.4 zipp==3.17.0 # The following packages are considered to be unsafe in a requirements file: +# ampform-dpd # setuptools diff --git a/.constraints/py3.9.txt b/.constraints/py3.9.txt index c6a41183..6283c4df 100644 --- a/.constraints/py3.9.txt +++ b/.constraints/py3.9.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile with Python 3.9 # by the following command: # -# pip-compile --extra=dev --no-annotate --output-file=.constraints/py3.9.txt --strip-extras +# pip-compile --extra=dev --no-annotate --output-file=.constraints/py3.9.txt --strip-extras --unsafe-package=ampform-dpd --unsafe-package=pip --unsafe-package=setuptools # absl-py==2.0.0 accessible-pygments==0.0.4 @@ -236,4 +236,5 @@ ypy-websocket==0.8.4 zipp==3.17.0 # The following packages are considered to be unsafe in a requirements file: +# ampform-dpd # setuptools diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index cb9df31b..b441cbb7 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -126,7 +126,7 @@ repos: - id: taplo - repo: https://github.com/pappasam/toml-sort - rev: PLEASE-UPDATE + rev: v0.23.1 hooks: - id: toml-sort args: From ff811c5a59f1b6d7230664be1c3d0a60824ceb7b Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 3 Oct 2023 20:00:11 +0000 Subject: [PATCH 16/27] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- pyproject.toml | 280 ++++++++++++++++++++++++------------------------- 1 file changed, 140 insertions(+), 140 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index cf09e0c0..dc9cedf3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,9 +1,134 @@ [build-system] +build-backend = "setuptools.build_meta" requires = [ "setuptools>=61.2", "setuptools_scm", ] -build-backend = "setuptools.build_meta" + +[project] +authors = [{name = "Common Partial Wave Analysis", email = "compwa-admin@ep1.rub.de"}] +classifiers = [ + "Development Status :: 3 - Alpha", + "Intended Audience :: Developers", + "Intended Audience :: Education", + "Intended Audience :: Science/Research", + "License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)", + "Natural Language :: English", + "Operating System :: OS Independent", + "Programming Language :: Python", + "Programming Language :: Python :: 3.7", + "Programming Language :: Python :: 3.8", + "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", + "Topic :: Scientific/Engineering", + "Topic :: Scientific/Engineering :: Physics", + "Typing :: Typed", +] +dependencies = [ + "ampform ~=0.14.4", # Kibble and Kallen functions, perform_cached_doit + "attrs >=20.1.0", # on_setattr and https://www.attrs.org/en/stable/api.html#next-gen + "cloudpickle", + "sympy >=1.10", # module sympy.printing.numpy and array expressions with shape kwarg + "tensorwaves[jax]", + 'typing-extensions; python_version <"3.8.0"', +] +description = "Symbolic expressions for Dalitz-Plot Decomposition" +dynamic = ["version"] +license = {text = "GPLv3 or later"} +name = "ampform-dpd" +requires-python = ">=3.7" + +[project.optional-dependencies] +dev = [ + "ampform-dpd[doc]", + "ampform-dpd[jupyter]", + "ampform-dpd[sty]", + "ampform-dpd[test]", + "sphinx-autobuild", + "tox >=1.9", # for skip_install, use_develop +] +doc = [ + "graphviz", + "ipympl", + "ipywidgets", + 'importlib-metadata; python_version <"3.8.0"', + "matplotlib", + "myst-nb >=0.14", # nb_render_markdown_format for Markdown tables + "sphinx-book-theme", + "sphinx-codeautolink[ipython]", + "sphinx-copybutton", + "sphinx-design", + "sphinx-togglebutton", + "sphinxcontrib-bibtex", + "tensorwaves[phsp]", + "tqdm", +] +format = [ + "black", +] +jax = [ + "tensorwaves[jax]", +] +jupyter = [ + "ampform-dpd[doc]", + "jupyterlab >=3.0", + "jupyterlab-code-formatter", + "jupyterlab-lsp", + "jupyterlab-myst", + "python-lsp-server[rope]", + 'ypy-websocket <0.8.3; python_version <"3.8.0"', +] +lint = [ + "ruff", +] +numba = [ + "tensorwaves[numba]", +] +sty = [ + "ampform-dpd[format]", + "ampform-dpd[lint]", + "ampform-dpd[test]", # for pytest type hints + "docutils", + "pre-commit >=1.4.0", + "pybtex", + "sphinx", +] +tensorflow = [ + "ampform-dpd[tf]", +] +test = [ + "nbmake", + 'nbmake <1.3; python_version <"3.8.0"', + "numpy", + "pytest >=6.0", # pyproject.toml + "pytest-cov", + "pytest-xdist", +] +tf = [ + "tensorwaves[tf]", +] + +[project.readme] +content-type = "text/markdown" +file = "README.md" + +[project.urls] +Changelog = "https://github.com/ComPWA/ampform-dpd/releases" +Documentation = "https://compwa.github.io/ampform-dpd" +Source = "https://github.com/ComPWA/ampform-dpd" +Tracker = "https://github.com/ComPWA/ampform-dpd/issues" + +[tool.setuptools] +include-package-data = false +package-dir = {"" = "src"} + +[tool.setuptools.package-data] +ampform_dpd = ["py.typed"] + +[tool.setuptools.packages.find] +namespaces = false +where = ["src"] [tool.setuptools_scm] write_to = "src/ampform_dpd/version.py" @@ -128,7 +253,7 @@ extend-select = [ "YTT", ] ignore = [ - "B028", # missing explicit stacklevel keyword + "B028", # missing explicit stacklevel keyword "C408", "D101", "D102", @@ -153,6 +278,19 @@ src = [ target-version = "py37" task-tags = ["cspell"] +[tool.ruff.pep8-naming] +ignore-names = [ + "A", + "H", + "L", + "R", + "R_dec", + "R_prod", + "S", + "Γ*", + "λ*", +] + [tool.ruff.per-file-ignores] "*" = ["D"] "docs/*" = [ @@ -173,19 +311,6 @@ task-tags = ["cspell"] "S101", ] -[tool.ruff.pep8-naming] -ignore-names = [ - "A", - "H", - "L", - "R", - "R_dec", - "R_prod", - "S", - "Γ*", - "λ*", -] - [tool.ruff.pydocstyle] convention = "google" @@ -202,128 +327,3 @@ sort_first = [ sort_table_keys = true spaces_indent_inline_array = 4 trailing_comma_inline_array = true - -[tool.setuptools] -package-dir = {"" = "src"} -include-package-data = false - -[tool.setuptools.packages.find] -where = ["src"] -namespaces = false - -[tool.setuptools.package-data] -ampform_dpd = ["py.typed"] - -[project] -name = "ampform-dpd" -description = "Symbolic expressions for Dalitz-Plot Decomposition" -authors = [{name = "Common Partial Wave Analysis", email = "compwa-admin@ep1.rub.de"}] -license = {text = "GPLv3 or later"} -classifiers = [ - "Development Status :: 3 - Alpha", - "Intended Audience :: Developers", - "Intended Audience :: Education", - "Intended Audience :: Science/Research", - "License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)", - "Natural Language :: English", - "Operating System :: OS Independent", - "Programming Language :: Python", - "Programming Language :: Python :: 3.7", - "Programming Language :: Python :: 3.8", - "Programming Language :: Python :: 3.9", - "Programming Language :: Python :: 3.10", - "Programming Language :: Python :: 3.11", - "Topic :: Scientific/Engineering", - "Topic :: Scientific/Engineering :: Physics", - "Typing :: Typed", -] -requires-python = ">=3.7" -dependencies = [ - "ampform ~=0.14.4", # Kibble and Kallen functions, perform_cached_doit - "attrs >=20.1.0", # on_setattr and https://www.attrs.org/en/stable/api.html#next-gen - "cloudpickle", - "sympy >=1.10", # module sympy.printing.numpy and array expressions with shape kwarg - "tensorwaves[jax]", - 'typing-extensions; python_version <"3.8.0"', -] -dynamic = ["version"] - -[project.readme] -file = "README.md" -content-type = "text/markdown" - -[project.urls] -Tracker = "https://github.com/ComPWA/ampform-dpd/issues" -Changelog = "https://github.com/ComPWA/ampform-dpd/releases" -Documentation = "https://compwa.github.io/ampform-dpd" -Source = "https://github.com/ComPWA/ampform-dpd" - -[project.optional-dependencies] -jax = [ - "tensorwaves[jax]", -] -numba = [ - "tensorwaves[numba]", -] -tf = [ - "tensorwaves[tf]", -] -tensorflow = [ - "ampform-dpd[tf]", -] -doc = [ - "graphviz", - "ipympl", - "ipywidgets", - 'importlib-metadata; python_version <"3.8.0"', - "matplotlib", - "myst-nb >=0.14", # nb_render_markdown_format for Markdown tables - "sphinx-book-theme", - "sphinx-codeautolink[ipython]", - "sphinx-copybutton", - "sphinx-design", - "sphinx-togglebutton", - "sphinxcontrib-bibtex", - "tensorwaves[phsp]", - "tqdm", -] -jupyter = [ - "ampform-dpd[doc]", - "jupyterlab >=3.0", - "jupyterlab-code-formatter", - "jupyterlab-lsp", - "jupyterlab-myst", - "python-lsp-server[rope]", - 'ypy-websocket <0.8.3; python_version <"3.8.0"', -] -test = [ - "nbmake", - 'nbmake <1.3; python_version <"3.8.0"', - "numpy", - "pytest >=6.0", # pyproject.toml - "pytest-cov", - "pytest-xdist", -] -format = [ - "black", -] -lint = [ - "ruff", -] -sty = [ - "ampform-dpd[format]", - "ampform-dpd[lint]", - "ampform-dpd[test]", # for pytest type hints - "docutils", - "pre-commit >=1.4.0", - "pybtex", - "sphinx", -] -dev = [ - "ampform-dpd[doc]", - "ampform-dpd[jupyter]", - "ampform-dpd[sty]", - "ampform-dpd[test]", - "sphinx-autobuild", - "tox >=1.9", # for skip_install, use_develop -] From dfaa4b2c6499061009e5de841c8feb39f3685f2c Mon Sep 17 00:00:00 2001 From: GitHub Date: Tue, 3 Oct 2023 20:10:01 +0000 Subject: [PATCH 17/27] MAINT: implement updates from pre-commit hooks --- pyproject.toml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index dc9cedf3..948a5cd0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -15,14 +15,14 @@ classifiers = [ "License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)", "Natural Language :: English", "Operating System :: OS Independent", - "Programming Language :: Python", + "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", - "Programming Language :: Python :: 3.10", - "Programming Language :: Python :: 3.11", - "Topic :: Scientific/Engineering", + "Programming Language :: Python", "Topic :: Scientific/Engineering :: Physics", + "Topic :: Scientific/Engineering", "Typing :: Typed", ] dependencies = [ @@ -52,7 +52,6 @@ doc = [ "graphviz", "ipympl", "ipywidgets", - 'importlib-metadata; python_version <"3.8.0"', "matplotlib", "myst-nb >=0.14", # nb_render_markdown_format for Markdown tables "sphinx-book-theme", @@ -63,6 +62,7 @@ doc = [ "sphinxcontrib-bibtex", "tensorwaves[phsp]", "tqdm", + 'importlib-metadata; python_version <"3.8.0"', ] format = [ "black", @@ -99,11 +99,11 @@ tensorflow = [ ] test = [ "nbmake", - 'nbmake <1.3; python_version <"3.8.0"', "numpy", "pytest >=6.0", # pyproject.toml "pytest-cov", "pytest-xdist", + 'nbmake <1.3; python_version <"3.8.0"', ] tf = [ "tensorwaves[tf]", From 3fc47b3ec78d5a4d72bedf1c3018d1d9d24574a9 Mon Sep 17 00:00:00 2001 From: Remco de Boer <29308176+redeboer@users.noreply.github.com> Date: Thu, 5 Oct 2023 16:40:07 +0200 Subject: [PATCH 18/27] MAINT: autoupdate pre-commit config --- .pre-commit-config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index b441cbb7..6c6ccb1b 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -27,7 +27,7 @@ repos: - id: trailing-whitespace - repo: https://github.com/ComPWA/repo-maintenance - rev: 0.0.202 + rev: 0.0.203 hooks: - id: check-dev-files args: @@ -102,7 +102,7 @@ repos: - id: prettier - repo: https://github.com/ComPWA/mirrors-pyright - rev: v1.1.329 + rev: v1.1.330 hooks: - id: pyright From c24133faabc3a11c3dacf7a154dce242fafa568c Mon Sep 17 00:00:00 2001 From: Remco de Boer <29308176+redeboer@users.noreply.github.com> Date: Thu, 5 Oct 2023 16:42:06 +0200 Subject: [PATCH 19/27] DX: scan all symbols in Jupyter notebooks --- .vscode/settings.json | 1 + 1 file changed, 1 insertion(+) diff --git a/.vscode/settings.json b/.vscode/settings.json index 2f83877f..f99e0219 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -35,6 +35,7 @@ "files.eol": "\n", "github-actions.workflows.pinned.workflows": [".github/workflows/ci.yml"], "livePreview.defaultPreviewPath": "docs/_build/html", + "notebook.gotoSymbols.showAllSymbols": true, "python.analysis.autoImportCompletions": false, "python.analysis.inlayHints.pytestParameters": true, "python.analysis.typeCheckingMode": "strict", From d8a1ecfca02c83080f33eb44a8daf3bcc6bd4ff8 Mon Sep 17 00:00:00 2001 From: Remco de Boer <29308176+redeboer@users.noreply.github.com> Date: Sat, 7 Oct 2023 01:09:38 +0200 Subject: [PATCH 20/27] MAINT: synchronize ComPWA dev setup --- .cspell.json | 1 + .github/workflows/pr-linting.yml | 12 ++++++------ .github/workflows/release-drafter.yml | 2 +- .gitpod.yml | 1 + .pre-commit-config.yaml | 3 ++- .taplo.toml | 1 + .vscode/extensions.json | 1 + .vscode/settings.json | 6 +++--- commitlint.config.js | 11 ----------- 9 files changed, 16 insertions(+), 22 deletions(-) delete mode 100644 commitlint.config.js diff --git a/.cspell.json b/.cspell.json index 22be7f02..cf145f65 100644 --- a/.cspell.json +++ b/.cspell.json @@ -37,6 +37,7 @@ "docs/adr/*/*", "docs/conf.py", "labels.toml", + "labels/*.toml", "Makefile", "Manifest.toml", "Project.toml", diff --git a/.github/workflows/pr-linting.yml b/.github/workflows/pr-linting.yml index e71c708d..cd3bb74f 100644 --- a/.github/workflows/pr-linting.yml +++ b/.github/workflows/pr-linting.yml @@ -1,5 +1,4 @@ name: PR linting - on: pull_request: types: @@ -15,8 +14,7 @@ jobs: name: Check labels runs-on: ubuntu-22.04 steps: - # cspell:ignore agilepathway - - uses: docker://agilepathway/pull-request-label-checker:latest + - uses: docker://agilepathway/pull-request-label-checker:latest # cspell:ignore agilepathway with: any_of: >- 🐛 Bug,✨ Feature,⚙️ Enhancement,⚠️ Interface,❗ Behavior,📝 Docs,🔨 Maintenance,🖱️ DX @@ -28,6 +26,8 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 - - run: npm install @commitlint/config-conventional - # cspell:ignore commitlint kode - - uses: JulienKode/pull-request-name-linter-action@v0.5.0 + - run: npm install @compwa/commitlint-config + - name: Create commitlint config + run: | + echo "module.exports = {extends: ['@compwa/commitlint-config']}" > commitlint.config.js + - uses: JulienKode/pull-request-name-linter-action@v0.5.0 # cspell:ignore kode diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml index d54187de..d64f197b 100644 --- a/.github/workflows/release-drafter.yml +++ b/.github/workflows/release-drafter.yml @@ -9,7 +9,7 @@ on: jobs: update_release_draft: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: release-drafter/release-drafter@v5 env: diff --git a/.gitpod.yml b/.gitpod.yml index a06228ce..94274fb1 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -17,6 +17,7 @@ vscode: - eamodio.gitlens - editorconfig.editorconfig - esbenp.prettier-vscode + - executablebookproject.myst-highlight - garaioag.garaio-vscode-unwanted-recommendations - github.vscode-github-actions - github.vscode-pull-request-github diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 6c6ccb1b..18685155 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -27,7 +27,7 @@ repos: - id: trailing-whitespace - repo: https://github.com/ComPWA/repo-maintenance - rev: 0.0.203 + rev: 0.1.0rc0 hooks: - id: check-dev-files args: @@ -37,6 +37,7 @@ repos: - --repo-name=ampform-dpd - --repo-title=AmpForm-DPD - id: colab-toc-visible + - repo: https://github.com/nbQA-dev/nbQA rev: 1.7.0 hooks: diff --git a/.taplo.toml b/.taplo.toml index 424b7469..0d0d4461 100644 --- a/.taplo.toml +++ b/.taplo.toml @@ -3,6 +3,7 @@ exclude = [ "**/Manifest.toml", "**/Project.toml", "labels*.toml", + "labels/*.toml", ] [formatting] diff --git a/.vscode/extensions.json b/.vscode/extensions.json index 5a53fe2e..0d61abf4 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -4,6 +4,7 @@ "eamodio.gitlens", "editorconfig.editorconfig", "esbenp.prettier-vscode", + "executablebookproject.myst-highlight", "garaioag.garaio-vscode-unwanted-recommendations", "github.vscode-github-actions", "github.vscode-pull-request-github", diff --git a/.vscode/settings.json b/.vscode/settings.json index f99e0219..d4f65dbd 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -3,6 +3,7 @@ "editor.formatOnSave": false }, "[git-commit]": { + "editor.rulers": [72], "rewrap.wrappingColumn": 72 }, "[json]": { @@ -14,7 +15,6 @@ "[markdown]": { "editor.defaultFormatter": "esbenp.prettier-vscode", "editor.rulers": [], - "editor.wordWrap": "bounded", "editor.wordWrapColumn": 80, "editor.wrappingIndent": "same", "editor.wrappingStrategy": "advanced" @@ -23,7 +23,8 @@ "editor.codeActionsOnSave": { "source.organizeImports": true }, - "editor.defaultFormatter": "ms-python.black-formatter" + "editor.defaultFormatter": "ms-python.black-formatter", + "editor.rulers": [88] }, "[yaml]": { "editor.defaultFormatter": "esbenp.prettier-vscode" @@ -31,7 +32,6 @@ "black-formatter.importStrategy": "fromEnvironment", "cSpell.enabled": true, "editor.formatOnSave": true, - "editor.rulers": [88], "files.eol": "\n", "github-actions.workflows.pinned.workflows": [".github/workflows/ci.yml"], "livePreview.defaultPreviewPath": "docs/_build/html", diff --git a/commitlint.config.js b/commitlint.config.js deleted file mode 100644 index d8b6bdcd..00000000 --- a/commitlint.config.js +++ /dev/null @@ -1,11 +0,0 @@ -module.exports = { - extends: ["@commitlint/config-conventional"], - rules: { - "type-case": [2, "always", ["upper-case"]], - "type-enum": [ - 2, - "always", - ["BEHAVIOR", "BREAK", "DOC", "DX", "ENH", "FEAT", "FIX", "MAINT"], - ], - }, -}; From 2ba608154e75139d5afdf338532b400cdc8e49a8 Mon Sep 17 00:00:00 2001 From: GitHub Date: Fri, 6 Oct 2023 23:11:58 +0000 Subject: [PATCH 21/27] MAINT: update pip constraints and pre-commit --- .constraints/py3.10.txt | 22 +++++++++++----------- .constraints/py3.11.txt | 22 +++++++++++----------- .constraints/py3.8.txt | 18 +++++++++--------- .constraints/py3.9.txt | 22 +++++++++++----------- 4 files changed, 42 insertions(+), 42 deletions(-) diff --git a/.constraints/py3.10.txt b/.constraints/py3.10.txt index 4e36fe41..19ffa520 100644 --- a/.constraints/py3.10.txt +++ b/.constraints/py3.10.txt @@ -21,7 +21,7 @@ babel==2.13.0 backcall==0.2.0 beautifulsoup4==4.12.2 black==23.9.1 -bleach==6.0.0 +bleach==6.1.0 cachetools==5.3.1 certifi==2023.7.22 cffi==1.16.0 @@ -50,7 +50,7 @@ executing==2.0.0 fastjsonschema==2.18.1 filelock==3.12.4 flatbuffers==23.5.26 -fonttools==4.43.0 +fonttools==4.43.1 fqdn==1.5.1 gast==0.5.4 google-auth==2.23.2 @@ -73,8 +73,8 @@ ipython==8.16.1 ipython-genutils==0.2.0 ipywidgets==8.1.1 isoduration==20.11.0 -jax==0.4.16 -jaxlib==0.4.16 +jax==0.4.17 +jaxlib==0.4.17 jedi==0.19.1 jinja2==3.1.2 json5==0.9.14 @@ -103,7 +103,7 @@ kiwisolver==1.4.5 latexcodec==2.0.1 libclang==16.0.6 livereload==2.6.3 -markdown==3.4.4 +markdown==3.5 markdown-it-py==2.2.0 markupsafe==2.1.3 matplotlib==3.8.0 @@ -118,7 +118,7 @@ myst-nb==0.17.2 myst-parser==0.18.1 nbclassic==1.0.0 nbclient==0.6.8 -nbconvert==7.8.0 +nbconvert==7.9.2 nbformat==5.9.2 nbmake==1.4.5 nest-asyncio==1.5.8 @@ -143,7 +143,7 @@ pluggy==1.3.0 pre-commit==3.4.0 prometheus-client==0.17.1 prompt-toolkit==3.0.39 -protobuf==4.24.3 +protobuf==4.24.4 psutil==5.9.5 ptyprocess==0.7.0 pure-eval==0.2.2 @@ -163,7 +163,7 @@ python-constraint==1.4.0 python-dateutil==2.8.2 python-json-logger==2.0.7 python-lsp-jsonrpc==1.1.2 -python-lsp-server==1.8.0 +python-lsp-server==1.8.1 pytoolconfig==1.2.5 pyyaml==6.0.1 pyzmq==24.0.1 @@ -174,7 +174,7 @@ requests-oauthlib==1.3.1 rfc3339-validator==0.1.4 rfc3986-validator==0.1.1 rope==1.10.0 -rpds-py==0.10.3 +rpds-py==0.10.4 rsa==4.9 ruff==0.0.292 scipy==1.11.3 @@ -215,7 +215,7 @@ tomli==2.0.1 tornado==6.3.3 tox==4.11.3 tqdm==4.66.1 -traitlets==5.11.1 +traitlets==5.11.2 types-python-dateutil==2.8.19.14 typing-extensions==4.5.0 ujson==5.8.0 @@ -230,7 +230,7 @@ werkzeug==3.0.0 wheel==0.41.2 widgetsnbextension==4.0.9 wrapt==1.14.1 -y-py==0.6.0 +y-py==0.6.2 ypy-websocket==0.8.4 zipp==3.17.0 diff --git a/.constraints/py3.11.txt b/.constraints/py3.11.txt index d45bcd0a..6501963b 100644 --- a/.constraints/py3.11.txt +++ b/.constraints/py3.11.txt @@ -21,7 +21,7 @@ babel==2.13.0 backcall==0.2.0 beautifulsoup4==4.12.2 black==23.9.1 -bleach==6.0.0 +bleach==6.1.0 cachetools==5.3.1 certifi==2023.7.22 cffi==1.16.0 @@ -49,7 +49,7 @@ executing==2.0.0 fastjsonschema==2.18.1 filelock==3.12.4 flatbuffers==23.5.26 -fonttools==4.43.0 +fonttools==4.43.1 fqdn==1.5.1 gast==0.5.4 google-auth==2.23.2 @@ -72,8 +72,8 @@ ipython==8.16.1 ipython-genutils==0.2.0 ipywidgets==8.1.1 isoduration==20.11.0 -jax==0.4.16 -jaxlib==0.4.16 +jax==0.4.17 +jaxlib==0.4.17 jedi==0.19.1 jinja2==3.1.2 json5==0.9.14 @@ -102,7 +102,7 @@ kiwisolver==1.4.5 latexcodec==2.0.1 libclang==16.0.6 livereload==2.6.3 -markdown==3.4.4 +markdown==3.5 markdown-it-py==2.2.0 markupsafe==2.1.3 matplotlib==3.8.0 @@ -117,7 +117,7 @@ myst-nb==0.17.2 myst-parser==0.18.1 nbclassic==1.0.0 nbclient==0.6.8 -nbconvert==7.8.0 +nbconvert==7.9.2 nbformat==5.9.2 nbmake==1.4.5 nest-asyncio==1.5.8 @@ -142,7 +142,7 @@ pluggy==1.3.0 pre-commit==3.4.0 prometheus-client==0.17.1 prompt-toolkit==3.0.39 -protobuf==4.24.3 +protobuf==4.24.4 psutil==5.9.5 ptyprocess==0.7.0 pure-eval==0.2.2 @@ -162,7 +162,7 @@ python-constraint==1.4.0 python-dateutil==2.8.2 python-json-logger==2.0.7 python-lsp-jsonrpc==1.1.2 -python-lsp-server==1.8.0 +python-lsp-server==1.8.1 pytoolconfig==1.2.5 pyyaml==6.0.1 pyzmq==24.0.1 @@ -173,7 +173,7 @@ requests-oauthlib==1.3.1 rfc3339-validator==0.1.4 rfc3986-validator==0.1.1 rope==1.10.0 -rpds-py==0.10.3 +rpds-py==0.10.4 rsa==4.9 ruff==0.0.292 scipy==1.11.3 @@ -213,7 +213,7 @@ tinycss2==1.2.1 tornado==6.3.3 tox==4.11.3 tqdm==4.66.1 -traitlets==5.11.1 +traitlets==5.11.2 types-python-dateutil==2.8.19.14 typing-extensions==4.5.0 ujson==5.8.0 @@ -228,7 +228,7 @@ werkzeug==3.0.0 wheel==0.41.2 widgetsnbextension==4.0.9 wrapt==1.14.1 -y-py==0.6.0 +y-py==0.6.2 ypy-websocket==0.8.4 zipp==3.17.0 diff --git a/.constraints/py3.8.txt b/.constraints/py3.8.txt index 94938805..2e6c2a18 100644 --- a/.constraints/py3.8.txt +++ b/.constraints/py3.8.txt @@ -21,7 +21,7 @@ babel==2.13.0 backcall==0.2.0 beautifulsoup4==4.12.2 black==23.9.1 -bleach==6.0.0 +bleach==6.1.0 cachetools==5.3.1 certifi==2023.7.22 cffi==1.16.0 @@ -50,7 +50,7 @@ executing==2.0.0 fastjsonschema==2.18.1 filelock==3.12.4 flatbuffers==23.5.26 -fonttools==4.43.0 +fonttools==4.43.1 fqdn==1.5.1 gast==0.4.0 google-auth==2.23.2 @@ -104,7 +104,7 @@ kiwisolver==1.4.5 latexcodec==2.0.1 libclang==16.0.6 livereload==2.6.3 -markdown==3.4.4 +markdown==3.5 markdown-it-py==2.2.0 markupsafe==2.1.3 matplotlib==3.7.3 @@ -119,7 +119,7 @@ myst-nb==0.17.2 myst-parser==0.18.1 nbclassic==1.0.0 nbclient==0.6.8 -nbconvert==7.8.0 +nbconvert==7.9.2 nbformat==5.9.2 nbmake==1.4.5 nest-asyncio==1.5.8 @@ -145,7 +145,7 @@ pluggy==1.3.0 pre-commit==3.4.0 prometheus-client==0.17.1 prompt-toolkit==3.0.39 -protobuf==4.24.3 +protobuf==4.24.4 psutil==5.9.5 ptyprocess==0.7.0 pure-eval==0.2.2 @@ -165,7 +165,7 @@ python-constraint==1.4.0 python-dateutil==2.8.2 python-json-logger==2.0.7 python-lsp-jsonrpc==1.1.2 -python-lsp-server==1.8.0 +python-lsp-server==1.8.1 pytoolconfig==1.2.5 pytz==2023.3.post1 pyyaml==6.0.1 @@ -177,7 +177,7 @@ requests-oauthlib==1.3.1 rfc3339-validator==0.1.4 rfc3986-validator==0.1.1 rope==1.10.0 -rpds-py==0.10.3 +rpds-py==0.10.4 rsa==4.9 ruff==0.0.292 scipy==1.10.1 @@ -218,7 +218,7 @@ tomli==2.0.1 tornado==6.3.3 tox==4.11.3 tqdm==4.66.1 -traitlets==5.11.1 +traitlets==5.11.2 types-python-dateutil==2.8.19.14 typing-extensions==4.5.0 ujson==5.8.0 @@ -233,7 +233,7 @@ werkzeug==3.0.0 wheel==0.41.2 widgetsnbextension==4.0.9 wrapt==1.15.0 -y-py==0.6.0 +y-py==0.6.2 ypy-websocket==0.8.4 zipp==3.17.0 diff --git a/.constraints/py3.9.txt b/.constraints/py3.9.txt index 6283c4df..03f3105b 100644 --- a/.constraints/py3.9.txt +++ b/.constraints/py3.9.txt @@ -21,7 +21,7 @@ babel==2.13.0 backcall==0.2.0 beautifulsoup4==4.12.2 black==23.9.1 -bleach==6.0.0 +bleach==6.1.0 cachetools==5.3.1 certifi==2023.7.22 cffi==1.16.0 @@ -50,7 +50,7 @@ executing==2.0.0 fastjsonschema==2.18.1 filelock==3.12.4 flatbuffers==23.5.26 -fonttools==4.43.0 +fonttools==4.43.1 fqdn==1.5.1 gast==0.5.4 google-auth==2.23.2 @@ -74,8 +74,8 @@ ipython==8.16.1 ipython-genutils==0.2.0 ipywidgets==8.1.1 isoduration==20.11.0 -jax==0.4.16 -jaxlib==0.4.16 +jax==0.4.17 +jaxlib==0.4.17 jedi==0.19.1 jinja2==3.1.2 json5==0.9.14 @@ -104,7 +104,7 @@ kiwisolver==1.4.5 latexcodec==2.0.1 libclang==16.0.6 livereload==2.6.3 -markdown==3.4.4 +markdown==3.5 markdown-it-py==2.2.0 markupsafe==2.1.3 matplotlib==3.8.0 @@ -119,7 +119,7 @@ myst-nb==0.17.2 myst-parser==0.18.1 nbclassic==1.0.0 nbclient==0.6.8 -nbconvert==7.8.0 +nbconvert==7.9.2 nbformat==5.9.2 nbmake==1.4.5 nest-asyncio==1.5.8 @@ -144,7 +144,7 @@ pluggy==1.3.0 pre-commit==3.4.0 prometheus-client==0.17.1 prompt-toolkit==3.0.39 -protobuf==4.24.3 +protobuf==4.24.4 psutil==5.9.5 ptyprocess==0.7.0 pure-eval==0.2.2 @@ -164,7 +164,7 @@ python-constraint==1.4.0 python-dateutil==2.8.2 python-json-logger==2.0.7 python-lsp-jsonrpc==1.1.2 -python-lsp-server==1.8.0 +python-lsp-server==1.8.1 pytoolconfig==1.2.5 pyyaml==6.0.1 pyzmq==24.0.1 @@ -175,7 +175,7 @@ requests-oauthlib==1.3.1 rfc3339-validator==0.1.4 rfc3986-validator==0.1.1 rope==1.10.0 -rpds-py==0.10.3 +rpds-py==0.10.4 rsa==4.9 ruff==0.0.292 scipy==1.11.3 @@ -216,7 +216,7 @@ tomli==2.0.1 tornado==6.3.3 tox==4.11.3 tqdm==4.66.1 -traitlets==5.11.1 +traitlets==5.11.2 types-python-dateutil==2.8.19.14 typing-extensions==4.5.0 ujson==5.8.0 @@ -231,7 +231,7 @@ werkzeug==3.0.0 wheel==0.41.2 widgetsnbextension==4.0.9 wrapt==1.14.1 -y-py==0.6.0 +y-py==0.6.2 ypy-websocket==0.8.4 zipp==3.17.0 From f74a2e06beb6f091bd2479a27e9bab513551012e Mon Sep 17 00:00:00 2001 From: Remco de Boer <29308176+redeboer@users.noreply.github.com> Date: Mon, 9 Oct 2023 10:23:30 +0200 Subject: [PATCH 22/27] MAINT: remove quotations from EditorConfig version --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 18685155..0838907d 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -62,7 +62,7 @@ repos: - id: cspell - repo: https://github.com/editorconfig-checker/editorconfig-checker.python - rev: "2.7.2" + rev: 2.7.2 hooks: - id: editorconfig-checker name: editorconfig From 2c02faf81a692fc00cbf861e3c0dd2b63aeace2e Mon Sep 17 00:00:00 2001 From: Remco de Boer <29308176+redeboer@users.noreply.github.com> Date: Mon, 9 Oct 2023 10:24:07 +0200 Subject: [PATCH 23/27] MAINT: autoupdate pre-commit hooks --- .pre-commit-config.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 0838907d..d98ce22c 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -12,7 +12,7 @@ repos: - id: check-useless-excludes - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.4.0 + rev: v4.5.0 hooks: - id: check-ast - id: check-case-conflict @@ -27,7 +27,7 @@ repos: - id: trailing-whitespace - repo: https://github.com/ComPWA/repo-maintenance - rev: 0.1.0rc0 + rev: 0.1.0rc1 hooks: - id: check-dev-files args: @@ -108,7 +108,7 @@ repos: - id: pyright - repo: https://github.com/asottile/pyupgrade - rev: v3.14.0 + rev: v3.15.0 hooks: - id: pyupgrade args: From 3f220ed1049b441e285094d381dac7518fcba826 Mon Sep 17 00:00:00 2001 From: Remco de Boer <29308176+redeboer@users.noreply.github.com> Date: Mon, 9 Oct 2023 11:56:35 +0200 Subject: [PATCH 24/27] MAINT: autoupdate pre-commit hooks --- .pre-commit-config.yaml | 2 +- .taplo.toml | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index d98ce22c..5ab7185c 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -27,7 +27,7 @@ repos: - id: trailing-whitespace - repo: https://github.com/ComPWA/repo-maintenance - rev: 0.1.0rc1 + rev: 0.1.0rc2 hooks: - id: check-dev-files args: diff --git a/.taplo.toml b/.taplo.toml index 0d0d4461..0db1df7c 100644 --- a/.taplo.toml +++ b/.taplo.toml @@ -1,11 +1,3 @@ -exclude = [ - "**/Cargo.toml", - "**/Manifest.toml", - "**/Project.toml", - "labels*.toml", - "labels/*.toml", -] - [formatting] align_comments = false align_entries = false From fd6ec449392a698d9a138a71bf7d95469eb67aa1 Mon Sep 17 00:00:00 2001 From: GitHub Date: Mon, 9 Oct 2023 09:59:40 +0000 Subject: [PATCH 25/27] MAINT: update pip constraints and pre-commit --- .constraints/py3.10.txt | 27 +++++++++------------------ .constraints/py3.11.txt | 27 +++++++++------------------ .constraints/py3.8.txt | 23 +++++++---------------- .constraints/py3.9.txt | 27 +++++++++------------------ 4 files changed, 34 insertions(+), 70 deletions(-) diff --git a/.constraints/py3.10.txt b/.constraints/py3.10.txt index 19ffa520..3998db0b 100644 --- a/.constraints/py3.10.txt +++ b/.constraints/py3.10.txt @@ -6,8 +6,6 @@ # absl-py==2.0.0 accessible-pygments==0.0.4 -aiofiles==22.1.0 -aiosqlite==0.19.0 alabaster==0.7.13 ampform==0.14.6 anyio==4.0.0 @@ -16,6 +14,7 @@ argon2-cffi-bindings==21.2.0 arrow==1.3.0 asttokens==2.4.0 astunparse==1.6.3 +async-lru==2.0.4 attrs==23.1.0 babel==2.13.0 backcall==0.2.0 @@ -34,7 +33,7 @@ colorama==0.4.6 comm==0.1.4 contourpy==1.1.1 coverage==7.3.2 -cycler==0.12.0 +cycler==0.12.1 debugpy==1.8.0 decorator==5.1.1 defusedxml==0.7.1 @@ -43,7 +42,6 @@ distlib==0.3.7 dm-tree==0.1.8 docstring-to-markdown==0.12 docutils==0.17.1 -entrypoints==0.4 exceptiongroup==1.1.3 execnet==2.0.2 executing==2.0.0 @@ -73,8 +71,8 @@ ipython==8.16.1 ipython-genutils==0.2.0 ipywidgets==8.1.1 isoduration==20.11.0 -jax==0.4.17 -jaxlib==0.4.17 +jax==0.4.18 +jaxlib==0.4.18 jedi==0.19.1 jinja2==3.1.2 json5==0.9.14 @@ -82,18 +80,15 @@ jsonpointer==2.4 jsonschema==4.19.1 jsonschema-specifications==2023.7.1 jupyter-cache==0.6.1 -jupyter-client==7.4.9 +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-fileid==0.9.0 jupyter-server-terminals==0.4.4 -jupyter-server-ydoc==0.8.0 -jupyter-ydoc==0.2.5 -jupyterlab==3.6.6 +jupyterlab==4.0.6 jupyterlab-code-formatter==2.2.1 -jupyterlab-lsp==4.3.0 +jupyterlab-lsp==5.0.0 jupyterlab-myst==2.0.2 jupyterlab-pygments==0.2.2 jupyterlab-server==2.25.0 @@ -116,14 +111,12 @@ mpmath==1.3.0 mypy-extensions==1.0.0 myst-nb==0.17.2 myst-parser==0.18.1 -nbclassic==1.0.0 nbclient==0.6.8 nbconvert==7.9.2 nbformat==5.9.2 nbmake==1.4.5 nest-asyncio==1.5.8 nodeenv==1.8.0 -notebook==6.5.6 notebook-shim==0.2.3 numpy==1.26.0 oauthlib==3.2.2 @@ -166,7 +159,7 @@ python-lsp-jsonrpc==1.1.2 python-lsp-server==1.8.1 pytoolconfig==1.2.5 pyyaml==6.0.1 -pyzmq==24.0.1 +pyzmq==25.1.1 qrules==0.9.8 referencing==0.30.2 requests==2.31.0 @@ -225,13 +218,11 @@ virtualenv==20.24.5 wcwidth==0.2.8 webcolors==1.13 webencodings==0.5.1 -websocket-client==1.6.3 +websocket-client==1.6.4 werkzeug==3.0.0 wheel==0.41.2 widgetsnbextension==4.0.9 wrapt==1.14.1 -y-py==0.6.2 -ypy-websocket==0.8.4 zipp==3.17.0 # The following packages are considered to be unsafe in a requirements file: diff --git a/.constraints/py3.11.txt b/.constraints/py3.11.txt index 6501963b..1aa57fe7 100644 --- a/.constraints/py3.11.txt +++ b/.constraints/py3.11.txt @@ -6,8 +6,6 @@ # absl-py==2.0.0 accessible-pygments==0.0.4 -aiofiles==22.1.0 -aiosqlite==0.19.0 alabaster==0.7.13 ampform==0.14.6 anyio==4.0.0 @@ -16,6 +14,7 @@ argon2-cffi-bindings==21.2.0 arrow==1.3.0 asttokens==2.4.0 astunparse==1.6.3 +async-lru==2.0.4 attrs==23.1.0 babel==2.13.0 backcall==0.2.0 @@ -34,7 +33,7 @@ colorama==0.4.6 comm==0.1.4 contourpy==1.1.1 coverage==7.3.2 -cycler==0.12.0 +cycler==0.12.1 debugpy==1.8.0 decorator==5.1.1 defusedxml==0.7.1 @@ -43,7 +42,6 @@ distlib==0.3.7 dm-tree==0.1.8 docstring-to-markdown==0.12 docutils==0.17.1 -entrypoints==0.4 execnet==2.0.2 executing==2.0.0 fastjsonschema==2.18.1 @@ -72,8 +70,8 @@ ipython==8.16.1 ipython-genutils==0.2.0 ipywidgets==8.1.1 isoduration==20.11.0 -jax==0.4.17 -jaxlib==0.4.17 +jax==0.4.18 +jaxlib==0.4.18 jedi==0.19.1 jinja2==3.1.2 json5==0.9.14 @@ -81,18 +79,15 @@ jsonpointer==2.4 jsonschema==4.19.1 jsonschema-specifications==2023.7.1 jupyter-cache==0.6.1 -jupyter-client==7.4.9 +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-fileid==0.9.0 jupyter-server-terminals==0.4.4 -jupyter-server-ydoc==0.8.0 -jupyter-ydoc==0.2.5 -jupyterlab==3.6.6 +jupyterlab==4.0.6 jupyterlab-code-formatter==2.2.1 -jupyterlab-lsp==4.3.0 +jupyterlab-lsp==5.0.0 jupyterlab-myst==2.0.2 jupyterlab-pygments==0.2.2 jupyterlab-server==2.25.0 @@ -115,14 +110,12 @@ mpmath==1.3.0 mypy-extensions==1.0.0 myst-nb==0.17.2 myst-parser==0.18.1 -nbclassic==1.0.0 nbclient==0.6.8 nbconvert==7.9.2 nbformat==5.9.2 nbmake==1.4.5 nest-asyncio==1.5.8 nodeenv==1.8.0 -notebook==6.5.6 notebook-shim==0.2.3 numpy==1.26.0 oauthlib==3.2.2 @@ -165,7 +158,7 @@ python-lsp-jsonrpc==1.1.2 python-lsp-server==1.8.1 pytoolconfig==1.2.5 pyyaml==6.0.1 -pyzmq==24.0.1 +pyzmq==25.1.1 qrules==0.9.8 referencing==0.30.2 requests==2.31.0 @@ -223,13 +216,11 @@ virtualenv==20.24.5 wcwidth==0.2.8 webcolors==1.13 webencodings==0.5.1 -websocket-client==1.6.3 +websocket-client==1.6.4 werkzeug==3.0.0 wheel==0.41.2 widgetsnbextension==4.0.9 wrapt==1.14.1 -y-py==0.6.2 -ypy-websocket==0.8.4 zipp==3.17.0 # The following packages are considered to be unsafe in a requirements file: diff --git a/.constraints/py3.8.txt b/.constraints/py3.8.txt index 2e6c2a18..1469fb17 100644 --- a/.constraints/py3.8.txt +++ b/.constraints/py3.8.txt @@ -6,8 +6,6 @@ # absl-py==2.0.0 accessible-pygments==0.0.4 -aiofiles==22.1.0 -aiosqlite==0.19.0 alabaster==0.7.13 ampform==0.14.6 anyio==4.0.0 @@ -16,6 +14,7 @@ argon2-cffi-bindings==21.2.0 arrow==1.3.0 asttokens==2.4.0 astunparse==1.6.3 +async-lru==2.0.4 attrs==23.1.0 babel==2.13.0 backcall==0.2.0 @@ -34,7 +33,7 @@ colorama==0.4.6 comm==0.1.4 contourpy==1.1.1 coverage==7.3.2 -cycler==0.12.0 +cycler==0.12.1 debugpy==1.8.0 decorator==5.1.1 defusedxml==0.7.1 @@ -43,7 +42,6 @@ distlib==0.3.7 dm-tree==0.1.8 docstring-to-markdown==0.12 docutils==0.17.1 -entrypoints==0.4 exceptiongroup==1.1.3 execnet==2.0.2 executing==2.0.0 @@ -83,18 +81,15 @@ jsonpointer==2.4 jsonschema==4.19.1 jsonschema-specifications==2023.7.1 jupyter-cache==0.6.1 -jupyter-client==7.4.9 +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-fileid==0.9.0 jupyter-server-terminals==0.4.4 -jupyter-server-ydoc==0.8.0 -jupyter-ydoc==0.2.5 -jupyterlab==3.6.6 +jupyterlab==4.0.6 jupyterlab-code-formatter==2.2.1 -jupyterlab-lsp==4.3.0 +jupyterlab-lsp==5.0.0 jupyterlab-myst==2.0.2 jupyterlab-pygments==0.2.2 jupyterlab-server==2.25.0 @@ -117,14 +112,12 @@ mpmath==1.3.0 mypy-extensions==1.0.0 myst-nb==0.17.2 myst-parser==0.18.1 -nbclassic==1.0.0 nbclient==0.6.8 nbconvert==7.9.2 nbformat==5.9.2 nbmake==1.4.5 nest-asyncio==1.5.8 nodeenv==1.8.0 -notebook==6.5.6 notebook-shim==0.2.3 numpy==1.24.3 oauthlib==3.2.2 @@ -169,7 +162,7 @@ python-lsp-server==1.8.1 pytoolconfig==1.2.5 pytz==2023.3.post1 pyyaml==6.0.1 -pyzmq==24.0.1 +pyzmq==25.1.1 qrules==0.9.8 referencing==0.30.2 requests==2.31.0 @@ -228,13 +221,11 @@ virtualenv==20.24.5 wcwidth==0.2.8 webcolors==1.13 webencodings==0.5.1 -websocket-client==1.6.3 +websocket-client==1.6.4 werkzeug==3.0.0 wheel==0.41.2 widgetsnbextension==4.0.9 wrapt==1.15.0 -y-py==0.6.2 -ypy-websocket==0.8.4 zipp==3.17.0 # The following packages are considered to be unsafe in a requirements file: diff --git a/.constraints/py3.9.txt b/.constraints/py3.9.txt index 03f3105b..2e958e32 100644 --- a/.constraints/py3.9.txt +++ b/.constraints/py3.9.txt @@ -6,8 +6,6 @@ # absl-py==2.0.0 accessible-pygments==0.0.4 -aiofiles==22.1.0 -aiosqlite==0.19.0 alabaster==0.7.13 ampform==0.14.6 anyio==4.0.0 @@ -16,6 +14,7 @@ argon2-cffi-bindings==21.2.0 arrow==1.3.0 asttokens==2.4.0 astunparse==1.6.3 +async-lru==2.0.4 attrs==23.1.0 babel==2.13.0 backcall==0.2.0 @@ -34,7 +33,7 @@ colorama==0.4.6 comm==0.1.4 contourpy==1.1.1 coverage==7.3.2 -cycler==0.12.0 +cycler==0.12.1 debugpy==1.8.0 decorator==5.1.1 defusedxml==0.7.1 @@ -43,7 +42,6 @@ distlib==0.3.7 dm-tree==0.1.8 docstring-to-markdown==0.12 docutils==0.17.1 -entrypoints==0.4 exceptiongroup==1.1.3 execnet==2.0.2 executing==2.0.0 @@ -74,8 +72,8 @@ ipython==8.16.1 ipython-genutils==0.2.0 ipywidgets==8.1.1 isoduration==20.11.0 -jax==0.4.17 -jaxlib==0.4.17 +jax==0.4.18 +jaxlib==0.4.18 jedi==0.19.1 jinja2==3.1.2 json5==0.9.14 @@ -83,18 +81,15 @@ jsonpointer==2.4 jsonschema==4.19.1 jsonschema-specifications==2023.7.1 jupyter-cache==0.6.1 -jupyter-client==7.4.9 +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-fileid==0.9.0 jupyter-server-terminals==0.4.4 -jupyter-server-ydoc==0.8.0 -jupyter-ydoc==0.2.5 -jupyterlab==3.6.6 +jupyterlab==4.0.6 jupyterlab-code-formatter==2.2.1 -jupyterlab-lsp==4.3.0 +jupyterlab-lsp==5.0.0 jupyterlab-myst==2.0.2 jupyterlab-pygments==0.2.2 jupyterlab-server==2.25.0 @@ -117,14 +112,12 @@ mpmath==1.3.0 mypy-extensions==1.0.0 myst-nb==0.17.2 myst-parser==0.18.1 -nbclassic==1.0.0 nbclient==0.6.8 nbconvert==7.9.2 nbformat==5.9.2 nbmake==1.4.5 nest-asyncio==1.5.8 nodeenv==1.8.0 -notebook==6.5.6 notebook-shim==0.2.3 numpy==1.26.0 oauthlib==3.2.2 @@ -167,7 +160,7 @@ python-lsp-jsonrpc==1.1.2 python-lsp-server==1.8.1 pytoolconfig==1.2.5 pyyaml==6.0.1 -pyzmq==24.0.1 +pyzmq==25.1.1 qrules==0.9.8 referencing==0.30.2 requests==2.31.0 @@ -226,13 +219,11 @@ virtualenv==20.24.5 wcwidth==0.2.8 webcolors==1.13 webencodings==0.5.1 -websocket-client==1.6.3 +websocket-client==1.6.4 werkzeug==3.0.0 wheel==0.41.2 widgetsnbextension==4.0.9 wrapt==1.14.1 -y-py==0.6.2 -ypy-websocket==0.8.4 zipp==3.17.0 # The following packages are considered to be unsafe in a requirements file: From ea891baf32ebef39389408fc200755a94779c7db Mon Sep 17 00:00:00 2001 From: Remco de Boer <29308176+redeboer@users.noreply.github.com> Date: Mon, 9 Oct 2023 17:53:02 +0200 Subject: [PATCH 26/27] MAINT: autoupdate pre-commit config --- .cspell.json | 25 ++----------------------- .pre-commit-config.yaml | 2 +- 2 files changed, 3 insertions(+), 24 deletions(-) diff --git a/.cspell.json b/.cspell.json index cf145f65..037aad0a 100644 --- a/.cspell.json +++ b/.cspell.json @@ -13,42 +13,21 @@ "transisions" ], "ignorePaths": [ + "**/*.bib", "**/.cspell.json", - "*.bib", - "*.ico", - "*.root", - "*.rst_t", - "*.svg", - "*particle*.*ml", ".constraints/*.txt", ".editorconfig", ".gitignore", ".gitpod.*", - ".mypy.ini", ".pre-commit-config.yaml", ".prettierignore", - ".readthedocs.yml", ".vscode/*", ".vscode/.gitignore", - "CITATION.cff", "codecov.yml", - "Dockerfile", "docs/_templates/*", - "docs/adr/*/*", "docs/conf.py", - "labels.toml", - "labels/*.toml", - "Makefile", - "Manifest.toml", - "Project.toml", "pyproject.toml", - "pyrightconfig.json", - "pytest.ini", - "requirements*.txt", - "setup.cfg", - "setup.py", - "tox.ini", - "typings" + "tox.ini" ], "ignoreWords": [ "Jpsi", diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 5ab7185c..c2f20dfd 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -27,7 +27,7 @@ repos: - id: trailing-whitespace - repo: https://github.com/ComPWA/repo-maintenance - rev: 0.1.0rc2 + rev: 0.1.0 hooks: - id: check-dev-files args: From 41e9cd0b34f97a44299ec061327e579929403847 Mon Sep 17 00:00:00 2001 From: GitHub Date: Mon, 9 Oct 2023 15:55:33 +0000 Subject: [PATCH 27/27] MAINT: update pip constraints and pre-commit --- .constraints/py3.10.txt | 4 ++-- .constraints/py3.11.txt | 4 ++-- .constraints/py3.8.txt | 4 ++-- .constraints/py3.9.txt | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.constraints/py3.10.txt b/.constraints/py3.10.txt index 3998db0b..c3044fbc 100644 --- a/.constraints/py3.10.txt +++ b/.constraints/py3.10.txt @@ -57,7 +57,7 @@ google-pasta==0.2.0 graphviz==0.20.1 greenlet==3.0.0 grpcio==1.59.0 -h5py==3.9.0 +h5py==3.10.0 hepunits==2.3.2 identify==2.5.30 idna==3.4 @@ -156,7 +156,7 @@ python-constraint==1.4.0 python-dateutil==2.8.2 python-json-logger==2.0.7 python-lsp-jsonrpc==1.1.2 -python-lsp-server==1.8.1 +python-lsp-server==1.8.2 pytoolconfig==1.2.5 pyyaml==6.0.1 pyzmq==25.1.1 diff --git a/.constraints/py3.11.txt b/.constraints/py3.11.txt index 1aa57fe7..09d566b8 100644 --- a/.constraints/py3.11.txt +++ b/.constraints/py3.11.txt @@ -56,7 +56,7 @@ google-pasta==0.2.0 graphviz==0.20.1 greenlet==3.0.0 grpcio==1.59.0 -h5py==3.9.0 +h5py==3.10.0 hepunits==2.3.2 identify==2.5.30 idna==3.4 @@ -155,7 +155,7 @@ python-constraint==1.4.0 python-dateutil==2.8.2 python-json-logger==2.0.7 python-lsp-jsonrpc==1.1.2 -python-lsp-server==1.8.1 +python-lsp-server==1.8.2 pytoolconfig==1.2.5 pyyaml==6.0.1 pyzmq==25.1.1 diff --git a/.constraints/py3.8.txt b/.constraints/py3.8.txt index 1469fb17..7a3182b3 100644 --- a/.constraints/py3.8.txt +++ b/.constraints/py3.8.txt @@ -57,7 +57,7 @@ google-pasta==0.2.0 graphviz==0.20.1 greenlet==3.0.0 grpcio==1.59.0 -h5py==3.9.0 +h5py==3.10.0 hepunits==2.3.2 identify==2.5.30 idna==3.4 @@ -158,7 +158,7 @@ python-constraint==1.4.0 python-dateutil==2.8.2 python-json-logger==2.0.7 python-lsp-jsonrpc==1.1.2 -python-lsp-server==1.8.1 +python-lsp-server==1.8.2 pytoolconfig==1.2.5 pytz==2023.3.post1 pyyaml==6.0.1 diff --git a/.constraints/py3.9.txt b/.constraints/py3.9.txt index 2e958e32..b512a957 100644 --- a/.constraints/py3.9.txt +++ b/.constraints/py3.9.txt @@ -57,7 +57,7 @@ google-pasta==0.2.0 graphviz==0.20.1 greenlet==3.0.0 grpcio==1.59.0 -h5py==3.9.0 +h5py==3.10.0 hepunits==2.3.2 identify==2.5.30 idna==3.4 @@ -157,7 +157,7 @@ python-constraint==1.4.0 python-dateutil==2.8.2 python-json-logger==2.0.7 python-lsp-jsonrpc==1.1.2 -python-lsp-server==1.8.1 +python-lsp-server==1.8.2 pytoolconfig==1.2.5 pyyaml==6.0.1 pyzmq==25.1.1