From 7584e6c225e76cefdd4fceb1977fffa934feb94d Mon Sep 17 00:00:00 2001 From: GitHub Date: Wed, 27 Sep 2023 13:23:30 +0000 Subject: [PATCH 01/39] MAINT: update pip constraints and pre-commit --- .constraints/py3.10.txt | 62 +++++++++++++++++++-------------------- .constraints/py3.11.txt | 62 +++++++++++++++++++-------------------- .constraints/py3.7.txt | 20 ++++++------- .constraints/py3.8.txt | 62 +++++++++++++++++++-------------------- .constraints/py3.9.txt | 64 ++++++++++++++++++++--------------------- .pre-commit-config.yaml | 10 +++---- 6 files changed, 140 insertions(+), 140 deletions(-) diff --git a/.constraints/py3.10.txt b/.constraints/py3.10.txt index fe0aedd6b..501107950 100644 --- a/.constraints/py3.10.txt +++ b/.constraints/py3.10.txt @@ -17,7 +17,7 @@ attrs==23.1.0 babel==2.12.1 backcall==0.2.0 beautifulsoup4==4.12.2 -black==23.9.0 +black==23.9.1 bleach==6.0.0 cachetools==5.3.1 certifi==2023.7.22 @@ -28,10 +28,10 @@ charset-normalizer==3.2.0 click==8.1.7 colorama==0.4.6 comm==0.1.4 -contourpy==1.1.0 +contourpy==1.1.1 coverage==7.3.1 cycler==0.11.0 -debugpy==1.7.0 +debugpy==1.8.0 decorator==5.1.1 defusedxml==0.7.1 deprecated==1.2.14 @@ -43,14 +43,14 @@ exceptiongroup==1.1.3 execnet==2.0.2 executing==1.2.0 fastjsonschema==2.18.0 -filelock==3.12.3 +filelock==3.12.4 fonttools==4.42.1 fqdn==1.5.1 gprof2dot==2022.7.29 graphviz==0.20.1 greenlet==2.0.2 hepunits==2.3.2 -identify==2.5.27 +identify==2.5.29 idna==3.4 imagesize==1.4.1 importlib-metadata==6.8.0 @@ -59,17 +59,17 @@ ipykernel==6.25.2 ipympl==0.9.3 ipython==8.15.0 ipython-genutils==0.2.0 -ipywidgets==8.1.0 +ipywidgets==8.1.1 isoduration==20.11.0 jedi==0.19.0 jinja2==3.1.2 json5==0.9.14 jsonpointer==2.4 -jsonschema==4.19.0 +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 @@ -77,19 +77,19 @@ 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.2.0 +jupyterlab-lsp==4.3.0 jupyterlab-myst==2.0.2 jupyterlab-pygments==0.2.2 -jupyterlab-server==2.24.0 -jupyterlab-widgets==3.0.8 +jupyterlab-server==2.25.0 +jupyterlab-widgets==3.0.9 kiwisolver==1.4.5 latexcodec==2.0.1 livereload==2.6.3 markdown-it-py==2.2.0 markupsafe==2.1.3 -matplotlib==3.7.2 +matplotlib==3.8.0 matplotlib-inline==0.1.6 mdit-py-plugins==0.3.5 mdurl==0.1.2 @@ -105,11 +105,11 @@ nbclient==0.6.8 nbconvert==7.8.0 nbformat==5.9.2 nbmake==1.4.3 -nest-asyncio==1.5.7 +nest-asyncio==1.5.8 nodeenv==1.8.0 -notebook==6.5.5 +notebook==6.5.6 notebook-shim==0.2.3 -numpy==1.25.2 +numpy==1.26.0 overrides==7.4.0 packaging==23.1 pandocfilters==1.5.0 @@ -118,7 +118,7 @@ particle==0.23.0 pathspec==0.11.2 pexpect==4.8.0 pickleshare==0.7.5 -pillow==10.0.0 +pillow==10.0.1 platformdirs==3.10.0 pluggy==1.3.0 pre-commit==3.4.0 @@ -130,9 +130,9 @@ pure-eval==0.2.2 pybtex==0.24.0 pybtex-docutils==1.0.3 pycparser==2.21 -pydata-sphinx-theme==0.13.3 +pydata-sphinx-theme==0.14.1 pygments==2.16.1 -pyparsing==3.0.9 +pyparsing==3.1.1 pyproject-api==1.6.1 pytest==7.4.2 pytest-cov==4.1.0 @@ -141,7 +141,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.0 +python-lsp-jsonrpc==1.1.2 python-lsp-server==1.8.0 pytoolconfig==1.2.5 pyyaml==6.0.1 @@ -151,10 +151,10 @@ referencing==0.30.2 requests==2.31.0 rfc3339-validator==0.1.4 rfc3986-validator==0.1.1 -rich==13.5.2 +rich==13.5.3 rope==1.9.0 -rpds-py==0.10.2 -ruff==0.0.287 +rpds-py==0.10.3 +ruff==0.0.291 send2trash==1.8.2 six==1.16.0 sniffio==1.3.0 @@ -177,7 +177,7 @@ sphinxcontrib-htmlhelp==2.0.4 sphinxcontrib-jsmath==1.0.1 sphinxcontrib-qthelp==1.0.6 sphinxcontrib-serializinghtml==1.1.9 -sqlalchemy==2.0.20 +sqlalchemy==2.0.21 stack-data==0.6.2 sympy==1.12 tabulate==0.9.0 @@ -187,27 +187,27 @@ tomli==2.0.1 tornado==6.3.3 tox==4.11.3 tqdm==4.66.1 -traitlets==5.9.0 +traitlets==5.10.1 types-docutils==0.20.0.3 types-pkg-resources==0.1.3 -types-requests==2.31.0.2 +types-requests==2.31.0.6 types-setuptools==68.2.0.0 types-urllib3==1.26.25.14 -typing-extensions==4.7.1 +typing-extensions==4.8.0 ujson==5.8.0 uri-template==1.3.0 -urllib3==2.0.4 +urllib3==2.0.5 virtualenv==20.24.5 wcwidth==0.2.6 webcolors==1.13 webencodings==0.5.1 -websocket-client==1.6.2 +websocket-client==1.6.3 wheel==0.41.2 -widgetsnbextension==4.0.8 +widgetsnbextension==4.0.9 wrapt==1.15.0 y-py==0.6.0 ypy-websocket==0.8.4 -zipp==3.16.2 +zipp==3.17.0 # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/.constraints/py3.11.txt b/.constraints/py3.11.txt index a39b32753..74374239b 100644 --- a/.constraints/py3.11.txt +++ b/.constraints/py3.11.txt @@ -17,7 +17,7 @@ attrs==23.1.0 babel==2.12.1 backcall==0.2.0 beautifulsoup4==4.12.2 -black==23.9.0 +black==23.9.1 bleach==6.0.0 cachetools==5.3.1 certifi==2023.7.22 @@ -28,10 +28,10 @@ charset-normalizer==3.2.0 click==8.1.7 colorama==0.4.6 comm==0.1.4 -contourpy==1.1.0 +contourpy==1.1.1 coverage==7.3.1 cycler==0.11.0 -debugpy==1.7.0 +debugpy==1.8.0 decorator==5.1.1 defusedxml==0.7.1 deprecated==1.2.14 @@ -42,14 +42,14 @@ entrypoints==0.4 execnet==2.0.2 executing==1.2.0 fastjsonschema==2.18.0 -filelock==3.12.3 +filelock==3.12.4 fonttools==4.42.1 fqdn==1.5.1 gprof2dot==2022.7.29 graphviz==0.20.1 greenlet==2.0.2 hepunits==2.3.2 -identify==2.5.27 +identify==2.5.29 idna==3.4 imagesize==1.4.1 importlib-metadata==6.8.0 @@ -58,17 +58,17 @@ ipykernel==6.25.2 ipympl==0.9.3 ipython==8.15.0 ipython-genutils==0.2.0 -ipywidgets==8.1.0 +ipywidgets==8.1.1 isoduration==20.11.0 jedi==0.19.0 jinja2==3.1.2 json5==0.9.14 jsonpointer==2.4 -jsonschema==4.19.0 +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 @@ -76,19 +76,19 @@ 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.2.0 +jupyterlab-lsp==4.3.0 jupyterlab-myst==2.0.2 jupyterlab-pygments==0.2.2 -jupyterlab-server==2.24.0 -jupyterlab-widgets==3.0.8 +jupyterlab-server==2.25.0 +jupyterlab-widgets==3.0.9 kiwisolver==1.4.5 latexcodec==2.0.1 livereload==2.6.3 markdown-it-py==2.2.0 markupsafe==2.1.3 -matplotlib==3.7.2 +matplotlib==3.8.0 matplotlib-inline==0.1.6 mdit-py-plugins==0.3.5 mdurl==0.1.2 @@ -104,11 +104,11 @@ nbclient==0.6.8 nbconvert==7.8.0 nbformat==5.9.2 nbmake==1.4.3 -nest-asyncio==1.5.7 +nest-asyncio==1.5.8 nodeenv==1.8.0 -notebook==6.5.5 +notebook==6.5.6 notebook-shim==0.2.3 -numpy==1.25.2 +numpy==1.26.0 overrides==7.4.0 packaging==23.1 pandocfilters==1.5.0 @@ -117,7 +117,7 @@ particle==0.23.0 pathspec==0.11.2 pexpect==4.8.0 pickleshare==0.7.5 -pillow==10.0.0 +pillow==10.0.1 platformdirs==3.10.0 pluggy==1.3.0 pre-commit==3.4.0 @@ -129,9 +129,9 @@ pure-eval==0.2.2 pybtex==0.24.0 pybtex-docutils==1.0.3 pycparser==2.21 -pydata-sphinx-theme==0.13.3 +pydata-sphinx-theme==0.14.1 pygments==2.16.1 -pyparsing==3.0.9 +pyparsing==3.1.1 pyproject-api==1.6.1 pytest==7.4.2 pytest-cov==4.1.0 @@ -140,7 +140,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.0 +python-lsp-jsonrpc==1.1.2 python-lsp-server==1.8.0 pytoolconfig==1.2.5 pyyaml==6.0.1 @@ -150,10 +150,10 @@ referencing==0.30.2 requests==2.31.0 rfc3339-validator==0.1.4 rfc3986-validator==0.1.1 -rich==13.5.2 +rich==13.5.3 rope==1.9.0 -rpds-py==0.10.2 -ruff==0.0.287 +rpds-py==0.10.3 +ruff==0.0.291 send2trash==1.8.2 six==1.16.0 sniffio==1.3.0 @@ -176,7 +176,7 @@ sphinxcontrib-htmlhelp==2.0.4 sphinxcontrib-jsmath==1.0.1 sphinxcontrib-qthelp==1.0.6 sphinxcontrib-serializinghtml==1.1.9 -sqlalchemy==2.0.20 +sqlalchemy==2.0.21 stack-data==0.6.2 sympy==1.12 tabulate==0.9.0 @@ -185,27 +185,27 @@ tinycss2==1.2.1 tornado==6.3.3 tox==4.11.3 tqdm==4.66.1 -traitlets==5.9.0 +traitlets==5.10.1 types-docutils==0.20.0.3 types-pkg-resources==0.1.3 -types-requests==2.31.0.2 +types-requests==2.31.0.6 types-setuptools==68.2.0.0 types-urllib3==1.26.25.14 -typing-extensions==4.7.1 +typing-extensions==4.8.0 ujson==5.8.0 uri-template==1.3.0 -urllib3==2.0.4 +urllib3==2.0.5 virtualenv==20.24.5 wcwidth==0.2.6 webcolors==1.13 webencodings==0.5.1 -websocket-client==1.6.2 +websocket-client==1.6.3 wheel==0.41.2 -widgetsnbextension==4.0.8 +widgetsnbextension==4.0.9 wrapt==1.15.0 y-py==0.6.0 ypy-websocket==0.8.4 -zipp==3.16.2 +zipp==3.17.0 # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/.constraints/py3.7.txt b/.constraints/py3.7.txt index d065f14cb..a798a745a 100644 --- a/.constraints/py3.7.txt +++ b/.constraints/py3.7.txt @@ -58,7 +58,7 @@ ipykernel==6.16.2 ipympl==0.9.3 ipython==7.34.0 ipython-genutils==0.2.0 -ipywidgets==8.1.0 +ipywidgets==8.1.1 isoduration==20.11.0 jedi==0.18.2 jinja2==3.1.2 @@ -74,13 +74,13 @@ 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 jupyterlab-pygments==0.2.2 jupyterlab-server==2.24.0 -jupyterlab-widgets==3.0.8 +jupyterlab-widgets==3.0.9 kiwisolver==1.4.5 latexcodec==2.0.1 livereload==2.6.3 @@ -102,9 +102,9 @@ nbclient==0.5.13 nbconvert==7.6.0 nbformat==5.8.0 nbmake==1.2.1 ; python_version == "3.7.*" -nest-asyncio==1.5.7 +nest-asyncio==1.5.8 nodeenv==1.8.0 -notebook==6.5.5 +notebook==6.5.6 notebook-shim==0.2.3 numpy==1.21.6 packaging==23.1 @@ -149,9 +149,9 @@ qrules==0.9.8 requests==2.31.0 rfc3339-validator==0.1.4 rfc3986-validator==0.1.1 -rich==13.5.2 +rich==13.5.3 rope==1.9.0 -ruff==0.0.287 +ruff==0.0.291 send2trash==1.8.2 singledispatchmethod==1.0 ; python_version < "3.8.0" six==1.16.0 @@ -188,20 +188,20 @@ traitlets==5.9.0 typed-ast==1.5.5 types-docutils==0.20.0.3 types-pkg-resources==0.1.3 -types-requests==2.31.0.2 +types-requests==2.31.0.6 types-setuptools==68.2.0.0 types-urllib3==1.26.25.14 typing-extensions==4.7.1 ; python_version < "3.8.0" ujson==5.7.0 uri-template==1.3.0 -urllib3==2.0.4 +urllib3==2.0.5 virtualenv==20.24.5 wcwidth==0.2.6 webcolors==1.13 webencodings==0.5.1 websocket-client==1.6.1 wheel==0.41.2 -widgetsnbextension==4.0.8 +widgetsnbextension==4.0.9 wrapt==1.15.0 y-py==0.5.9 ypy-websocket==0.8.2 ; python_version < "3.8.0" diff --git a/.constraints/py3.8.txt b/.constraints/py3.8.txt index 64b7a5859..a4eab2f94 100644 --- a/.constraints/py3.8.txt +++ b/.constraints/py3.8.txt @@ -17,7 +17,7 @@ attrs==23.1.0 babel==2.12.1 backcall==0.2.0 beautifulsoup4==4.12.2 -black==23.9.0 +black==23.9.1 bleach==6.0.0 cachetools==5.3.1 certifi==2023.7.22 @@ -28,10 +28,10 @@ charset-normalizer==3.2.0 click==8.1.7 colorama==0.4.6 comm==0.1.4 -contourpy==1.1.0 +contourpy==1.1.1 coverage==7.3.1 cycler==0.11.0 -debugpy==1.7.0 +debugpy==1.8.0 decorator==5.1.1 defusedxml==0.7.1 deprecated==1.2.14 @@ -43,34 +43,34 @@ exceptiongroup==1.1.3 execnet==2.0.2 executing==1.2.0 fastjsonschema==2.18.0 -filelock==3.12.3 +filelock==3.12.4 fonttools==4.42.1 fqdn==1.5.1 gprof2dot==2022.7.29 graphviz==0.20.1 greenlet==2.0.2 hepunits==2.3.2 -identify==2.5.27 +identify==2.5.29 idna==3.4 imagesize==1.4.1 importlib-metadata==6.8.0 -importlib-resources==6.0.1 +importlib-resources==6.1.0 iniconfig==2.0.0 ipykernel==6.25.2 ipympl==0.9.3 ipython==8.12.2 ipython-genutils==0.2.0 -ipywidgets==8.1.0 +ipywidgets==8.1.1 isoduration==20.11.0 jedi==0.19.0 jinja2==3.1.2 json5==0.9.14 jsonpointer==2.4 -jsonschema==4.19.0 +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 @@ -78,19 +78,19 @@ 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.2.0 +jupyterlab-lsp==4.3.0 jupyterlab-myst==2.0.2 jupyterlab-pygments==0.2.2 -jupyterlab-server==2.24.0 -jupyterlab-widgets==3.0.8 +jupyterlab-server==2.25.0 +jupyterlab-widgets==3.0.9 kiwisolver==1.4.5 latexcodec==2.0.1 livereload==2.6.3 markdown-it-py==2.2.0 markupsafe==2.1.3 -matplotlib==3.7.2 +matplotlib==3.7.3 matplotlib-inline==0.1.6 mdit-py-plugins==0.3.5 mdurl==0.1.2 @@ -106,9 +106,9 @@ nbclient==0.6.8 nbconvert==7.8.0 nbformat==5.9.2 nbmake==1.4.3 -nest-asyncio==1.5.7 +nest-asyncio==1.5.8 nodeenv==1.8.0 -notebook==6.5.5 +notebook==6.5.6 notebook-shim==0.2.3 numpy==1.24.4 overrides==7.4.0 @@ -119,7 +119,7 @@ particle==0.23.0 pathspec==0.11.2 pexpect==4.8.0 pickleshare==0.7.5 -pillow==10.0.0 +pillow==10.0.1 pkgutil-resolve-name==1.3.10 platformdirs==3.10.0 pluggy==1.3.0 @@ -132,9 +132,9 @@ pure-eval==0.2.2 pybtex==0.24.0 pybtex-docutils==1.0.3 pycparser==2.21 -pydata-sphinx-theme==0.13.3 +pydata-sphinx-theme==0.14.1 pygments==2.16.1 -pyparsing==3.0.9 +pyparsing==3.1.1 pyproject-api==1.6.1 pytest==7.4.2 pytest-cov==4.1.0 @@ -143,7 +143,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.0 +python-lsp-jsonrpc==1.1.2 python-lsp-server==1.8.0 pytoolconfig==1.2.5 pytz==2023.3.post1 @@ -154,10 +154,10 @@ referencing==0.30.2 requests==2.31.0 rfc3339-validator==0.1.4 rfc3986-validator==0.1.1 -rich==13.5.2 +rich==13.5.3 rope==1.9.0 -rpds-py==0.10.2 -ruff==0.0.287 +rpds-py==0.10.3 +ruff==0.0.291 send2trash==1.8.2 six==1.16.0 sniffio==1.3.0 @@ -180,7 +180,7 @@ sphinxcontrib-htmlhelp==2.0.1 sphinxcontrib-jsmath==1.0.1 sphinxcontrib-qthelp==1.0.3 sphinxcontrib-serializinghtml==1.1.5 -sqlalchemy==2.0.20 +sqlalchemy==2.0.21 stack-data==0.6.2 sympy==1.12 tabulate==0.9.0 @@ -190,27 +190,27 @@ tomli==2.0.1 tornado==6.3.3 tox==4.11.3 tqdm==4.66.1 -traitlets==5.9.0 +traitlets==5.10.1 types-docutils==0.20.0.3 types-pkg-resources==0.1.3 -types-requests==2.31.0.2 +types-requests==2.31.0.6 types-setuptools==68.2.0.0 types-urllib3==1.26.25.14 -typing-extensions==4.7.1 +typing-extensions==4.8.0 ujson==5.8.0 uri-template==1.3.0 -urllib3==2.0.4 +urllib3==2.0.5 virtualenv==20.24.5 wcwidth==0.2.6 webcolors==1.13 webencodings==0.5.1 -websocket-client==1.6.2 +websocket-client==1.6.3 wheel==0.41.2 -widgetsnbextension==4.0.8 +widgetsnbextension==4.0.9 wrapt==1.15.0 y-py==0.6.0 ypy-websocket==0.8.4 -zipp==3.16.2 +zipp==3.17.0 # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/.constraints/py3.9.txt b/.constraints/py3.9.txt index 04299630a..3a2da6f71 100644 --- a/.constraints/py3.9.txt +++ b/.constraints/py3.9.txt @@ -17,7 +17,7 @@ attrs==23.1.0 babel==2.12.1 backcall==0.2.0 beautifulsoup4==4.12.2 -black==23.9.0 +black==23.9.1 bleach==6.0.0 cachetools==5.3.1 certifi==2023.7.22 @@ -28,10 +28,10 @@ charset-normalizer==3.2.0 click==8.1.7 colorama==0.4.6 comm==0.1.4 -contourpy==1.1.0 +contourpy==1.1.1 coverage==7.3.1 cycler==0.11.0 -debugpy==1.7.0 +debugpy==1.8.0 decorator==5.1.1 defusedxml==0.7.1 deprecated==1.2.14 @@ -43,34 +43,34 @@ exceptiongroup==1.1.3 execnet==2.0.2 executing==1.2.0 fastjsonschema==2.18.0 -filelock==3.12.3 +filelock==3.12.4 fonttools==4.42.1 fqdn==1.5.1 gprof2dot==2022.7.29 graphviz==0.20.1 greenlet==2.0.2 hepunits==2.3.2 -identify==2.5.27 +identify==2.5.29 idna==3.4 imagesize==1.4.1 importlib-metadata==6.8.0 -importlib-resources==6.0.1 +importlib-resources==6.1.0 iniconfig==2.0.0 ipykernel==6.25.2 ipympl==0.9.3 ipython==8.15.0 ipython-genutils==0.2.0 -ipywidgets==8.1.0 +ipywidgets==8.1.1 isoduration==20.11.0 jedi==0.19.0 jinja2==3.1.2 json5==0.9.14 jsonpointer==2.4 -jsonschema==4.19.0 +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 @@ -78,19 +78,19 @@ 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.2.0 +jupyterlab-lsp==4.3.0 jupyterlab-myst==2.0.2 jupyterlab-pygments==0.2.2 -jupyterlab-server==2.24.0 -jupyterlab-widgets==3.0.8 +jupyterlab-server==2.25.0 +jupyterlab-widgets==3.0.9 kiwisolver==1.4.5 latexcodec==2.0.1 livereload==2.6.3 markdown-it-py==2.2.0 markupsafe==2.1.3 -matplotlib==3.7.2 +matplotlib==3.8.0 matplotlib-inline==0.1.6 mdit-py-plugins==0.3.5 mdurl==0.1.2 @@ -106,11 +106,11 @@ nbclient==0.6.8 nbconvert==7.8.0 nbformat==5.9.2 nbmake==1.4.3 -nest-asyncio==1.5.7 +nest-asyncio==1.5.8 nodeenv==1.8.0 -notebook==6.5.5 +notebook==6.5.6 notebook-shim==0.2.3 -numpy==1.25.2 +numpy==1.26.0 overrides==7.4.0 packaging==23.1 pandocfilters==1.5.0 @@ -119,7 +119,7 @@ particle==0.23.0 pathspec==0.11.2 pexpect==4.8.0 pickleshare==0.7.5 -pillow==10.0.0 +pillow==10.0.1 platformdirs==3.10.0 pluggy==1.3.0 pre-commit==3.4.0 @@ -131,9 +131,9 @@ pure-eval==0.2.2 pybtex==0.24.0 pybtex-docutils==1.0.3 pycparser==2.21 -pydata-sphinx-theme==0.13.3 +pydata-sphinx-theme==0.14.1 pygments==2.16.1 -pyparsing==3.0.9 +pyparsing==3.1.1 pyproject-api==1.6.1 pytest==7.4.2 pytest-cov==4.1.0 @@ -142,7 +142,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.0 +python-lsp-jsonrpc==1.1.2 python-lsp-server==1.8.0 pytoolconfig==1.2.5 pyyaml==6.0.1 @@ -152,10 +152,10 @@ referencing==0.30.2 requests==2.31.0 rfc3339-validator==0.1.4 rfc3986-validator==0.1.1 -rich==13.5.2 +rich==13.5.3 rope==1.9.0 -rpds-py==0.10.2 -ruff==0.0.287 +rpds-py==0.10.3 +ruff==0.0.291 send2trash==1.8.2 six==1.16.0 sniffio==1.3.0 @@ -178,7 +178,7 @@ sphinxcontrib-htmlhelp==2.0.4 sphinxcontrib-jsmath==1.0.1 sphinxcontrib-qthelp==1.0.6 sphinxcontrib-serializinghtml==1.1.9 -sqlalchemy==2.0.20 +sqlalchemy==2.0.21 stack-data==0.6.2 sympy==1.12 tabulate==0.9.0 @@ -188,27 +188,27 @@ tomli==2.0.1 tornado==6.3.3 tox==4.11.3 tqdm==4.66.1 -traitlets==5.9.0 +traitlets==5.10.1 types-docutils==0.20.0.3 types-pkg-resources==0.1.3 -types-requests==2.31.0.2 +types-requests==2.31.0.6 types-setuptools==68.2.0.0 types-urllib3==1.26.25.14 -typing-extensions==4.7.1 +typing-extensions==4.8.0 ujson==5.8.0 uri-template==1.3.0 -urllib3==2.0.4 +urllib3==2.0.5 virtualenv==20.24.5 wcwidth==0.2.6 webcolors==1.13 webencodings==0.5.1 -websocket-client==1.6.2 +websocket-client==1.6.3 wheel==0.41.2 -widgetsnbextension==4.0.8 +widgetsnbextension==4.0.9 wrapt==1.15.0 y-py==0.6.0 ypy-websocket==0.8.4 -zipp==3.16.2 +zipp==3.17.0 # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 740091c3d..5cebb7828 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -68,7 +68,7 @@ repos: - --fix - repo: https://github.com/psf/black - rev: 23.9.0 + rev: 23.9.1 hooks: - id: black @@ -107,7 +107,7 @@ repos: )$ - repo: https://github.com/igorshubovych/markdownlint-cli - rev: v0.36.0 + rev: v0.37.0 hooks: - id: markdownlint @@ -151,19 +151,19 @@ repos: - id: prettier - repo: https://github.com/ComPWA/mirrors-pyright - rev: v1.1.326 + rev: v1.1.328 hooks: - id: pyright - repo: https://github.com/asottile/pyupgrade - rev: v3.10.1 + rev: v3.13.0 hooks: - id: pyupgrade args: - --py37-plus - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.0.287 + rev: v0.0.291 hooks: - id: ruff args: From 7ca7ea7e96ca4af7074e23aee0d7c7d32943aa64 Mon Sep 17 00:00:00 2001 From: GitHub Date: Wed, 27 Sep 2023 13:53:53 +0000 Subject: [PATCH 02/39] 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 5cebb7828..69b5db776 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -38,7 +38,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 5d20869dd513c0b8acdb819b9b980732c8edff27 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:55:12 +0000 Subject: [PATCH 03/39] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- .gitignore | 1 - .gitpod.yml | 1 - .pre-commit-config.yaml | 14 ++++++-------- .vscode/extensions.json | 2 +- docs/usage/dynamics/k-matrix.ipynb | 8 ++------ pyproject.toml | 1 - 6 files changed, 9 insertions(+), 18 deletions(-) diff --git a/.gitignore b/.gitignore index e7d3526d9..2b8d0d1a7 100644 --- a/.gitignore +++ b/.gitignore @@ -46,7 +46,6 @@ pyvenv*/ !.github/*.yml !.github/*/*.yml !.gitpod.yml -!.markdownlint.json !.pre-commit-config.yaml !.readthedocs.yml !.vscode/*.json diff --git a/.gitpod.yml b/.gitpod.yml index 35de675e4..d534cc07b 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -15,7 +15,6 @@ vscode: extensions: - charliermarsh.ruff - christian-kohler.path-intellisense - - davidanson.vscode-markdownlint - eamodio.gitlens - editorconfig.editorconfig - esbenp.prettier-vscode diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 69b5db776..ccf11bc47 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -57,9 +57,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 @@ -71,6 +68,11 @@ repos: rev: 23.9.1 hooks: - id: black + - id: black-jupyter + args: + - --line-length=85 + types_or: + - jupyter - repo: https://github.com/asottile/blacken-docs rev: 1.16.0 @@ -106,11 +108,6 @@ repos: .*\.py )$ - - repo: https://github.com/igorshubovych/markdownlint-cli - rev: v0.37.0 - hooks: - - id: markdownlint - - repo: local hooks: - id: mypy @@ -131,6 +128,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 ad5669bc4..a8675425d 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -2,7 +2,6 @@ "recommendations": [ "charliermarsh.ruff", "christian-kohler.path-intellisense", - "davidanson.vscode-markdownlint", "eamodio.gitlens", "editorconfig.editorconfig", "esbenp.prettier-vscode", @@ -27,6 +26,7 @@ ], "unwantedRecommendations": [ "bungcip.better-toml", + "davidanson.vscode-markdownlint", "ms-python.flake8", "ms-python.isort", "ms-python.pylint", diff --git a/docs/usage/dynamics/k-matrix.ipynb b/docs/usage/dynamics/k-matrix.ipynb index cc94b8902..0f533dd4b 100644 --- a/docs/usage/dynamics/k-matrix.ipynb +++ b/docs/usage/dynamics/k-matrix.ipynb @@ -1492,9 +1492,7 @@ " if substitute_sqrt_rho:\n", "\n", " def rho_i(i):\n", - " return phsp_factor(\n", - " *sp.symbols(f\"s m_a{i} m_b{i}\", nonnegative=True)\n", - " ).doit()\n", + " return phsp_factor(*sp.symbols(f\"s m_a{i} m_b{i}\", nonnegative=True)).doit()\n", "\n", " expr = expr.xreplace(\n", " {sp.sqrt(rho_i(i)): 1 for i in range(n_channels)}\n", @@ -1593,9 +1591,7 @@ " kmatrix.NonRelativisticPVector,\n", " kmatrix.RelativisticPVector,\n", " }:\n", - " fig.suptitle(\n", - " f\"$P$-vector for {n_channels} channels and {n_poles} resonances\"\n", - " )\n", + " fig.suptitle(f\"$P$-vector for {n_channels} channels and {n_poles} resonances\")\n", "\n", " for ax in axes:\n", " ax.set_xlim(x_min, x_max)\n", diff --git a/pyproject.toml b/pyproject.toml index a6fc42fe1..8c4df1bd3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -76,7 +76,6 @@ ignore_missing_imports = true module = ["sphinx.*"] [tool.nbqa.addopts] -black = ["--line-length=85"] ruff = [ "--extend-ignore=B018", "--extend-ignore=C408", From 5c90998509a8ac43cbd68347b634f8c91be3723f 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:05 +0000 Subject: [PATCH 04/39] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- docs/usage/dynamics/k-matrix.ipynb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/docs/usage/dynamics/k-matrix.ipynb b/docs/usage/dynamics/k-matrix.ipynb index 0f533dd4b..cc94b8902 100644 --- a/docs/usage/dynamics/k-matrix.ipynb +++ b/docs/usage/dynamics/k-matrix.ipynb @@ -1492,7 +1492,9 @@ " if substitute_sqrt_rho:\n", "\n", " def rho_i(i):\n", - " return phsp_factor(*sp.symbols(f\"s m_a{i} m_b{i}\", nonnegative=True)).doit()\n", + " return phsp_factor(\n", + " *sp.symbols(f\"s m_a{i} m_b{i}\", nonnegative=True)\n", + " ).doit()\n", "\n", " expr = expr.xreplace(\n", " {sp.sqrt(rho_i(i)): 1 for i in range(n_channels)}\n", @@ -1591,7 +1593,9 @@ " kmatrix.NonRelativisticPVector,\n", " kmatrix.RelativisticPVector,\n", " }:\n", - " fig.suptitle(f\"$P$-vector for {n_channels} channels and {n_poles} resonances\")\n", + " fig.suptitle(\n", + " f\"$P$-vector for {n_channels} channels and {n_poles} resonances\"\n", + " )\n", "\n", " for ax in axes:\n", " ax.set_xlim(x_min, x_max)\n", From 11571828eb67fcb776140343045ac728f256b1f8 Mon Sep 17 00:00:00 2001 From: GitHub Date: Wed, 27 Sep 2023 20:22:05 +0000 Subject: [PATCH 05/39] 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 a798a745a..b6d1cf040 100644 --- a/.constraints/py3.7.txt +++ b/.constraints/py3.7.txt @@ -126,7 +126,7 @@ ptyprocess==0.7.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 a16c830fdaccff22bc21dc99352bc42315a79fdb Mon Sep 17 00:00:00 2001 From: Remco de Boer <29308176+redeboer@users.noreply.github.com> Date: Thu, 28 Sep 2023 11:19:32 +0200 Subject: [PATCH 06/39] MAINT: remove all `markdownlint` comments --- .cspell.json | 1 - docs/index.md | 4 ---- 2 files changed, 5 deletions(-) diff --git a/.cspell.json b/.cspell.json index 13927c0da..36d2527db 100644 --- a/.cspell.json +++ b/.cspell.json @@ -138,7 +138,6 @@ "linspace", "macos", "marangotto", - "markdownlint", "mathcal", "mathrm", "maxdepth", diff --git a/docs/index.md b/docs/index.md index 9defa25ad..6a4e2a36f 100644 --- a/docs/index.md +++ b/docs/index.md @@ -4,14 +4,10 @@ ``` - - [![10.5281/zenodo.5526648](https://zenodo.org/badge/doi/10.5281/zenodo.5526648.svg)](https://doi.org/10.5281/zenodo.5526648) [![Supported Python versions](https://img.shields.io/pypi/pyversions/ampform)](https://pypi.org/project/ampform) {{ '[![Google Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/ComPWA/ampform/blob/{})'.format(branch) }} {{ '[![Binder](https://static.mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/ComPWA/ampform/{}?filepath=docs/usage)'.format(branch) }} - - :::{margin} From 0dfbe3680f7d2a30909aaf48194dfaedd0503922 Mon Sep 17 00:00:00 2001 From: Remco de Boer <29308176+redeboer@users.noreply.github.com> Date: Thu, 28 Sep 2023 13:40:08 +0200 Subject: [PATCH 07/39] DOC: make Colab TOC visible by default --- .pre-commit-config.yaml | 3 ++- docs/usage.ipynb | 3 +++ docs/usage/amplitude.ipynb | 3 +++ docs/usage/dynamics.ipynb | 3 +++ docs/usage/dynamics/analytic-continuation.ipynb | 3 +++ docs/usage/dynamics/custom.ipynb | 3 +++ docs/usage/dynamics/k-matrix.ipynb | 3 +++ docs/usage/helicity/formalism.ipynb | 3 +++ docs/usage/helicity/spin-alignment.ipynb | 3 +++ docs/usage/interactive.ipynb | 3 +++ docs/usage/kinematics.ipynb | 3 +++ docs/usage/modify.ipynb | 3 +++ docs/usage/symplot.ipynb | 3 +++ 13 files changed, 38 insertions(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index ccf11bc47..80f04a7d5 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -38,7 +38,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: @@ -46,6 +46,7 @@ repos: - --pin-requirements=monthly - --repo-name=ampform - --repo-title=AmpForm + - id: colab-toc-visible - id: fix-nbformat-version - id: format-setup-cfg - id: set-nb-cells diff --git a/docs/usage.ipynb b/docs/usage.ipynb index bfe0b1836..71908243a 100644 --- a/docs/usage.ipynb +++ b/docs/usage.ipynb @@ -342,6 +342,9 @@ } ], "metadata": { + "colab": { + "toc_visible": true + }, "kernelspec": { "display_name": "Python 3 (ipykernel)", "language": "python", diff --git a/docs/usage/amplitude.ipynb b/docs/usage/amplitude.ipynb index af6640882..13a5a9fd7 100644 --- a/docs/usage/amplitude.ipynb +++ b/docs/usage/amplitude.ipynb @@ -1059,6 +1059,9 @@ } ], "metadata": { + "colab": { + "toc_visible": true + }, "kernelspec": { "display_name": "Python 3 (ipykernel)", "language": "python", diff --git a/docs/usage/dynamics.ipynb b/docs/usage/dynamics.ipynb index 392242bcd..f18399183 100644 --- a/docs/usage/dynamics.ipynb +++ b/docs/usage/dynamics.ipynb @@ -641,6 +641,9 @@ } ], "metadata": { + "colab": { + "toc_visible": true + }, "kernelspec": { "display_name": "Python 3 (ipykernel)", "language": "python", diff --git a/docs/usage/dynamics/analytic-continuation.ipynb b/docs/usage/dynamics/analytic-continuation.ipynb index 9e2e5006b..e0823bee1 100644 --- a/docs/usage/dynamics/analytic-continuation.ipynb +++ b/docs/usage/dynamics/analytic-continuation.ipynb @@ -537,6 +537,9 @@ } ], "metadata": { + "colab": { + "toc_visible": true + }, "kernelspec": { "display_name": "Python 3 (ipykernel)", "language": "python", diff --git a/docs/usage/dynamics/custom.ipynb b/docs/usage/dynamics/custom.ipynb index 8efbe229a..6311508fd 100644 --- a/docs/usage/dynamics/custom.ipynb +++ b/docs/usage/dynamics/custom.ipynb @@ -342,6 +342,9 @@ } ], "metadata": { + "colab": { + "toc_visible": true + }, "kernelspec": { "display_name": "Python 3 (ipykernel)", "language": "python", diff --git a/docs/usage/dynamics/k-matrix.ipynb b/docs/usage/dynamics/k-matrix.ipynb index cc94b8902..94991163e 100644 --- a/docs/usage/dynamics/k-matrix.ipynb +++ b/docs/usage/dynamics/k-matrix.ipynb @@ -1834,6 +1834,9 @@ } ], "metadata": { + "colab": { + "toc_visible": true + }, "kernelspec": { "display_name": "Python 3 (ipykernel)", "language": "python", diff --git a/docs/usage/helicity/formalism.ipynb b/docs/usage/helicity/formalism.ipynb index 9babe7a3a..358abfea7 100644 --- a/docs/usage/helicity/formalism.ipynb +++ b/docs/usage/helicity/formalism.ipynb @@ -452,6 +452,9 @@ } ], "metadata": { + "colab": { + "toc_visible": true + }, "kernelspec": { "display_name": "Python 3 (ipykernel)", "language": "python", diff --git a/docs/usage/helicity/spin-alignment.ipynb b/docs/usage/helicity/spin-alignment.ipynb index 72b519696..74aa1e8e2 100644 --- a/docs/usage/helicity/spin-alignment.ipynb +++ b/docs/usage/helicity/spin-alignment.ipynb @@ -412,6 +412,9 @@ } ], "metadata": { + "colab": { + "toc_visible": true + }, "kernelspec": { "display_name": "Python 3 (ipykernel)", "language": "python", diff --git a/docs/usage/interactive.ipynb b/docs/usage/interactive.ipynb index fa72fea0d..a01463b9f 100644 --- a/docs/usage/interactive.ipynb +++ b/docs/usage/interactive.ipynb @@ -582,6 +582,9 @@ } ], "metadata": { + "colab": { + "toc_visible": true + }, "kernelspec": { "display_name": "Python 3 (ipykernel)", "language": "python", diff --git a/docs/usage/kinematics.ipynb b/docs/usage/kinematics.ipynb index 03c9d9afb..bce2acad7 100644 --- a/docs/usage/kinematics.ipynb +++ b/docs/usage/kinematics.ipynb @@ -412,6 +412,9 @@ } ], "metadata": { + "colab": { + "toc_visible": true + }, "kernelspec": { "display_name": "Python 3 (ipykernel)", "language": "python", diff --git a/docs/usage/modify.ipynb b/docs/usage/modify.ipynb index bf0ae2aa5..9c30f6643 100644 --- a/docs/usage/modify.ipynb +++ b/docs/usage/modify.ipynb @@ -382,6 +382,9 @@ } ], "metadata": { + "colab": { + "toc_visible": true + }, "kernelspec": { "display_name": "Python 3 (ipykernel)", "language": "python", diff --git a/docs/usage/symplot.ipynb b/docs/usage/symplot.ipynb index 84192b2a5..93d58631e 100644 --- a/docs/usage/symplot.ipynb +++ b/docs/usage/symplot.ipynb @@ -290,6 +290,9 @@ } ], "metadata": { + "colab": { + "toc_visible": true + }, "kernelspec": { "display_name": "Python 3 (ipykernel)", "language": "python", From 76700a0608f7b52d4a64c8431d11fa878a8bb468 Mon Sep 17 00:00:00 2001 From: GitHub Date: Thu, 28 Sep 2023 11:42:08 +0000 Subject: [PATCH 08/39] MAINT: update pip constraints and pre-commit --- .constraints/py3.10.txt | 2 +- .constraints/py3.11.txt | 2 +- .constraints/py3.8.txt | 2 +- .constraints/py3.9.txt | 2 +- .pre-commit-config.yaml | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.constraints/py3.10.txt b/.constraints/py3.10.txt index 501107950..38d8433b0 100644 --- a/.constraints/py3.10.txt +++ b/.constraints/py3.10.txt @@ -152,7 +152,7 @@ requests==2.31.0 rfc3339-validator==0.1.4 rfc3986-validator==0.1.1 rich==13.5.3 -rope==1.9.0 +rope==1.10.0 rpds-py==0.10.3 ruff==0.0.291 send2trash==1.8.2 diff --git a/.constraints/py3.11.txt b/.constraints/py3.11.txt index 74374239b..f1abdd233 100644 --- a/.constraints/py3.11.txt +++ b/.constraints/py3.11.txt @@ -151,7 +151,7 @@ requests==2.31.0 rfc3339-validator==0.1.4 rfc3986-validator==0.1.1 rich==13.5.3 -rope==1.9.0 +rope==1.10.0 rpds-py==0.10.3 ruff==0.0.291 send2trash==1.8.2 diff --git a/.constraints/py3.8.txt b/.constraints/py3.8.txt index a4eab2f94..6607d07b8 100644 --- a/.constraints/py3.8.txt +++ b/.constraints/py3.8.txt @@ -155,7 +155,7 @@ requests==2.31.0 rfc3339-validator==0.1.4 rfc3986-validator==0.1.1 rich==13.5.3 -rope==1.9.0 +rope==1.10.0 rpds-py==0.10.3 ruff==0.0.291 send2trash==1.8.2 diff --git a/.constraints/py3.9.txt b/.constraints/py3.9.txt index 3a2da6f71..d72e616c1 100644 --- a/.constraints/py3.9.txt +++ b/.constraints/py3.9.txt @@ -153,7 +153,7 @@ requests==2.31.0 rfc3339-validator==0.1.4 rfc3986-validator==0.1.1 rich==13.5.3 -rope==1.9.0 +rope==1.10.0 rpds-py==0.10.3 ruff==0.0.291 send2trash==1.8.2 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 80f04a7d5..64b71783c 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -81,7 +81,7 @@ repos: - id: blacken-docs - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.26.3 + rev: 0.27.0 hooks: - id: check-jsonschema name: Check CITATION.cff @@ -150,7 +150,7 @@ repos: - id: prettier - repo: https://github.com/ComPWA/mirrors-pyright - rev: v1.1.328 + rev: v1.1.329 hooks: - id: pyright From 0ef246b22ce0c91d952ce3b0f9a0b6ceecebe247 Mon Sep 17 00:00:00 2001 From: Remco de Boer <29308176+redeboer@users.noreply.github.com> Date: Thu, 28 Sep 2023 14:10:43 +0200 Subject: [PATCH 09/39] FIX: relink `ipywidgets` intersphinx API --- docs/conf.py | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/conf.py b/docs/conf.py index c40577822..e67da0019 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -296,6 +296,7 @@ def fetch_logo(url: str, output_path: str) -> None: "8.0.3": "8.0.5", "8.0.4": "8.0.5", "8.0.6": "8.0.5", + "8.1.1": "8.1.2", }, } From 5f40c26f86887d318bc916842f768c26986ac305 Mon Sep 17 00:00:00 2001 From: Remco de Boer <29308176+redeboer@users.noreply.github.com> Date: Thu, 28 Sep 2023 16:55:01 +0200 Subject: [PATCH 10/39] 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 64b71783c..37ab173b2 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -70,10 +70,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/asottile/blacken-docs rev: 1.16.0 From e8b65071703ca1703a50e6914302196fceab6089 Mon Sep 17 00:00:00 2001 From: GitHub Date: Thu, 28 Sep 2023 14:57:27 +0000 Subject: [PATCH 11/39] MAINT: update pip constraints and pre-commit --- .constraints/py3.10.txt | 2 +- .constraints/py3.11.txt | 2 +- .constraints/py3.7.txt | 2 +- .constraints/py3.8.txt | 2 +- .constraints/py3.9.txt | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.constraints/py3.10.txt b/.constraints/py3.10.txt index 38d8433b0..2c50e36b4 100644 --- a/.constraints/py3.10.txt +++ b/.constraints/py3.10.txt @@ -172,7 +172,7 @@ sphinx-togglebutton==0.3.2 sphinxcontrib-applehelp==1.0.7 sphinxcontrib-bibtex==2.6.1 sphinxcontrib-devhelp==1.0.5 -sphinxcontrib-hep-pdgref==0.1.4 +sphinxcontrib-hep-pdgref==0.1.5 sphinxcontrib-htmlhelp==2.0.4 sphinxcontrib-jsmath==1.0.1 sphinxcontrib-qthelp==1.0.6 diff --git a/.constraints/py3.11.txt b/.constraints/py3.11.txt index f1abdd233..2a69bb1f9 100644 --- a/.constraints/py3.11.txt +++ b/.constraints/py3.11.txt @@ -171,7 +171,7 @@ sphinx-togglebutton==0.3.2 sphinxcontrib-applehelp==1.0.7 sphinxcontrib-bibtex==2.6.1 sphinxcontrib-devhelp==1.0.5 -sphinxcontrib-hep-pdgref==0.1.4 +sphinxcontrib-hep-pdgref==0.1.5 sphinxcontrib-htmlhelp==2.0.4 sphinxcontrib-jsmath==1.0.1 sphinxcontrib-qthelp==1.0.6 diff --git a/.constraints/py3.7.txt b/.constraints/py3.7.txt index b6d1cf040..a0bb30e3e 100644 --- a/.constraints/py3.7.txt +++ b/.constraints/py3.7.txt @@ -170,7 +170,7 @@ sphinx-togglebutton==0.3.2 sphinxcontrib-applehelp==1.0.2 sphinxcontrib-bibtex==2.6.1 sphinxcontrib-devhelp==1.0.2 -sphinxcontrib-hep-pdgref==0.1.4 +sphinxcontrib-hep-pdgref==0.1.5 sphinxcontrib-htmlhelp==2.0.0 sphinxcontrib-jsmath==1.0.1 sphinxcontrib-qthelp==1.0.3 diff --git a/.constraints/py3.8.txt b/.constraints/py3.8.txt index 6607d07b8..3a824568c 100644 --- a/.constraints/py3.8.txt +++ b/.constraints/py3.8.txt @@ -175,7 +175,7 @@ sphinx-togglebutton==0.3.2 sphinxcontrib-applehelp==1.0.4 sphinxcontrib-bibtex==2.6.1 sphinxcontrib-devhelp==1.0.2 -sphinxcontrib-hep-pdgref==0.1.4 +sphinxcontrib-hep-pdgref==0.1.5 sphinxcontrib-htmlhelp==2.0.1 sphinxcontrib-jsmath==1.0.1 sphinxcontrib-qthelp==1.0.3 diff --git a/.constraints/py3.9.txt b/.constraints/py3.9.txt index d72e616c1..bca7fb271 100644 --- a/.constraints/py3.9.txt +++ b/.constraints/py3.9.txt @@ -173,7 +173,7 @@ sphinx-togglebutton==0.3.2 sphinxcontrib-applehelp==1.0.7 sphinxcontrib-bibtex==2.6.1 sphinxcontrib-devhelp==1.0.5 -sphinxcontrib-hep-pdgref==0.1.4 +sphinxcontrib-hep-pdgref==0.1.5 sphinxcontrib-htmlhelp==2.0.4 sphinxcontrib-jsmath==1.0.1 sphinxcontrib-qthelp==1.0.6 From 1f538fec4a23178d5c2246e0a04aff69eab850df Mon Sep 17 00:00:00 2001 From: Remco de Boer <29308176+redeboer@users.noreply.github.com> Date: Thu, 28 Sep 2023 22:41:50 +0200 Subject: [PATCH 12/39] 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 d0cc61cd1..000000000 --- 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 049eb32bb..000000000 --- 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 14b808525..000000000 --- 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 37ab173b2..808881df5 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -38,7 +38,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 2bbd44fb89d95bd7717c446e9fb5cfed8e963c8b Mon Sep 17 00:00:00 2001 From: GitHub Date: Thu, 28 Sep 2023 20:43:53 +0000 Subject: [PATCH 13/39] MAINT: update pip constraints and pre-commit --- .constraints/py3.10.txt | 2 +- .constraints/py3.11.txt | 2 +- .constraints/py3.8.txt | 2 +- .constraints/py3.9.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.constraints/py3.10.txt b/.constraints/py3.10.txt index 2c50e36b4..6f76cc56a 100644 --- a/.constraints/py3.10.txt +++ b/.constraints/py3.10.txt @@ -21,7 +21,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 diff --git a/.constraints/py3.11.txt b/.constraints/py3.11.txt index 2a69bb1f9..1e5c839d2 100644 --- a/.constraints/py3.11.txt +++ b/.constraints/py3.11.txt @@ -21,7 +21,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 diff --git a/.constraints/py3.8.txt b/.constraints/py3.8.txt index 3a824568c..bf1b359bd 100644 --- a/.constraints/py3.8.txt +++ b/.constraints/py3.8.txt @@ -21,7 +21,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 diff --git a/.constraints/py3.9.txt b/.constraints/py3.9.txt index bca7fb271..f9ee7e70a 100644 --- a/.constraints/py3.9.txt +++ b/.constraints/py3.9.txt @@ -21,7 +21,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 From 843287c27b228e99262801f35974f05ddfa73264 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Oct 2023 07:00:12 +0200 Subject: [PATCH 14/39] build(deps): bump actions/checkout from 3 to 4 (#359) 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 6449ddd51..ef8190acf 100644 --- a/.github/workflows/pr-linting.yml +++ b/.github/workflows/pr-linting.yml @@ -27,6 +27,6 @@ jobs: name: Check title runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - run: npm install @commitlint/config-conventional - uses: JulienKode/pull-request-name-linter-action@v0.5.0 From 01d418c486852ba6422dc03a0ed53ed6b9bfe47d Mon Sep 17 00:00:00 2001 From: GitHub Date: Mon, 2 Oct 2023 05:01:56 +0000 Subject: [PATCH 15/39] MAINT: update pip constraints and pre-commit --- .constraints/py3.10.txt | 30 +++++++++++++++--------------- .constraints/py3.11.txt | 30 +++++++++++++++--------------- .constraints/py3.7.txt | 15 +++++++-------- .constraints/py3.8.txt | 30 +++++++++++++++--------------- .constraints/py3.9.txt | 30 +++++++++++++++--------------- .pre-commit-config.yaml | 4 ++-- 6 files changed, 69 insertions(+), 70 deletions(-) diff --git a/.constraints/py3.10.txt b/.constraints/py3.10.txt index 6f76cc56a..843b77581 100644 --- a/.constraints/py3.10.txt +++ b/.constraints/py3.10.txt @@ -11,7 +11,7 @@ alabaster==0.7.13 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 attrs==23.1.0 babel==2.12.1 @@ -24,13 +24,13 @@ 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 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 @@ -41,23 +41,23 @@ 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 -fonttools==4.42.1 +fonttools==4.43.0 fqdn==1.5.1 gprof2dot==2022.7.29 graphviz==0.20.1 greenlet==2.0.2 hepunits==2.3.2 -identify==2.5.29 +identify==2.5.30 idna==3.4 imagesize==1.4.1 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 @@ -93,7 +93,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 mpl-interactions==0.23.2 mpmath==1.3.0 mypy==1.5.1 @@ -111,7 +111,7 @@ notebook==6.5.6 notebook-shim==0.2.3 numpy==1.26.0 overrides==7.4.0 -packaging==23.1 +packaging==23.2 pandocfilters==1.5.0 parso==0.8.3 particle==0.23.0 @@ -151,7 +151,7 @@ referencing==0.30.2 requests==2.31.0 rfc3339-validator==0.1.4 rfc3986-validator==0.1.1 -rich==13.5.3 +rich==13.6.0 rope==1.10.0 rpds-py==0.10.3 ruff==0.0.291 @@ -178,7 +178,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 terminado==0.17.1 @@ -190,15 +190,15 @@ tqdm==4.66.1 traitlets==5.10.1 types-docutils==0.20.0.3 types-pkg-resources==0.1.3 -types-requests==2.31.0.6 +types-python-dateutil==2.8.19.14 +types-requests==2.31.0.7 types-setuptools==68.2.0.0 -types-urllib3==1.26.25.14 typing-extensions==4.8.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 diff --git a/.constraints/py3.11.txt b/.constraints/py3.11.txt index 1e5c839d2..7d37a2aee 100644 --- a/.constraints/py3.11.txt +++ b/.constraints/py3.11.txt @@ -11,7 +11,7 @@ alabaster==0.7.13 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 attrs==23.1.0 babel==2.12.1 @@ -24,13 +24,13 @@ 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 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 @@ -40,23 +40,23 @@ 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 -fonttools==4.42.1 +fonttools==4.43.0 fqdn==1.5.1 gprof2dot==2022.7.29 graphviz==0.20.1 greenlet==2.0.2 hepunits==2.3.2 -identify==2.5.29 +identify==2.5.30 idna==3.4 imagesize==1.4.1 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 @@ -92,7 +92,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 mpl-interactions==0.23.2 mpmath==1.3.0 mypy==1.5.1 @@ -110,7 +110,7 @@ notebook==6.5.6 notebook-shim==0.2.3 numpy==1.26.0 overrides==7.4.0 -packaging==23.1 +packaging==23.2 pandocfilters==1.5.0 parso==0.8.3 particle==0.23.0 @@ -150,7 +150,7 @@ referencing==0.30.2 requests==2.31.0 rfc3339-validator==0.1.4 rfc3986-validator==0.1.1 -rich==13.5.3 +rich==13.6.0 rope==1.10.0 rpds-py==0.10.3 ruff==0.0.291 @@ -177,7 +177,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 terminado==0.17.1 @@ -188,15 +188,15 @@ tqdm==4.66.1 traitlets==5.10.1 types-docutils==0.20.0.3 types-pkg-resources==0.1.3 -types-requests==2.31.0.6 +types-python-dateutil==2.8.19.14 +types-requests==2.31.0.7 types-setuptools==68.2.0.0 -types-urllib3==1.26.25.14 typing-extensions==4.8.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 diff --git a/.constraints/py3.7.txt b/.constraints/py3.7.txt index a0bb30e3e..bc34f0002 100644 --- a/.constraints/py3.7.txt +++ b/.constraints/py3.7.txt @@ -24,7 +24,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 colorama==0.4.6 comm==0.1.4 @@ -40,7 +40,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 fonttools==4.38.0 fqdn==1.5.1 @@ -90,7 +90,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 mpl-interactions==0.23.2 mpmath==1.3.0 mypy==1.4.1 @@ -107,7 +107,7 @@ nodeenv==1.8.0 notebook==6.5.6 notebook-shim==0.2.3 numpy==1.21.6 -packaging==23.1 +packaging==23.2 pandocfilters==1.5.0 parso==0.8.3 particle==0.23.0 @@ -149,7 +149,7 @@ qrules==0.9.8 requests==2.31.0 rfc3339-validator==0.1.4 rfc3986-validator==0.1.1 -rich==13.5.3 +rich==13.6.0 rope==1.9.0 ruff==0.0.291 send2trash==1.8.2 @@ -188,15 +188,14 @@ traitlets==5.9.0 typed-ast==1.5.5 types-docutils==0.20.0.3 types-pkg-resources==0.1.3 -types-requests==2.31.0.6 +types-requests==2.31.0.7 types-setuptools==68.2.0.0 -types-urllib3==1.26.25.14 typing-extensions==4.7.1 ; python_version < "3.8.0" 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 bf1b359bd..4669e8b09 100644 --- a/.constraints/py3.8.txt +++ b/.constraints/py3.8.txt @@ -11,7 +11,7 @@ alabaster==0.7.13 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 attrs==23.1.0 babel==2.12.1 @@ -24,13 +24,13 @@ 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 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 @@ -41,16 +41,16 @@ 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 -fonttools==4.42.1 +fonttools==4.43.0 fqdn==1.5.1 gprof2dot==2022.7.29 graphviz==0.20.1 greenlet==2.0.2 hepunits==2.3.2 -identify==2.5.29 +identify==2.5.30 idna==3.4 imagesize==1.4.1 importlib-metadata==6.8.0 @@ -58,7 +58,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 @@ -94,7 +94,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 mpl-interactions==0.23.2 mpmath==1.3.0 mypy==1.5.1 @@ -112,7 +112,7 @@ notebook==6.5.6 notebook-shim==0.2.3 numpy==1.24.4 overrides==7.4.0 -packaging==23.1 +packaging==23.2 pandocfilters==1.5.0 parso==0.8.3 particle==0.23.0 @@ -154,7 +154,7 @@ referencing==0.30.2 requests==2.31.0 rfc3339-validator==0.1.4 rfc3986-validator==0.1.1 -rich==13.5.3 +rich==13.6.0 rope==1.10.0 rpds-py==0.10.3 ruff==0.0.291 @@ -181,7 +181,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 terminado==0.17.1 @@ -193,15 +193,15 @@ tqdm==4.66.1 traitlets==5.10.1 types-docutils==0.20.0.3 types-pkg-resources==0.1.3 -types-requests==2.31.0.6 +types-python-dateutil==2.8.19.14 +types-requests==2.31.0.7 types-setuptools==68.2.0.0 -types-urllib3==1.26.25.14 typing-extensions==4.8.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 diff --git a/.constraints/py3.9.txt b/.constraints/py3.9.txt index f9ee7e70a..9ab041cd1 100644 --- a/.constraints/py3.9.txt +++ b/.constraints/py3.9.txt @@ -11,7 +11,7 @@ alabaster==0.7.13 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 attrs==23.1.0 babel==2.12.1 @@ -24,13 +24,13 @@ 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 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 @@ -41,16 +41,16 @@ 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 -fonttools==4.42.1 +fonttools==4.43.0 fqdn==1.5.1 gprof2dot==2022.7.29 graphviz==0.20.1 greenlet==2.0.2 hepunits==2.3.2 -identify==2.5.29 +identify==2.5.30 idna==3.4 imagesize==1.4.1 importlib-metadata==6.8.0 @@ -58,7 +58,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 @@ -94,7 +94,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 mpl-interactions==0.23.2 mpmath==1.3.0 mypy==1.5.1 @@ -112,7 +112,7 @@ notebook==6.5.6 notebook-shim==0.2.3 numpy==1.26.0 overrides==7.4.0 -packaging==23.1 +packaging==23.2 pandocfilters==1.5.0 parso==0.8.3 particle==0.23.0 @@ -152,7 +152,7 @@ referencing==0.30.2 requests==2.31.0 rfc3339-validator==0.1.4 rfc3986-validator==0.1.1 -rich==13.5.3 +rich==13.6.0 rope==1.10.0 rpds-py==0.10.3 ruff==0.0.291 @@ -179,7 +179,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 terminado==0.17.1 @@ -191,15 +191,15 @@ tqdm==4.66.1 traitlets==5.10.1 types-docutils==0.20.0.3 types-pkg-resources==0.1.3 -types-requests==2.31.0.6 +types-python-dateutil==2.8.19.14 +types-requests==2.31.0.7 types-setuptools==68.2.0.0 -types-urllib3==1.26.25.14 typing-extensions==4.8.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 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 808881df5..0c5ddeddf 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -38,7 +38,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: @@ -92,7 +92,7 @@ repos: pass_filenames: false - repo: https://github.com/streetsidesoftware/cspell-cli - rev: v7.3.0 + rev: v7.3.1 hooks: - id: cspell From e6c6ef7546f4a86af8713502949b3264880a168e Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 2 Oct 2023 05:02:21 +0000 Subject: [PATCH 16/39] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- .markdownlint.json | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 .markdownlint.json diff --git a/.markdownlint.json b/.markdownlint.json deleted file mode 100644 index 23bb7fa67..000000000 --- a/.markdownlint.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "MD013": { "line_length": 88 }, - "MD026": { "punctuation": ".,;:。，；：！" }, - "MD033": { - "allowed_elements": ["br"] - } -} From b7b8192f5fc47415490a1847f477db2747eb117a Mon Sep 17 00:00:00 2001 From: Remco de Boer <29308176+redeboer@users.noreply.github.com> Date: Mon, 2 Oct 2023 10:16:14 +0200 Subject: [PATCH 17/39] MAINT: switch to new `sphinx-hep-pdgref` --- docs/conf.py | 2 +- setup.cfg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index e67da0019..ff98fff7a 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -141,10 +141,10 @@ def fetch_logo(url: str, output_path: str) -> None: "sphinx_comments", "sphinx_copybutton", "sphinx_design", + "sphinx_hep_pdgref", "sphinx_thebe", "sphinx_togglebutton", "sphinxcontrib.bibtex", - "sphinxcontrib.hep.pdgref", ] exclude_patterns = [ "**.ipynb_checkpoints", diff --git a/setup.cfg b/setup.cfg index 3e6281d40..ff5e2ea12 100644 --- a/setup.cfg +++ b/setup.cfg @@ -74,10 +74,10 @@ doc = sphinx-comments sphinx-copybutton sphinx-design + sphinx-hep-pdgref sphinx-thebe sphinx-togglebutton sphinxcontrib-bibtex >=2 - sphinxcontrib-hep-pdgref test = black ipywidgets # symplot From ec4dd4ffc352efc83952c2a12508ae75d2dd7e14 Mon Sep 17 00:00:00 2001 From: GitHub Date: Mon, 2 Oct 2023 08:18:35 +0000 Subject: [PATCH 18/39] MAINT: update pip constraints and pre-commit --- .constraints/py3.10.txt | 2 +- .constraints/py3.11.txt | 2 +- .constraints/py3.7.txt | 2 +- .constraints/py3.8.txt | 2 +- .constraints/py3.9.txt | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.constraints/py3.10.txt b/.constraints/py3.10.txt index 843b77581..2d06144ef 100644 --- a/.constraints/py3.10.txt +++ b/.constraints/py3.10.txt @@ -167,12 +167,12 @@ sphinx-codeautolink==0.15.0 sphinx-comments==0.0.3 sphinx-copybutton==0.5.2 sphinx-design==0.5.0 +sphinx-hep-pdgref==0.2.0 sphinx-thebe==0.2.1 sphinx-togglebutton==0.3.2 sphinxcontrib-applehelp==1.0.7 sphinxcontrib-bibtex==2.6.1 sphinxcontrib-devhelp==1.0.5 -sphinxcontrib-hep-pdgref==0.1.5 sphinxcontrib-htmlhelp==2.0.4 sphinxcontrib-jsmath==1.0.1 sphinxcontrib-qthelp==1.0.6 diff --git a/.constraints/py3.11.txt b/.constraints/py3.11.txt index 7d37a2aee..c39968e0e 100644 --- a/.constraints/py3.11.txt +++ b/.constraints/py3.11.txt @@ -166,12 +166,12 @@ sphinx-codeautolink==0.15.0 sphinx-comments==0.0.3 sphinx-copybutton==0.5.2 sphinx-design==0.5.0 +sphinx-hep-pdgref==0.2.0 sphinx-thebe==0.2.1 sphinx-togglebutton==0.3.2 sphinxcontrib-applehelp==1.0.7 sphinxcontrib-bibtex==2.6.1 sphinxcontrib-devhelp==1.0.5 -sphinxcontrib-hep-pdgref==0.1.5 sphinxcontrib-htmlhelp==2.0.4 sphinxcontrib-jsmath==1.0.1 sphinxcontrib-qthelp==1.0.6 diff --git a/.constraints/py3.7.txt b/.constraints/py3.7.txt index bc34f0002..56e36f278 100644 --- a/.constraints/py3.7.txt +++ b/.constraints/py3.7.txt @@ -165,12 +165,12 @@ sphinx-codeautolink==0.15.0 sphinx-comments==0.0.3 sphinx-copybutton==0.5.2 sphinx-design==0.4.1 +sphinx-hep-pdgref==0.2.0 sphinx-thebe==0.2.1 sphinx-togglebutton==0.3.2 sphinxcontrib-applehelp==1.0.2 sphinxcontrib-bibtex==2.6.1 sphinxcontrib-devhelp==1.0.2 -sphinxcontrib-hep-pdgref==0.1.5 sphinxcontrib-htmlhelp==2.0.0 sphinxcontrib-jsmath==1.0.1 sphinxcontrib-qthelp==1.0.3 diff --git a/.constraints/py3.8.txt b/.constraints/py3.8.txt index 4669e8b09..226fe5a44 100644 --- a/.constraints/py3.8.txt +++ b/.constraints/py3.8.txt @@ -170,12 +170,12 @@ sphinx-codeautolink==0.15.0 sphinx-comments==0.0.3 sphinx-copybutton==0.5.2 sphinx-design==0.5.0 +sphinx-hep-pdgref==0.2.0 sphinx-thebe==0.2.1 sphinx-togglebutton==0.3.2 sphinxcontrib-applehelp==1.0.4 sphinxcontrib-bibtex==2.6.1 sphinxcontrib-devhelp==1.0.2 -sphinxcontrib-hep-pdgref==0.1.5 sphinxcontrib-htmlhelp==2.0.1 sphinxcontrib-jsmath==1.0.1 sphinxcontrib-qthelp==1.0.3 diff --git a/.constraints/py3.9.txt b/.constraints/py3.9.txt index 9ab041cd1..e39efe0cd 100644 --- a/.constraints/py3.9.txt +++ b/.constraints/py3.9.txt @@ -168,12 +168,12 @@ sphinx-codeautolink==0.15.0 sphinx-comments==0.0.3 sphinx-copybutton==0.5.2 sphinx-design==0.5.0 +sphinx-hep-pdgref==0.2.0 sphinx-thebe==0.2.1 sphinx-togglebutton==0.3.2 sphinxcontrib-applehelp==1.0.7 sphinxcontrib-bibtex==2.6.1 sphinxcontrib-devhelp==1.0.5 -sphinxcontrib-hep-pdgref==0.1.5 sphinxcontrib-htmlhelp==2.0.4 sphinxcontrib-jsmath==1.0.1 sphinxcontrib-qthelp==1.0.6 From ae5738c7b05c3e975d0bea2048a06e4bdbf150e6 Mon Sep 17 00:00:00 2001 From: GitHub Date: Tue, 3 Oct 2023 19:47:14 +0000 Subject: [PATCH 19/39] MAINT: update pip constraints and pre-commit --- .constraints/py3.10.txt | 20 ++++++++++---------- .constraints/py3.11.txt | 20 ++++++++++---------- .constraints/py3.7.txt | 10 +++++----- .constraints/py3.8.txt | 18 +++++++++--------- .constraints/py3.9.txt | 20 ++++++++++---------- .pre-commit-config.yaml | 6 +++--- 6 files changed, 47 insertions(+), 47 deletions(-) diff --git a/.constraints/py3.10.txt b/.constraints/py3.10.txt index 2d06144ef..5431a180f 100644 --- a/.constraints/py3.10.txt +++ b/.constraints/py3.10.txt @@ -14,7 +14,7 @@ argon2-cffi-bindings==21.2.0 arrow==1.3.0 asttokens==2.4.0 attrs==23.1.0 -babel==2.12.1 +babel==2.13.0 backcall==0.2.0 beautifulsoup4==4.12.2 black==23.9.1 @@ -29,7 +29,7 @@ click==8.1.7 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 @@ -48,7 +48,7 @@ fonttools==4.43.0 fqdn==1.5.1 gprof2dot==2022.7.29 graphviz==0.20.1 -greenlet==2.0.2 +greenlet==3.0.0 hepunits==2.3.2 identify==2.5.30 idna==3.4 @@ -57,11 +57,11 @@ 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 -jedi==0.19.0 +jedi==0.19.1 jinja2==3.1.2 json5==0.9.14 jsonpointer==2.4 @@ -104,7 +104,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 @@ -119,7 +119,7 @@ pathspec==0.11.2 pexpect==4.8.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 @@ -154,7 +154,7 @@ rfc3986-validator==0.1.1 rich==13.6.0 rope==1.10.0 rpds-py==0.10.3 -ruff==0.0.291 +ruff==0.0.292 send2trash==1.8.2 six==1.16.0 sniffio==1.3.0 @@ -187,7 +187,7 @@ 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-docutils==0.20.0.3 types-pkg-resources==0.1.3 types-python-dateutil==2.8.19.14 @@ -196,7 +196,7 @@ types-setuptools==68.2.0.0 typing-extensions==4.8.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 c39968e0e..f58a74fac 100644 --- a/.constraints/py3.11.txt +++ b/.constraints/py3.11.txt @@ -14,7 +14,7 @@ argon2-cffi-bindings==21.2.0 arrow==1.3.0 asttokens==2.4.0 attrs==23.1.0 -babel==2.12.1 +babel==2.13.0 backcall==0.2.0 beautifulsoup4==4.12.2 black==23.9.1 @@ -29,7 +29,7 @@ click==8.1.7 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 @@ -47,7 +47,7 @@ fonttools==4.43.0 fqdn==1.5.1 gprof2dot==2022.7.29 graphviz==0.20.1 -greenlet==2.0.2 +greenlet==3.0.0 hepunits==2.3.2 identify==2.5.30 idna==3.4 @@ -56,11 +56,11 @@ 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 -jedi==0.19.0 +jedi==0.19.1 jinja2==3.1.2 json5==0.9.14 jsonpointer==2.4 @@ -103,7 +103,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 @@ -118,7 +118,7 @@ pathspec==0.11.2 pexpect==4.8.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 @@ -153,7 +153,7 @@ rfc3986-validator==0.1.1 rich==13.6.0 rope==1.10.0 rpds-py==0.10.3 -ruff==0.0.291 +ruff==0.0.292 send2trash==1.8.2 six==1.16.0 sniffio==1.3.0 @@ -185,7 +185,7 @@ 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-docutils==0.20.0.3 types-pkg-resources==0.1.3 types-python-dateutil==2.8.19.14 @@ -194,7 +194,7 @@ types-setuptools==68.2.0.0 typing-extensions==4.8.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 56e36f278..a579ad8fe 100644 --- a/.constraints/py3.7.txt +++ b/.constraints/py3.7.txt @@ -13,7 +13,7 @@ argon2-cffi==23.1.0 argon2-cffi-bindings==21.2.0 arrow==1.2.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 @@ -46,7 +46,7 @@ fonttools==4.38.0 fqdn==1.5.1 gprof2dot==2022.7.29 graphviz==0.20.1 -greenlet==2.0.2 +greenlet==3.0.0 hepunits==2.3.2 identify==2.5.24 idna==3.4 @@ -116,7 +116,7 @@ pexpect==4.8.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 @@ -151,7 +151,7 @@ rfc3339-validator==0.1.4 rfc3986-validator==0.1.1 rich==13.6.0 rope==1.9.0 -ruff==0.0.291 +ruff==0.0.292 send2trash==1.8.2 singledispatchmethod==1.0 ; python_version < "3.8.0" six==1.16.0 @@ -193,7 +193,7 @@ types-setuptools==68.2.0.0 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 226fe5a44..099817d29 100644 --- a/.constraints/py3.8.txt +++ b/.constraints/py3.8.txt @@ -14,7 +14,7 @@ argon2-cffi-bindings==21.2.0 arrow==1.3.0 asttokens==2.4.0 attrs==23.1.0 -babel==2.12.1 +babel==2.13.0 backcall==0.2.0 beautifulsoup4==4.12.2 black==23.9.1 @@ -29,7 +29,7 @@ click==8.1.7 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 @@ -48,7 +48,7 @@ fonttools==4.43.0 fqdn==1.5.1 gprof2dot==2022.7.29 graphviz==0.20.1 -greenlet==2.0.2 +greenlet==3.0.0 hepunits==2.3.2 identify==2.5.30 idna==3.4 @@ -62,7 +62,7 @@ ipython==8.12.3 ipython-genutils==0.2.0 ipywidgets==8.1.1 isoduration==20.11.0 -jedi==0.19.0 +jedi==0.19.1 jinja2==3.1.2 json5==0.9.14 jsonpointer==2.4 @@ -105,7 +105,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 @@ -121,7 +121,7 @@ pexpect==4.8.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 @@ -157,7 +157,7 @@ rfc3986-validator==0.1.1 rich==13.6.0 rope==1.10.0 rpds-py==0.10.3 -ruff==0.0.291 +ruff==0.0.292 send2trash==1.8.2 six==1.16.0 sniffio==1.3.0 @@ -190,7 +190,7 @@ 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-docutils==0.20.0.3 types-pkg-resources==0.1.3 types-python-dateutil==2.8.19.14 @@ -199,7 +199,7 @@ types-setuptools==68.2.0.0 typing-extensions==4.8.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 e39efe0cd..32192705b 100644 --- a/.constraints/py3.9.txt +++ b/.constraints/py3.9.txt @@ -14,7 +14,7 @@ argon2-cffi-bindings==21.2.0 arrow==1.3.0 asttokens==2.4.0 attrs==23.1.0 -babel==2.12.1 +babel==2.13.0 backcall==0.2.0 beautifulsoup4==4.12.2 black==23.9.1 @@ -29,7 +29,7 @@ click==8.1.7 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 @@ -48,7 +48,7 @@ fonttools==4.43.0 fqdn==1.5.1 gprof2dot==2022.7.29 graphviz==0.20.1 -greenlet==2.0.2 +greenlet==3.0.0 hepunits==2.3.2 identify==2.5.30 idna==3.4 @@ -58,11 +58,11 @@ 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 -jedi==0.19.0 +jedi==0.19.1 jinja2==3.1.2 json5==0.9.14 jsonpointer==2.4 @@ -105,7 +105,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 @@ -120,7 +120,7 @@ pathspec==0.11.2 pexpect==4.8.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 @@ -155,7 +155,7 @@ rfc3986-validator==0.1.1 rich==13.6.0 rope==1.10.0 rpds-py==0.10.3 -ruff==0.0.291 +ruff==0.0.292 send2trash==1.8.2 six==1.16.0 sniffio==1.3.0 @@ -188,7 +188,7 @@ 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-docutils==0.20.0.3 types-pkg-resources==0.1.3 types-python-dateutil==2.8.19.14 @@ -197,7 +197,7 @@ types-setuptools==68.2.0.0 typing-extensions==4.8.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 0c5ddeddf..3b3b94e13 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -38,7 +38,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: @@ -153,14 +153,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 b9aeb9be205180294e9b76b7191730be8e69968a 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:47:41 +0000 Subject: [PATCH 20/39] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- .pre-commit-config.yaml | 8 +- .taplo.toml | 3 + pyproject.toml | 161 +++++++++++++++++++++++++++++++++++++++- setup.cfg | 130 -------------------------------- setup.py | 6 -- 5 files changed, 169 insertions(+), 139 deletions(-) delete mode 100644 setup.cfg delete mode 100644 setup.py diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 3b3b94e13..5b3eed72f 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -48,7 +48,6 @@ repos: - --repo-title=AmpForm - id: colab-toc-visible - id: fix-nbformat-version - - id: format-setup-cfg - id: set-nb-cells args: - --add-install-cell @@ -170,3 +169,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 f5caabee4..424b74695 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 8c4df1bd3..e5e20f68c 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/version.py" @@ -238,3 +238,160 @@ known-third-party = ["sympy"] [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 = ["py.typed"] +symplot = ["py.typed"] + +[project] +name = "ampform" +description = "Automatically generate symbolic amplitude models for Partial Wave Analysis" +authors = [{name = "Common Partial Wave Analysis", email = "compwa-admin@ep1.rub.de"}] +maintainers = [{email = "compwa-admin@ep1.rub.de"}] +license = {text = "GPLv3 or later"} +keywords = [ + "HEP", + "PWA", + "amplitude analysis", + "partial wave analysis", + "particle physics", + "particles", + "physics", +] +classifiers = [ + "Development Status :: 4 - Beta", + "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 = [ + "attrs >=20.1.0", # on_setattr and https://www.attrs.org/en/stable/api.html#next-gen + "qrules ==0.9.*, >=0.9.6", # https://github.com/ComPWA/qrules/pull/145 + 'singledispatchmethod; python_version <"3.8.0"', + "sympy >=1.10", + '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/issues" +Changelog = "https://github.com/ComPWA/ampform/releases" +Documentation = "https://ampform.rtfd.io" +Source = "https://github.com/ComPWA/ampform" + +[project.optional-dependencies] +viz = [ + "graphviz", +] +all = [ + "ampform[viz]", +] +doc = [ + "ampform[viz]", + "black", + 'importlib-metadata; python_version <"3.8.0"', + "ipympl", + "matplotlib", + "mpl-interactions", + "myst-nb >=0.14", # nb_ configuration prefixes + "nbclient >=0.5.5", # https://github.com/executablebooks/jupyter-book/issues/833 + "numpy", + "rich", + "Sphinx >=3", + "sphinx-book-theme", + "sphinx-codeautolink[ipython]", + "sphinx-comments", + "sphinx-copybutton", + "sphinx-design", + "sphinx-hep-pdgref", + "sphinx-thebe", + "sphinx-togglebutton", + "sphinxcontrib-bibtex >=2", +] +test = [ + "black", + "ipywidgets", # symplot + "nbmake", + 'nbmake <1.3; python_version=="3.7.*"', + "numpy", + "pytest", + "pytest-cov", + "pytest-profiling", + "pytest-xdist", +] +format = [ + "black", +] +mypy = [ + "mypy >=0.730", # error code support + "types-docutils", + "types-pkg-resources", + "types-requests", + "types-setuptools", +] +lint = [ + "ampform[mypy]", + "ruff", +] +sty = [ + "ampform[format]", + "ampform[lint]", + "ampform[test]", # for pytest type hints + "pre-commit >=1.4.0", +] +jupyter = [ + "jupyterlab", + "jupyterlab-code-formatter", + "jupyterlab-lsp", + "jupyterlab-myst", + "python-lsp-server[rope]", + 'ypy-websocket <0.8.3; python_version <"3.8.0"', +] +dev = [ + "ampform[all]", + "ampform[doc]", + "ampform[jupyter]", + "ampform[sty]", + "ampform[test]", + "sphinx-autobuild", + "tox >=1.9", # for skip_install, use_develop +] diff --git a/setup.cfg b/setup.cfg deleted file mode 100644 index ff5e2ea12..000000000 --- a/setup.cfg +++ /dev/null @@ -1,130 +0,0 @@ -[metadata] -name = ampform -description = Automatically generate symbolic amplitude models for Partial Wave Analysis -author = Common Partial Wave Analysis -author_email = compwa-admin@ep1.rub.de -maintainer_email = compwa-admin@ep1.rub.de -long_description = file: README.md -long_description_content_type = text/markdown -project_urls = - Tracker = https://github.com/ComPWA/ampform/issues - Changelog = https://github.com/ComPWA/ampform/releases - Documentation = https://ampform.rtfd.io - Source = https://github.com/ComPWA/ampform -license = GPLv3 or later -keywords = - HEP - PWA - amplitude analysis - partial wave analysis - particle physics - particles - physics -classifiers = - Development Status :: 4 - Beta - 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 = - attrs >=20.1.0 # on_setattr and https://www.attrs.org/en/stable/api.html#next-gen - qrules ==0.9.*, >=0.9.6 # https://github.com/ComPWA/qrules/pull/145 - singledispatchmethod; python_version <"3.8.0" - sympy >=1.10 - typing-extensions; python_version <"3.8.0" -packages = find: -package_dir = - =src - -[options.extras_require] -viz = - graphviz -all = - %(viz)s -doc = - %(viz)s - black - importlib-metadata; python_version <"3.8.0" - ipympl - matplotlib - mpl-interactions - myst-nb >=0.14 # nb_ configuration prefixes - nbclient >=0.5.5 # https://github.com/executablebooks/jupyter-book/issues/833 - numpy - rich - Sphinx >=3 - sphinx-book-theme - sphinx-codeautolink[ipython] - sphinx-comments - sphinx-copybutton - sphinx-design - sphinx-hep-pdgref - sphinx-thebe - sphinx-togglebutton - sphinxcontrib-bibtex >=2 -test = - black - ipywidgets # symplot - nbmake - nbmake <1.3; python_version=="3.7.*" - numpy - pytest - pytest-cov - pytest-profiling - pytest-xdist -format = - black -mypy = - mypy >=0.730 # error code support - types-docutils - types-pkg-resources - types-requests - types-setuptools -lint = - %(mypy)s - ruff -sty = - %(format)s - %(lint)s - %(test)s # for pytest type hints - pre-commit >=1.4.0 -jupyter = - jupyterlab - jupyterlab-code-formatter - jupyterlab-lsp - jupyterlab-myst - python-lsp-server[rope] - ypy-websocket <0.8.3; python_version <"3.8.0" -dev = - %(all)s - %(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 = - py.typed -symplot = - py.typed diff --git a/setup.py b/setup.py deleted file mode 100644 index 93296978a..000000000 --- a/setup.py +++ /dev/null @@ -1,6 +0,0 @@ -from setuptools import setup - -setup( - use_scm_version=True, - setup_requires=["setuptools_scm"], -) From 399fb592b0852ab07336c1245e50c9c85a385e5f Mon Sep 17 00:00:00 2001 From: GitHub Date: Tue, 3 Oct 2023 19:51:38 +0000 Subject: [PATCH 21/39] 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 5431a180f..003a5cfe9 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 --unsafe-package=pip --unsafe-package=setuptools --unsafe-package=symplot # accessible-pygments==0.0.4 aiofiles==22.1.0 @@ -210,4 +210,5 @@ ypy-websocket==0.8.4 zipp==3.17.0 # The following packages are considered to be unsafe in a requirements file: +# ampform # setuptools diff --git a/.constraints/py3.11.txt b/.constraints/py3.11.txt index f58a74fac..69d468934 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 --unsafe-package=pip --unsafe-package=setuptools --unsafe-package=symplot # accessible-pygments==0.0.4 aiofiles==22.1.0 @@ -208,4 +208,5 @@ ypy-websocket==0.8.4 zipp==3.17.0 # The following packages are considered to be unsafe in a requirements file: +# ampform # setuptools diff --git a/.constraints/py3.7.txt b/.constraints/py3.7.txt index a579ad8fe..d97cfa249 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 --unsafe-package=pip --unsafe-package=setuptools --unsafe-package=symplot # accessible-pygments==0.0.4 aiofiles==22.1.0 @@ -51,7 +51,7 @@ hepunits==2.3.2 identify==2.5.24 idna==3.4 imagesize==1.4.1 -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 @@ -101,7 +101,7 @@ nbclassic==1.0.0 nbclient==0.5.13 nbconvert==7.6.0 nbformat==5.8.0 -nbmake==1.2.1 ; python_version == "3.7.*" +nbmake==1.2.1 nest-asyncio==1.5.8 nodeenv==1.8.0 notebook==6.5.6 @@ -203,8 +203,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 # setuptools diff --git a/.constraints/py3.8.txt b/.constraints/py3.8.txt index 099817d29..5274f5c34 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 --unsafe-package=pip --unsafe-package=setuptools --unsafe-package=symplot # accessible-pygments==0.0.4 aiofiles==22.1.0 @@ -213,4 +213,5 @@ ypy-websocket==0.8.4 zipp==3.17.0 # The following packages are considered to be unsafe in a requirements file: +# ampform # setuptools diff --git a/.constraints/py3.9.txt b/.constraints/py3.9.txt index 32192705b..448fb24ef 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 --unsafe-package=pip --unsafe-package=setuptools --unsafe-package=symplot # accessible-pygments==0.0.4 aiofiles==22.1.0 @@ -211,4 +211,5 @@ ypy-websocket==0.8.4 zipp==3.17.0 # The following packages are considered to be unsafe in a requirements file: +# ampform # setuptools diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 5b3eed72f..55eced2de 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -171,7 +171,7 @@ repos: - id: taplo - repo: https://github.com/pappasam/toml-sort - rev: PLEASE-UPDATE + rev: v0.23.1 hooks: - id: toml-sort args: From efcde498eda20ebf8aed55ee39aeee56367be1b2 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:52:04 +0000 Subject: [PATCH 22/39] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- pyproject.toml | 290 ++++++++++++++++++++++++------------------------- 1 file changed, 145 insertions(+), 145 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index e5e20f68c..0988a56aa 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,9 +1,152 @@ [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 :: 4 - Beta", + "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 = [ + "attrs >=20.1.0", # on_setattr and https://www.attrs.org/en/stable/api.html#next-gen + "qrules ==0.9.*, >=0.9.6", # https://github.com/ComPWA/qrules/pull/145 + 'singledispatchmethod; python_version <"3.8.0"', + "sympy >=1.10", + 'typing-extensions; python_version <"3.8.0"', +] +description = "Automatically generate symbolic amplitude models for Partial Wave Analysis" +dynamic = ["version"] +keywords = [ + "HEP", + "PWA", + "amplitude analysis", + "partial wave analysis", + "particle physics", + "particles", + "physics", +] +license = {text = "GPLv3 or later"} +maintainers = [{email = "compwa-admin@ep1.rub.de"}] +name = "ampform" +requires-python = ">=3.7" + +[project.optional-dependencies] +all = [ + "ampform[viz]", +] +dev = [ + "ampform[all]", + "ampform[doc]", + "ampform[jupyter]", + "ampform[sty]", + "ampform[test]", + "sphinx-autobuild", + "tox >=1.9", # for skip_install, use_develop +] +doc = [ + "ampform[viz]", + "black", + 'importlib-metadata; python_version <"3.8.0"', + "ipympl", + "matplotlib", + "mpl-interactions", + "myst-nb >=0.14", # nb_ configuration prefixes + "nbclient >=0.5.5", # https://github.com/executablebooks/jupyter-book/issues/833 + "numpy", + "rich", + "Sphinx >=3", + "sphinx-book-theme", + "sphinx-codeautolink[ipython]", + "sphinx-comments", + "sphinx-copybutton", + "sphinx-design", + "sphinx-hep-pdgref", + "sphinx-thebe", + "sphinx-togglebutton", + "sphinxcontrib-bibtex >=2", +] +format = [ + "black", +] +jupyter = [ + "jupyterlab", + "jupyterlab-code-formatter", + "jupyterlab-lsp", + "jupyterlab-myst", + "python-lsp-server[rope]", + 'ypy-websocket <0.8.3; python_version <"3.8.0"', +] +lint = [ + "ampform[mypy]", + "ruff", +] +mypy = [ + "mypy >=0.730", # error code support + "types-docutils", + "types-pkg-resources", + "types-requests", + "types-setuptools", +] +sty = [ + "ampform[format]", + "ampform[lint]", + "ampform[test]", # for pytest type hints + "pre-commit >=1.4.0", +] +test = [ + "black", + "ipywidgets", # symplot + "nbmake", + 'nbmake <1.3; python_version=="3.7.*"', + "numpy", + "pytest", + "pytest-cov", + "pytest-profiling", + "pytest-xdist", +] +viz = [ + "graphviz", +] + +[project.readme] +content-type = "text/markdown" +file = "README.md" + +[project.urls] +Changelog = "https://github.com/ComPWA/ampform/releases" +Documentation = "https://ampform.rtfd.io" +Source = "https://github.com/ComPWA/ampform" +Tracker = "https://github.com/ComPWA/ampform/issues" + +[tool.setuptools] +include-package-data = false +package-dir = {"" = "src"} + +[tool.setuptools.package-data] +ampform = ["py.typed"] +symplot = ["py.typed"] + +[tool.setuptools.packages.find] +namespaces = false +where = ["src"] [tool.setuptools_scm] write_to = "src/ampform/version.py" @@ -88,7 +231,7 @@ ruff = [ "--extend-ignore=PLR2004", "--extend-ignore=PLW0602", "--extend-ignore=PLW0603", - "--extend-ignore=S301", # allow pickle + "--extend-ignore=S301", # allow pickle "--extend-ignore=TCH002", "--line-length=85", ] @@ -252,146 +395,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 = ["py.typed"] -symplot = ["py.typed"] - -[project] -name = "ampform" -description = "Automatically generate symbolic amplitude models for Partial Wave Analysis" -authors = [{name = "Common Partial Wave Analysis", email = "compwa-admin@ep1.rub.de"}] -maintainers = [{email = "compwa-admin@ep1.rub.de"}] -license = {text = "GPLv3 or later"} -keywords = [ - "HEP", - "PWA", - "amplitude analysis", - "partial wave analysis", - "particle physics", - "particles", - "physics", -] -classifiers = [ - "Development Status :: 4 - Beta", - "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 = [ - "attrs >=20.1.0", # on_setattr and https://www.attrs.org/en/stable/api.html#next-gen - "qrules ==0.9.*, >=0.9.6", # https://github.com/ComPWA/qrules/pull/145 - 'singledispatchmethod; python_version <"3.8.0"', - "sympy >=1.10", - '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/issues" -Changelog = "https://github.com/ComPWA/ampform/releases" -Documentation = "https://ampform.rtfd.io" -Source = "https://github.com/ComPWA/ampform" - -[project.optional-dependencies] -viz = [ - "graphviz", -] -all = [ - "ampform[viz]", -] -doc = [ - "ampform[viz]", - "black", - 'importlib-metadata; python_version <"3.8.0"', - "ipympl", - "matplotlib", - "mpl-interactions", - "myst-nb >=0.14", # nb_ configuration prefixes - "nbclient >=0.5.5", # https://github.com/executablebooks/jupyter-book/issues/833 - "numpy", - "rich", - "Sphinx >=3", - "sphinx-book-theme", - "sphinx-codeautolink[ipython]", - "sphinx-comments", - "sphinx-copybutton", - "sphinx-design", - "sphinx-hep-pdgref", - "sphinx-thebe", - "sphinx-togglebutton", - "sphinxcontrib-bibtex >=2", -] -test = [ - "black", - "ipywidgets", # symplot - "nbmake", - 'nbmake <1.3; python_version=="3.7.*"', - "numpy", - "pytest", - "pytest-cov", - "pytest-profiling", - "pytest-xdist", -] -format = [ - "black", -] -mypy = [ - "mypy >=0.730", # error code support - "types-docutils", - "types-pkg-resources", - "types-requests", - "types-setuptools", -] -lint = [ - "ampform[mypy]", - "ruff", -] -sty = [ - "ampform[format]", - "ampform[lint]", - "ampform[test]", # for pytest type hints - "pre-commit >=1.4.0", -] -jupyter = [ - "jupyterlab", - "jupyterlab-code-formatter", - "jupyterlab-lsp", - "jupyterlab-myst", - "python-lsp-server[rope]", - 'ypy-websocket <0.8.3; python_version <"3.8.0"', -] -dev = [ - "ampform[all]", - "ampform[doc]", - "ampform[jupyter]", - "ampform[sty]", - "ampform[test]", - "sphinx-autobuild", - "tox >=1.9", # for skip_install, use_develop -] From 2fc1969f1aa78d172de6b2b6e69925f44fb1d079 Mon Sep 17 00:00:00 2001 From: GitHub Date: Tue, 3 Oct 2023 20:02:57 +0000 Subject: [PATCH 23/39] MAINT: implement updates from pre-commit hooks --- pyproject.toml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 0988a56aa..0c344b8eb 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -15,21 +15,21 @@ 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 = [ "attrs >=20.1.0", # on_setattr and https://www.attrs.org/en/stable/api.html#next-gen "qrules ==0.9.*, >=0.9.6", # https://github.com/ComPWA/qrules/pull/145 - 'singledispatchmethod; python_version <"3.8.0"', "sympy >=1.10", + 'singledispatchmethod; python_version <"3.8.0"', 'typing-extensions; python_version <"3.8.0"', ] description = "Automatically generate symbolic amplitude models for Partial Wave Analysis" @@ -62,9 +62,9 @@ dev = [ "tox >=1.9", # for skip_install, use_develop ] doc = [ + "Sphinx >=3", "ampform[viz]", "black", - 'importlib-metadata; python_version <"3.8.0"', "ipympl", "matplotlib", "mpl-interactions", @@ -72,7 +72,6 @@ doc = [ "nbclient >=0.5.5", # https://github.com/executablebooks/jupyter-book/issues/833 "numpy", "rich", - "Sphinx >=3", "sphinx-book-theme", "sphinx-codeautolink[ipython]", "sphinx-comments", @@ -82,6 +81,7 @@ doc = [ "sphinx-thebe", "sphinx-togglebutton", "sphinxcontrib-bibtex >=2", + 'importlib-metadata; python_version <"3.8.0"', ] format = [ "black", @@ -115,12 +115,12 @@ test = [ "black", "ipywidgets", # symplot "nbmake", - 'nbmake <1.3; python_version=="3.7.*"', "numpy", "pytest", "pytest-cov", "pytest-profiling", "pytest-xdist", + 'nbmake <1.3; python_version=="3.7.*"', ] viz = [ "graphviz", From adbdade2b561b0375122ad65bdcf912e364dd05b Mon Sep 17 00:00:00 2001 From: Remco de Boer <29308176+redeboer@users.noreply.github.com> Date: Thu, 5 Oct 2023 13:40:21 +0200 Subject: [PATCH 24/39] 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 55eced2de..0e308bee5 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -96,7 +96,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 80cf6b46646aa89148f7b43c99c6833ca5e0f396 Mon Sep 17 00:00:00 2001 From: Remco de Boer <29308176+redeboer@users.noreply.github.com> Date: Thu, 5 Oct 2023 16:19:57 +0200 Subject: [PATCH 25/39] 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 0e308bee5..022163feb 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -38,7 +38,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: @@ -147,7 +147,7 @@ repos: - id: prettier - repo: https://github.com/ComPWA/mirrors-pyright - rev: v1.1.329 + rev: v1.1.330 hooks: - id: pyright From 5cb2b2da2be007ee92c98f81c0772d239204a385 Mon Sep 17 00:00:00 2001 From: Remco de Boer <29308176+redeboer@users.noreply.github.com> Date: Thu, 5 Oct 2023 16:26:08 +0200 Subject: [PATCH 26/39] 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 4bfee1c60..433b146b3 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -50,6 +50,7 @@ "livePreview.defaultPreviewPath": "docs/_build/html", "mypy-type-checker.args": ["--config-file", "pyproject.toml"], "mypy-type-checker.importStrategy": "fromEnvironment", + "notebook.gotoSymbols.showAllSymbols": true, "python.analysis.autoImportCompletions": false, "python.analysis.inlayHints.pytestParameters": true, "python.analysis.typeCheckingMode": "strict", From 76912100b774aff8efe8834bc01562147713851f Mon Sep 17 00:00:00 2001 From: Remco de Boer <29308176+redeboer@users.noreply.github.com> Date: Thu, 5 Oct 2023 16:28:03 +0200 Subject: [PATCH 27/39] DX: lint PRs with shared commitlint config --- .github/workflows/pr-linting.yml | 15 ++++++++------- commitlint.config.js | 11 ----------- 2 files changed, 8 insertions(+), 18 deletions(-) delete mode 100644 commitlint.config.js diff --git a/.github/workflows/pr-linting.yml b/.github/workflows/pr-linting.yml index ef8190acf..54f42615b 100644 --- a/.github/workflows/pr-linting.yml +++ b/.github/workflows/pr-linting.yml @@ -1,5 +1,3 @@ -# cspell:ignore agilepathway commitlint kode - name: PR linting on: pull_request: @@ -16,10 +14,10 @@ jobs: name: Check labels runs-on: ubuntu-20.04 steps: - - 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 + any_of: >- + 🐛 Bug,✨ Feature,⚙️ Enhancement,⚠️ Interface,❗ Behavior,📝 Docs,🔨 Maintenance,🖱️ DX none_of: Epic,💫 Good first issue repo_token: ${{ secrets.GITHUB_TOKEN }} @@ -28,5 +26,8 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v4 - - run: npm install @commitlint/config-conventional - - 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/commitlint.config.js b/commitlint.config.js deleted file mode 100644 index d8b6bdcda..000000000 --- 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 e71490cee9b1e1279754b1b340a8466c27d0cabe Mon Sep 17 00:00:00 2001 From: GitHub Date: Thu, 5 Oct 2023 14:30:48 +0000 Subject: [PATCH 28/39] MAINT: update pip constraints and pre-commit --- .constraints/py3.10.txt | 10 +++++----- .constraints/py3.11.txt | 10 +++++----- .constraints/py3.7.txt | 2 +- .constraints/py3.8.txt | 10 +++++----- .constraints/py3.9.txt | 10 +++++----- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/.constraints/py3.10.txt b/.constraints/py3.10.txt index 003a5cfe9..e4097085b 100644 --- a/.constraints/py3.10.txt +++ b/.constraints/py3.10.txt @@ -102,7 +102,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 @@ -153,7 +153,7 @@ rfc3339-validator==0.1.4 rfc3986-validator==0.1.1 rich==13.6.0 rope==1.10.0 -rpds-py==0.10.3 +rpds-py==0.10.4 ruff==0.0.292 send2trash==1.8.2 six==1.16.0 @@ -187,11 +187,11 @@ 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-docutils==0.20.0.3 types-pkg-resources==0.1.3 types-python-dateutil==2.8.19.14 -types-requests==2.31.0.7 +types-requests==2.31.0.8 types-setuptools==68.2.0.0 typing-extensions==4.8.0 ujson==5.8.0 @@ -205,7 +205,7 @@ websocket-client==1.6.3 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.11.txt b/.constraints/py3.11.txt index 69d468934..84ab83032 100644 --- a/.constraints/py3.11.txt +++ b/.constraints/py3.11.txt @@ -101,7 +101,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 @@ -152,7 +152,7 @@ rfc3339-validator==0.1.4 rfc3986-validator==0.1.1 rich==13.6.0 rope==1.10.0 -rpds-py==0.10.3 +rpds-py==0.10.4 ruff==0.0.292 send2trash==1.8.2 six==1.16.0 @@ -185,11 +185,11 @@ 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-docutils==0.20.0.3 types-pkg-resources==0.1.3 types-python-dateutil==2.8.19.14 -types-requests==2.31.0.7 +types-requests==2.31.0.8 types-setuptools==68.2.0.0 typing-extensions==4.8.0 ujson==5.8.0 @@ -203,7 +203,7 @@ websocket-client==1.6.3 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.7.txt b/.constraints/py3.7.txt index d97cfa249..90c106eeb 100644 --- a/.constraints/py3.7.txt +++ b/.constraints/py3.7.txt @@ -188,7 +188,7 @@ traitlets==5.9.0 typed-ast==1.5.5 types-docutils==0.20.0.3 types-pkg-resources==0.1.3 -types-requests==2.31.0.7 +types-requests==2.31.0.8 types-setuptools==68.2.0.0 typing-extensions==4.7.1 ; python_version < "3.8.0" ujson==5.7.0 diff --git a/.constraints/py3.8.txt b/.constraints/py3.8.txt index 5274f5c34..d95d8e909 100644 --- a/.constraints/py3.8.txt +++ b/.constraints/py3.8.txt @@ -103,7 +103,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 @@ -156,7 +156,7 @@ rfc3339-validator==0.1.4 rfc3986-validator==0.1.1 rich==13.6.0 rope==1.10.0 -rpds-py==0.10.3 +rpds-py==0.10.4 ruff==0.0.292 send2trash==1.8.2 six==1.16.0 @@ -190,11 +190,11 @@ 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-docutils==0.20.0.3 types-pkg-resources==0.1.3 types-python-dateutil==2.8.19.14 -types-requests==2.31.0.7 +types-requests==2.31.0.8 types-setuptools==68.2.0.0 typing-extensions==4.8.0 ujson==5.8.0 @@ -208,7 +208,7 @@ websocket-client==1.6.3 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 448fb24ef..f9c42a267 100644 --- a/.constraints/py3.9.txt +++ b/.constraints/py3.9.txt @@ -103,7 +103,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 @@ -154,7 +154,7 @@ rfc3339-validator==0.1.4 rfc3986-validator==0.1.1 rich==13.6.0 rope==1.10.0 -rpds-py==0.10.3 +rpds-py==0.10.4 ruff==0.0.292 send2trash==1.8.2 six==1.16.0 @@ -188,11 +188,11 @@ 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-docutils==0.20.0.3 types-pkg-resources==0.1.3 types-python-dateutil==2.8.19.14 -types-requests==2.31.0.7 +types-requests==2.31.0.8 types-setuptools==68.2.0.0 typing-extensions==4.8.0 ujson==5.8.0 @@ -206,7 +206,7 @@ websocket-client==1.6.3 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 From e14dd47e37c60dae114add730edf1c69cd34ac35 Mon Sep 17 00:00:00 2001 From: Remco de Boer <29308176+redeboer@users.noreply.github.com> Date: Thu, 5 Oct 2023 16:37:59 +0200 Subject: [PATCH 29/39] FIX: relink `ipython` intersphinx API --- docs/conf.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/conf.py b/docs/conf.py index ff98fff7a..4bfd15c54 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -290,7 +290,8 @@ def fetch_logo(url: str, output_path: str) -> None: # Intersphinx settings version_remapping: dict[str, dict[str, str]] = { "ipython": { - "8.12.2": "8.13.2", + "8.12.2": "8.12.1", + "8.12.3": "8.12.1", }, "ipywidgets": { "8.0.3": "8.0.5", From 238ba8ebcb77c1c70d1227a854efc7cd5ef138b6 Mon Sep 17 00:00:00 2001 From: Remco de Boer <29308176+redeboer@users.noreply.github.com> Date: Sat, 7 Oct 2023 01:01:19 +0200 Subject: [PATCH 30/39] MAINT: autoupdate pre-commit config --- .cspell.json | 1 + .github/workflows/pr-linting.yml | 4 ++-- .github/workflows/release-drafter.yml | 2 +- .pre-commit-config.yaml | 2 +- .taplo.toml | 1 + .vscode/settings.json | 7 ++++--- 6 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.cspell.json b/.cspell.json index 36d2527db..833c416cc 100644 --- a/.cspell.json +++ b/.cspell.json @@ -39,6 +39,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 54f42615b..cd3bb74f1 100644 --- a/.github/workflows/pr-linting.yml +++ b/.github/workflows/pr-linting.yml @@ -12,7 +12,7 @@ on: jobs: check-labels: name: Check labels - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: docker://agilepathway/pull-request-label-checker:latest # cspell:ignore agilepathway with: @@ -23,7 +23,7 @@ jobs: check-title: name: Check title - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 - run: npm install @compwa/commitlint-config diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml index d54187de4..d64f197bf 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/.pre-commit-config.yaml b/.pre-commit-config.yaml index 022163feb..fd07bfd9c 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -38,7 +38,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: diff --git a/.taplo.toml b/.taplo.toml index 424b74695..0d0d44611 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/settings.json b/.vscode/settings.json index 433b146b3..cd1bf6969 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]": { @@ -19,7 +20,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 +33,6 @@ "coverage-gutters.showLineCoverage": true, "cSpell.enabled": true, "editor.formatOnSave": true, - "editor.rulers": [88], "files.watcherExclude": { "**/*_cache/**": true, "**/.eggs/**": true, @@ -48,7 +49,7 @@ } ], "livePreview.defaultPreviewPath": "docs/_build/html", - "mypy-type-checker.args": ["--config-file", "pyproject.toml"], + "mypy-type-checker.args": ["--config-file=${workspaceFolder}/pyproject.toml"], "mypy-type-checker.importStrategy": "fromEnvironment", "notebook.gotoSymbols.showAllSymbols": true, "python.analysis.autoImportCompletions": false, From aba5982d218cd30fca82f7c0694b4b28dbe4a106 Mon Sep 17 00:00:00 2001 From: GitHub Date: Fri, 6 Oct 2023 23:03:10 +0000 Subject: [PATCH 31/39] MAINT: update pip constraints and pre-commit --- .constraints/py3.10.txt | 6 +++--- .constraints/py3.11.txt | 6 +++--- .constraints/py3.8.txt | 6 +++--- .constraints/py3.9.txt | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.constraints/py3.10.txt b/.constraints/py3.10.txt index e4097085b..7ed08dc37 100644 --- a/.constraints/py3.10.txt +++ b/.constraints/py3.10.txt @@ -18,7 +18,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 @@ -44,7 +44,7 @@ execnet==2.0.2 executing==2.0.0 fastjsonschema==2.18.1 filelock==3.12.4 -fonttools==4.43.0 +fonttools==4.43.1 fqdn==1.5.1 gprof2dot==2022.7.29 graphviz==0.20.1 @@ -142,7 +142,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 diff --git a/.constraints/py3.11.txt b/.constraints/py3.11.txt index 84ab83032..025e8b206 100644 --- a/.constraints/py3.11.txt +++ b/.constraints/py3.11.txt @@ -18,7 +18,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 @@ -43,7 +43,7 @@ execnet==2.0.2 executing==2.0.0 fastjsonschema==2.18.1 filelock==3.12.4 -fonttools==4.43.0 +fonttools==4.43.1 fqdn==1.5.1 gprof2dot==2022.7.29 graphviz==0.20.1 @@ -141,7 +141,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 diff --git a/.constraints/py3.8.txt b/.constraints/py3.8.txt index d95d8e909..9fc422483 100644 --- a/.constraints/py3.8.txt +++ b/.constraints/py3.8.txt @@ -18,7 +18,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 @@ -44,7 +44,7 @@ execnet==2.0.2 executing==2.0.0 fastjsonschema==2.18.1 filelock==3.12.4 -fonttools==4.43.0 +fonttools==4.43.1 fqdn==1.5.1 gprof2dot==2022.7.29 graphviz==0.20.1 @@ -144,7 +144,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 diff --git a/.constraints/py3.9.txt b/.constraints/py3.9.txt index f9c42a267..d93664559 100644 --- a/.constraints/py3.9.txt +++ b/.constraints/py3.9.txt @@ -18,7 +18,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 @@ -44,7 +44,7 @@ execnet==2.0.2 executing==2.0.0 fastjsonschema==2.18.1 filelock==3.12.4 -fonttools==4.43.0 +fonttools==4.43.1 fqdn==1.5.1 gprof2dot==2022.7.29 graphviz==0.20.1 @@ -143,7 +143,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 From 7d2053cf8f437b5507d094013338da2c81340691 Mon Sep 17 00:00:00 2001 From: Remco de Boer <29308176+redeboer@users.noreply.github.com> Date: Sun, 8 Oct 2023 15:57:42 +0200 Subject: [PATCH 32/39] MAINT: autoupdate pre-commit config and sync dev env --- .pre-commit-config.yaml | 6 +++--- .taplo.toml | 7 ------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index fd07bfd9c..cbbca707b 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -14,7 +14,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 @@ -38,7 +38,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: @@ -152,7 +152,7 @@ repos: - id: pyright - repo: https://github.com/asottile/pyupgrade - rev: v3.14.0 + rev: v3.15.0 hooks: - id: pyupgrade args: diff --git a/.taplo.toml b/.taplo.toml index 0d0d44611..381af65bc 100644 --- a/.taplo.toml +++ b/.taplo.toml @@ -1,10 +1,3 @@ -exclude = [ - "**/Cargo.toml", - "**/Manifest.toml", - "**/Project.toml", - "labels*.toml", - "labels/*.toml", -] [formatting] align_comments = false From c15f2e38dba6ce05a7d66f8cb999e21c0d1d67fc Mon Sep 17 00:00:00 2001 From: GitHub Date: Sun, 8 Oct 2023 14:00:21 +0000 Subject: [PATCH 33/39] MAINT: update pip constraints and pre-commit --- .constraints/py3.10.txt | 23 +++++++---------------- .constraints/py3.11.txt | 23 +++++++---------------- .constraints/py3.8.txt | 23 +++++++---------------- .constraints/py3.9.txt | 23 +++++++---------------- 4 files changed, 28 insertions(+), 64 deletions(-) diff --git a/.constraints/py3.10.txt b/.constraints/py3.10.txt index 7ed08dc37..7b79df98a 100644 --- a/.constraints/py3.10.txt +++ b/.constraints/py3.10.txt @@ -5,14 +5,13 @@ # pip-compile --extra=dev --no-annotate --output-file=.constraints/py3.10.txt --strip-extras --unsafe-package=ampform --unsafe-package=pip --unsafe-package=setuptools --unsafe-package=symplot # accessible-pygments==0.0.4 -aiofiles==22.1.0 -aiosqlite==0.19.0 alabaster==0.7.13 anyio==4.0.0 argon2-cffi==23.1.0 argon2-cffi-bindings==21.2.0 arrow==1.3.0 asttokens==2.4.0 +async-lru==2.0.4 attrs==23.1.0 babel==2.13.0 backcall==0.2.0 @@ -30,7 +29,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 @@ -38,7 +37,6 @@ deprecated==1.2.14 distlib==0.3.7 docstring-to-markdown==0.12 docutils==0.17.1 -entrypoints==0.4 exceptiongroup==1.1.3 execnet==2.0.2 executing==2.0.0 @@ -68,18 +66,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 @@ -100,14 +95,12 @@ mypy==1.5.1 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 overrides==7.4.0 @@ -145,7 +138,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 @@ -201,12 +194,10 @@ 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 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.11.txt b/.constraints/py3.11.txt index 025e8b206..2bf859cf7 100644 --- a/.constraints/py3.11.txt +++ b/.constraints/py3.11.txt @@ -5,14 +5,13 @@ # pip-compile --extra=dev --no-annotate --output-file=.constraints/py3.11.txt --strip-extras --unsafe-package=ampform --unsafe-package=pip --unsafe-package=setuptools --unsafe-package=symplot # accessible-pygments==0.0.4 -aiofiles==22.1.0 -aiosqlite==0.19.0 alabaster==0.7.13 anyio==4.0.0 argon2-cffi==23.1.0 argon2-cffi-bindings==21.2.0 arrow==1.3.0 asttokens==2.4.0 +async-lru==2.0.4 attrs==23.1.0 babel==2.13.0 backcall==0.2.0 @@ -30,7 +29,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 @@ -38,7 +37,6 @@ deprecated==1.2.14 distlib==0.3.7 docstring-to-markdown==0.12 docutils==0.17.1 -entrypoints==0.4 execnet==2.0.2 executing==2.0.0 fastjsonschema==2.18.1 @@ -67,18 +65,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 @@ -99,14 +94,12 @@ mypy==1.5.1 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 overrides==7.4.0 @@ -144,7 +137,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 @@ -199,12 +192,10 @@ 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 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.8.txt b/.constraints/py3.8.txt index 9fc422483..6c92f3368 100644 --- a/.constraints/py3.8.txt +++ b/.constraints/py3.8.txt @@ -5,14 +5,13 @@ # pip-compile --extra=dev --no-annotate --output-file=.constraints/py3.8.txt --strip-extras --unsafe-package=ampform --unsafe-package=pip --unsafe-package=setuptools --unsafe-package=symplot # accessible-pygments==0.0.4 -aiofiles==22.1.0 -aiosqlite==0.19.0 alabaster==0.7.13 anyio==4.0.0 argon2-cffi==23.1.0 argon2-cffi-bindings==21.2.0 arrow==1.3.0 asttokens==2.4.0 +async-lru==2.0.4 attrs==23.1.0 babel==2.13.0 backcall==0.2.0 @@ -30,7 +29,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 @@ -38,7 +37,6 @@ deprecated==1.2.14 distlib==0.3.7 docstring-to-markdown==0.12 docutils==0.17.1 -entrypoints==0.4 exceptiongroup==1.1.3 execnet==2.0.2 executing==2.0.0 @@ -69,18 +67,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 @@ -101,14 +96,12 @@ mypy==1.5.1 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.4 overrides==7.4.0 @@ -148,7 +141,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 @@ -204,12 +197,10 @@ 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 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 d93664559..aaf464a7e 100644 --- a/.constraints/py3.9.txt +++ b/.constraints/py3.9.txt @@ -5,14 +5,13 @@ # pip-compile --extra=dev --no-annotate --output-file=.constraints/py3.9.txt --strip-extras --unsafe-package=ampform --unsafe-package=pip --unsafe-package=setuptools --unsafe-package=symplot # accessible-pygments==0.0.4 -aiofiles==22.1.0 -aiosqlite==0.19.0 alabaster==0.7.13 anyio==4.0.0 argon2-cffi==23.1.0 argon2-cffi-bindings==21.2.0 arrow==1.3.0 asttokens==2.4.0 +async-lru==2.0.4 attrs==23.1.0 babel==2.13.0 backcall==0.2.0 @@ -30,7 +29,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 @@ -38,7 +37,6 @@ deprecated==1.2.14 distlib==0.3.7 docstring-to-markdown==0.12 docutils==0.17.1 -entrypoints==0.4 exceptiongroup==1.1.3 execnet==2.0.2 executing==2.0.0 @@ -69,18 +67,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 @@ -101,14 +96,12 @@ mypy==1.5.1 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 overrides==7.4.0 @@ -146,7 +139,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 @@ -202,12 +195,10 @@ 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 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: From 1dfbf831d632537a202c9654706672eac9f08a9a Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Sun, 8 Oct 2023 14:00:40 +0000 Subject: [PATCH 34/39] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- .taplo.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/.taplo.toml b/.taplo.toml index 381af65bc..0db1df7c8 100644 --- a/.taplo.toml +++ b/.taplo.toml @@ -1,4 +1,3 @@ - [formatting] align_comments = false align_entries = false From 4af86b327c254daa850906995298813f2d17333a Mon Sep 17 00:00:00 2001 From: Remco de Boer <29308176+redeboer@users.noreply.github.com> Date: Mon, 9 Oct 2023 11:54:18 +0200 Subject: [PATCH 35/39] MAINT: autoupdate pre-commit hooks --- .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 cbbca707b..fb517b50e 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -38,7 +38,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: From d793c821d92249a92779e564c7eef4ac654f573f Mon Sep 17 00:00:00 2001 From: Remco de Boer <29308176+redeboer@users.noreply.github.com> Date: Mon, 9 Oct 2023 16:58:40 +0200 Subject: [PATCH 36/39] DX: remove `.prettierrc` --- .cspell.json | 21 +-------------------- .pre-commit-config.yaml | 3 ++- .prettierrc | 1 - .vscode/settings.json | 3 +-- 4 files changed, 4 insertions(+), 24 deletions(-) delete mode 100644 .prettierrc diff --git a/.cspell.json b/.cspell.json index 833c416cc..62904d07b 100644 --- a/.cspell.json +++ b/.cspell.json @@ -15,40 +15,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" ], diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index fb517b50e..a8344fb17 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -38,11 +38,12 @@ repos: - id: trailing-whitespace - repo: https://github.com/ComPWA/repo-maintenance - rev: 0.1.0rc2 + rev: 0.1.0rc6 hooks: - id: check-dev-files args: - --doc-apt-packages=graphviz + - --no-prettierrc - --pin-requirements=monthly - --repo-name=ampform - --repo-title=AmpForm diff --git a/.prettierrc b/.prettierrc deleted file mode 100644 index ca09957ff..000000000 --- a/.prettierrc +++ /dev/null @@ -1 +0,0 @@ -printWidth: 88 diff --git a/.vscode/settings.json b/.vscode/settings.json index cd1bf6969..0fbe1d772 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -13,8 +13,7 @@ "editor.defaultFormatter": "esbenp.prettier-vscode" }, "[markdown]": { - "editor.defaultFormatter": "esbenp.prettier-vscode", - "editor.wordWrap": "off" + "editor.defaultFormatter": "esbenp.prettier-vscode" }, "[python]": { "editor.codeActionsOnSave": { From ee3090cb6006c48d76b9cad12dc7aca2af21d3dc Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 9 Oct 2023 15:03:14 +0000 Subject: [PATCH 37/39] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- docs/_templates/genindex.html | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/docs/_templates/genindex.html b/docs/_templates/genindex.html index abea27ff4..21849ec3c 100644 --- a/docs/_templates/genindex.html +++ b/docs/_templates/genindex.html @@ -7,11 +7,12 @@ {%- for ismain, link in links[1:] -%} , {% if ismain %}{% endif -%} [{{ loop.index }}] {%- if ismain %}{% - endif -%} + >{% if ismain %}{% endif -%} [{{ loop.index }}] {%- if ismain %}{% endif -%} -{%- endfor %} {%- else %} {{ firstname|e }} {%- endif %} {% endmacro %} {%- extends -"layout.html" %} {% set title = _('Index') %} {% block body %} +{%- endfor %} {%- else %} {{ firstname|e }} {%- endif %} {% endmacro %} {%- +extends "layout.html" %} {% set title = _('Index') %} {% block body %}

{{ _('Index') }}

From e7f686fb631594809935bf9442d1e78abfad9c5d Mon Sep 17 00:00:00 2001 From: GitHub Date: Mon, 9 Oct 2023 15:10:21 +0000 Subject: [PATCH 38/39] MAINT: update pip constraints and pre-commit --- .constraints/py3.10.txt | 2 +- .constraints/py3.11.txt | 2 +- .constraints/py3.8.txt | 2 +- .constraints/py3.9.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.constraints/py3.10.txt b/.constraints/py3.10.txt index 7b79df98a..5a81dbfc9 100644 --- a/.constraints/py3.10.txt +++ b/.constraints/py3.10.txt @@ -135,7 +135,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 2bf859cf7..1bda2591a 100644 --- a/.constraints/py3.11.txt +++ b/.constraints/py3.11.txt @@ -134,7 +134,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 6c92f3368..2f7844602 100644 --- a/.constraints/py3.8.txt +++ b/.constraints/py3.8.txt @@ -137,7 +137,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 aaf464a7e..00e5a82eb 100644 --- a/.constraints/py3.9.txt +++ b/.constraints/py3.9.txt @@ -136,7 +136,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 From 5fca07276fbd4af243f64ee7159fbbbb3d1397fc Mon Sep 17 00:00:00 2001 From: Remco de Boer <29308176+redeboer@users.noreply.github.com> Date: Mon, 9 Oct 2023 17:33:40 +0200 Subject: [PATCH 39/39] MAINT: autoupdate pre-commit config --- .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 a8344fb17..5a818e132 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -38,7 +38,7 @@ repos: - id: trailing-whitespace - repo: https://github.com/ComPWA/repo-maintenance - rev: 0.1.0rc6 + rev: 0.1.0 hooks: - id: check-dev-files args: