diff --git a/.constraints/py3.10.txt b/.constraints/py3.10.txt index 9521bc9d..c3044fbc 100644 --- a/.constraints/py3.10.txt +++ b/.constraints/py3.10.txt @@ -2,39 +2,38 @@ # This file is autogenerated by pip-compile with Python 3.10 # by the following command: # -# pip-compile --extra=dev --no-annotate --output-file=.constraints/py3.10.txt --strip-extras +# pip-compile --extra=dev --no-annotate --output-file=.constraints/py3.10.txt --strip-extras --unsafe-package=ampform-dpd --unsafe-package=pip --unsafe-package=setuptools # absl-py==2.0.0 accessible-pygments==0.0.4 -aiofiles==22.1.0 -aiosqlite==0.19.0 alabaster==0.7.13 ampform==0.14.6 anyio==4.0.0 argon2-cffi==23.1.0 argon2-cffi-bindings==21.2.0 -arrow==1.2.3 +arrow==1.3.0 asttokens==2.4.0 astunparse==1.6.3 +async-lru==2.0.4 attrs==23.1.0 -babel==2.12.1 +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.15.1 +cffi==1.16.0 cfgv==3.4.0 chardet==5.2.0 -charset-normalizer==3.2.0 +charset-normalizer==3.3.0 click==8.1.7 cloudpickle==2.2.1 colorama==0.4.6 comm==0.1.4 contourpy==1.1.1 -coverage==7.3.1 -cycler==0.11.0 +coverage==7.3.2 +cycler==0.12.1 debugpy==1.8.0 decorator==5.1.1 defusedxml==0.7.1 @@ -43,25 +42,24 @@ distlib==0.3.7 dm-tree==0.1.8 docstring-to-markdown==0.12 docutils==0.17.1 -entrypoints==0.4 exceptiongroup==1.1.3 execnet==2.0.2 -executing==1.2.0 -fastjsonschema==2.18.0 +executing==2.0.0 +fastjsonschema==2.18.1 filelock==3.12.4 flatbuffers==23.5.26 -fonttools==4.42.1 +fonttools==4.43.1 fqdn==1.5.1 -gast==0.4.0 -google-auth==2.23.0 +gast==0.5.4 +google-auth==2.23.2 google-auth-oauthlib==1.0.0 google-pasta==0.2.0 graphviz==0.20.1 -greenlet==2.0.2 -grpcio==1.58.0 -h5py==3.9.0 +greenlet==3.0.0 +grpcio==1.59.0 +h5py==3.10.0 hepunits==2.3.2 -identify==2.5.29 +identify==2.5.30 idna==3.4 imagesize==1.4.1 iminuit==2.24.0 @@ -69,67 +67,62 @@ importlib-metadata==6.8.0 iniconfig==2.0.0 ipykernel==6.25.2 ipympl==0.9.3 -ipython==8.15.0 +ipython==8.16.1 ipython-genutils==0.2.0 ipywidgets==8.1.1 isoduration==20.11.0 -jax==0.4.16 -jaxlib==0.4.16 -jedi==0.19.0 +jax==0.4.18 +jaxlib==0.4.18 +jedi==0.19.1 jinja2==3.1.2 json5==0.9.14 jsonpointer==2.4 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-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.5 +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 jupyterlab-widgets==3.0.9 -keras==2.13.1 +keras==2.14.0 kiwisolver==1.4.5 latexcodec==2.0.1 libclang==16.0.6 livereload==2.6.3 -markdown==3.4.4 +markdown==3.5 markdown-it-py==2.2.0 markupsafe==2.1.3 matplotlib==3.8.0 matplotlib-inline==0.1.6 mdit-py-plugins==0.3.5 mdurl==0.1.2 -mistune==3.0.1 -ml-dtypes==0.3.0 +mistune==3.0.2 +ml-dtypes==0.2.0 mpmath==1.3.0 mypy-extensions==1.0.0 myst-nb==0.17.2 myst-parser==0.18.1 -nbclassic==1.0.0 nbclient==0.6.8 -nbconvert==7.8.0 +nbconvert==7.9.2 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 notebook-shim==0.2.3 -numpy==1.24.3 +numpy==1.26.0 oauthlib==3.2.2 opt-einsum==3.3.0 overrides==7.4.0 -packaging==23.1 +packaging==23.2 pandocfilters==1.5.0 parso==0.8.3 particle==0.23.0 @@ -138,12 +131,12 @@ pexpect==4.8.0 phasespace==1.9.0 pickleshare==0.7.5 pillow==10.0.1 -platformdirs==3.10.0 +platformdirs==3.11.0 pluggy==1.3.0 pre-commit==3.4.0 prometheus-client==0.17.1 prompt-toolkit==3.0.39 -protobuf==4.24.3 +protobuf==4.24.4 psutil==5.9.5 ptyprocess==0.7.0 pure-eval==0.2.2 @@ -162,22 +155,22 @@ pytest-xdist==3.3.1 python-constraint==1.4.0 python-dateutil==2.8.2 python-json-logger==2.0.7 -python-lsp-jsonrpc==1.1.1 -python-lsp-server==1.8.0 +python-lsp-jsonrpc==1.1.2 +python-lsp-server==1.8.2 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 requests-oauthlib==1.3.1 rfc3339-validator==0.1.4 rfc3986-validator==0.1.1 -rope==1.9.0 -rpds-py==0.10.3 +rope==1.10.0 +rpds-py==0.10.4 rsa==4.9 -ruff==0.0.290 -scipy==1.11.2 +ruff==0.0.292 +scipy==1.11.3 send2trash==1.8.2 six==1.16.0 sniffio==1.3.0 @@ -198,15 +191,15 @@ sphinxcontrib-jsmath==1.0.1 sphinxcontrib-qthelp==1.0.6 sphinxcontrib-serializinghtml==1.1.9 sqlalchemy==2.0.21 -stack-data==0.6.2 +stack-data==0.6.3 sympy==1.12 tabulate==0.9.0 -tensorboard==2.13.0 +tensorboard==2.14.1 tensorboard-data-server==0.7.1 -tensorflow==2.13.0 -tensorflow-estimator==2.13.0 +tensorflow==2.14.0 +tensorflow-estimator==2.14.0 tensorflow-io-gcs-filesystem==0.34.0 -tensorflow-probability==0.21.0 +tensorflow-probability==0.22.0 tensorwaves==0.4.10 termcolor==2.3.0 terminado==0.17.1 @@ -215,23 +208,23 @@ tomli==2.0.1 tornado==6.3.3 tox==4.11.3 tqdm==4.66.1 -traitlets==5.10.0 +traitlets==5.11.2 +types-python-dateutil==2.8.19.14 typing-extensions==4.5.0 ujson==5.8.0 uri-template==1.3.0 -urllib3==1.26.16 +urllib3==2.0.6 virtualenv==20.24.5 -wcwidth==0.2.6 +wcwidth==0.2.8 webcolors==1.13 webencodings==0.5.1 -websocket-client==1.6.3 -werkzeug==2.3.7 +websocket-client==1.6.4 +werkzeug==3.0.0 wheel==0.41.2 widgetsnbextension==4.0.9 -wrapt==1.15.0 -y-py==0.6.0 -ypy-websocket==0.8.4 +wrapt==1.14.1 zipp==3.17.0 # The following packages are considered to be unsafe in a requirements file: +# ampform-dpd # setuptools diff --git a/.constraints/py3.11.txt b/.constraints/py3.11.txt index 550e872f..09d566b8 100644 --- a/.constraints/py3.11.txt +++ b/.constraints/py3.11.txt @@ -2,39 +2,38 @@ # This file is autogenerated by pip-compile with Python 3.11 # by the following command: # -# pip-compile --extra=dev --no-annotate --output-file=.constraints/py3.11.txt --strip-extras +# pip-compile --extra=dev --no-annotate --output-file=.constraints/py3.11.txt --strip-extras --unsafe-package=ampform-dpd --unsafe-package=pip --unsafe-package=setuptools # absl-py==2.0.0 accessible-pygments==0.0.4 -aiofiles==22.1.0 -aiosqlite==0.19.0 alabaster==0.7.13 ampform==0.14.6 anyio==4.0.0 argon2-cffi==23.1.0 argon2-cffi-bindings==21.2.0 -arrow==1.2.3 +arrow==1.3.0 asttokens==2.4.0 astunparse==1.6.3 +async-lru==2.0.4 attrs==23.1.0 -babel==2.12.1 +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.15.1 +cffi==1.16.0 cfgv==3.4.0 chardet==5.2.0 -charset-normalizer==3.2.0 +charset-normalizer==3.3.0 click==8.1.7 cloudpickle==2.2.1 colorama==0.4.6 comm==0.1.4 contourpy==1.1.1 -coverage==7.3.1 -cycler==0.11.0 +coverage==7.3.2 +cycler==0.12.1 debugpy==1.8.0 decorator==5.1.1 defusedxml==0.7.1 @@ -43,24 +42,23 @@ distlib==0.3.7 dm-tree==0.1.8 docstring-to-markdown==0.12 docutils==0.17.1 -entrypoints==0.4 execnet==2.0.2 -executing==1.2.0 -fastjsonschema==2.18.0 +executing==2.0.0 +fastjsonschema==2.18.1 filelock==3.12.4 flatbuffers==23.5.26 -fonttools==4.42.1 +fonttools==4.43.1 fqdn==1.5.1 -gast==0.4.0 -google-auth==2.23.0 +gast==0.5.4 +google-auth==2.23.2 google-auth-oauthlib==1.0.0 google-pasta==0.2.0 graphviz==0.20.1 -greenlet==2.0.2 -grpcio==1.58.0 -h5py==3.9.0 +greenlet==3.0.0 +grpcio==1.59.0 +h5py==3.10.0 hepunits==2.3.2 -identify==2.5.29 +identify==2.5.30 idna==3.4 imagesize==1.4.1 iminuit==2.24.0 @@ -68,67 +66,62 @@ importlib-metadata==6.8.0 iniconfig==2.0.0 ipykernel==6.25.2 ipympl==0.9.3 -ipython==8.15.0 +ipython==8.16.1 ipython-genutils==0.2.0 ipywidgets==8.1.1 isoduration==20.11.0 -jax==0.4.16 -jaxlib==0.4.16 -jedi==0.19.0 +jax==0.4.18 +jaxlib==0.4.18 +jedi==0.19.1 jinja2==3.1.2 json5==0.9.14 jsonpointer==2.4 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-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.5 +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 jupyterlab-widgets==3.0.9 -keras==2.13.1 +keras==2.14.0 kiwisolver==1.4.5 latexcodec==2.0.1 libclang==16.0.6 livereload==2.6.3 -markdown==3.4.4 +markdown==3.5 markdown-it-py==2.2.0 markupsafe==2.1.3 matplotlib==3.8.0 matplotlib-inline==0.1.6 mdit-py-plugins==0.3.5 mdurl==0.1.2 -mistune==3.0.1 -ml-dtypes==0.3.0 +mistune==3.0.2 +ml-dtypes==0.2.0 mpmath==1.3.0 mypy-extensions==1.0.0 myst-nb==0.17.2 myst-parser==0.18.1 -nbclassic==1.0.0 nbclient==0.6.8 -nbconvert==7.8.0 +nbconvert==7.9.2 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 notebook-shim==0.2.3 -numpy==1.24.3 +numpy==1.26.0 oauthlib==3.2.2 opt-einsum==3.3.0 overrides==7.4.0 -packaging==23.1 +packaging==23.2 pandocfilters==1.5.0 parso==0.8.3 particle==0.23.0 @@ -137,12 +130,12 @@ pexpect==4.8.0 phasespace==1.9.0 pickleshare==0.7.5 pillow==10.0.1 -platformdirs==3.10.0 +platformdirs==3.11.0 pluggy==1.3.0 pre-commit==3.4.0 prometheus-client==0.17.1 prompt-toolkit==3.0.39 -protobuf==4.24.3 +protobuf==4.24.4 psutil==5.9.5 ptyprocess==0.7.0 pure-eval==0.2.2 @@ -161,22 +154,22 @@ pytest-xdist==3.3.1 python-constraint==1.4.0 python-dateutil==2.8.2 python-json-logger==2.0.7 -python-lsp-jsonrpc==1.1.1 -python-lsp-server==1.8.0 +python-lsp-jsonrpc==1.1.2 +python-lsp-server==1.8.2 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 requests-oauthlib==1.3.1 rfc3339-validator==0.1.4 rfc3986-validator==0.1.1 -rope==1.9.0 -rpds-py==0.10.3 +rope==1.10.0 +rpds-py==0.10.4 rsa==4.9 -ruff==0.0.290 -scipy==1.11.2 +ruff==0.0.292 +scipy==1.11.3 send2trash==1.8.2 six==1.16.0 sniffio==1.3.0 @@ -197,15 +190,15 @@ sphinxcontrib-jsmath==1.0.1 sphinxcontrib-qthelp==1.0.6 sphinxcontrib-serializinghtml==1.1.9 sqlalchemy==2.0.21 -stack-data==0.6.2 +stack-data==0.6.3 sympy==1.12 tabulate==0.9.0 -tensorboard==2.13.0 +tensorboard==2.14.1 tensorboard-data-server==0.7.1 -tensorflow==2.13.0 -tensorflow-estimator==2.13.0 +tensorflow==2.14.0 +tensorflow-estimator==2.14.0 tensorflow-io-gcs-filesystem==0.34.0 -tensorflow-probability==0.21.0 +tensorflow-probability==0.22.0 tensorwaves==0.4.10 termcolor==2.3.0 terminado==0.17.1 @@ -213,23 +206,23 @@ tinycss2==1.2.1 tornado==6.3.3 tox==4.11.3 tqdm==4.66.1 -traitlets==5.10.0 +traitlets==5.11.2 +types-python-dateutil==2.8.19.14 typing-extensions==4.5.0 ujson==5.8.0 uri-template==1.3.0 -urllib3==1.26.16 +urllib3==2.0.6 virtualenv==20.24.5 -wcwidth==0.2.6 +wcwidth==0.2.8 webcolors==1.13 webencodings==0.5.1 -websocket-client==1.6.3 -werkzeug==2.3.7 +websocket-client==1.6.4 +werkzeug==3.0.0 wheel==0.41.2 widgetsnbextension==4.0.9 -wrapt==1.15.0 -y-py==0.6.0 -ypy-websocket==0.8.4 +wrapt==1.14.1 zipp==3.17.0 # The following packages are considered to be unsafe in a requirements file: +# ampform-dpd # setuptools diff --git a/.constraints/py3.7.txt b/.constraints/py3.7.txt index 421f7548..89b5c780 100644 --- a/.constraints/py3.7.txt +++ b/.constraints/py3.7.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile with Python 3.7 # by the following command: # -# pip-compile --extra=dev --no-annotate --output-file=.constraints/py3.7.txt --resolver=backtracking --strip-extras +# pip-compile --extra=dev --no-annotate --output-file=.constraints/py3.7.txt --resolver=backtracking --strip-extras --unsafe-package=ampform-dpd --unsafe-package=pip --unsafe-package=setuptools # absl-py==2.0.0 accessible-pygments==0.0.4 @@ -16,7 +16,7 @@ argon2-cffi-bindings==21.2.0 arrow==1.2.3 astunparse==1.6.3 attrs==23.1.0 -babel==2.12.1 +babel==2.13.0 backcall==0.2.0 beautifulsoup4==4.12.2 black==23.3.0 @@ -27,7 +27,7 @@ certifi==2023.7.22 cffi==1.15.1 cfgv==3.3.1 chardet==5.2.0 -charset-normalizer==3.2.0 +charset-normalizer==3.3.0 click==8.1.7 cloudpickle==2.2.1 colorama==0.4.6 @@ -45,25 +45,25 @@ docutils==0.17.1 entrypoints==0.4 exceptiongroup==1.1.3 execnet==2.0.2 -fastjsonschema==2.18.0 +fastjsonschema==2.18.1 filelock==3.12.2 flatbuffers==23.5.26 fonttools==4.38.0 fqdn==1.5.1 gast==0.4.0 -google-auth==2.23.0 +google-auth==2.23.2 google-auth-oauthlib==0.4.6 google-pasta==0.2.0 graphviz==0.20.1 -greenlet==2.0.2 -grpcio==1.58.0 +greenlet==3.0.0 +grpcio==1.59.0 h5py==3.8.0 hepunits==2.3.2 identify==2.5.24 idna==3.4 imagesize==1.4.1 iminuit==2.18.0 -importlib-metadata==6.7.0 ; python_version < "3.8.0" +importlib-metadata==6.7.0 importlib-resources==5.12.0 iniconfig==2.0.0 ipykernel==6.16.2 @@ -88,7 +88,7 @@ jupyter-server==1.24.0 jupyter-server-fileid==0.9.0 jupyter-server-ydoc==0.8.0 jupyter-ydoc==0.2.4 -jupyterlab==3.6.5 +jupyterlab==3.6.6 jupyterlab-code-formatter==2.2.1 jupyterlab-lsp==3.10.2 jupyterlab-myst==1.2.0 @@ -107,7 +107,7 @@ matplotlib==3.5.3 matplotlib-inline==0.1.6 mdit-py-plugins==0.3.5 mdurl==0.1.2 -mistune==3.0.1 +mistune==3.0.2 mpmath==1.3.0 mypy-extensions==1.0.0 myst-nb==0.17.2 @@ -116,7 +116,7 @@ nbclassic==1.0.0 nbclient==0.5.13 nbconvert==7.6.0 nbformat==5.8.0 -nbmake==1.2.1 ; python_version < "3.8.0" +nbmake==1.2.1 nest-asyncio==1.5.8 nodeenv==1.8.0 notebook==6.5.6 @@ -124,7 +124,7 @@ notebook-shim==0.2.3 numpy==1.21.6 oauthlib==3.2.2 opt-einsum==3.3.0 -packaging==23.1 +packaging==23.2 pandocfilters==1.5.0 parso==0.8.3 particle==0.23.0 @@ -134,7 +134,7 @@ phasespace==1.9.0 pickleshare==0.7.5 pillow==9.5.0 pkgutil-resolve-name==1.3.10 -platformdirs==3.10.0 +platformdirs==3.11.0 pluggy==1.2.0 pre-commit==2.21.0 prometheus-client==0.17.1 @@ -147,7 +147,7 @@ pyasn1-modules==0.3.0 pybtex==0.24.0 pybtex-docutils==1.0.3 pycparser==2.21 -pydantic==1.10.12 +pydantic==1.10.13 pydata-sphinx-theme==0.13.3 pygments==2.16.1 pyparsing==3.1.1 @@ -172,7 +172,7 @@ rfc3339-validator==0.1.4 rfc3986-validator==0.1.1 rope==1.9.0 rsa==4.9 -ruff==0.0.290 +ruff==0.0.292 scipy==1.7.3 send2trash==1.8.2 singledispatchmethod==1.0 @@ -217,9 +217,9 @@ typed-ast==1.5.5 typing-extensions==4.7.1 ; python_version < "3.8.0" ujson==5.7.0 uri-template==1.3.0 -urllib3==1.26.16 +urllib3==2.0.6 virtualenv==20.24.5 -wcwidth==0.2.6 +wcwidth==0.2.8 webcolors==1.13 webencodings==0.5.1 websocket-client==1.6.1 @@ -228,8 +228,9 @@ wheel==0.41.2 widgetsnbextension==4.0.9 wrapt==1.15.0 y-py==0.5.9 -ypy-websocket==0.8.2 ; python_version < "3.8.0" +ypy-websocket==0.8.2 zipp==3.15.0 # The following packages are considered to be unsafe in a requirements file: +# ampform-dpd # setuptools diff --git a/.constraints/py3.8.txt b/.constraints/py3.8.txt index 7657312e..7a3182b3 100644 --- a/.constraints/py3.8.txt +++ b/.constraints/py3.8.txt @@ -2,39 +2,38 @@ # This file is autogenerated by pip-compile with Python 3.8 # by the following command: # -# pip-compile --extra=dev --no-annotate --output-file=.constraints/py3.8.txt --strip-extras +# pip-compile --extra=dev --no-annotate --output-file=.constraints/py3.8.txt --strip-extras --unsafe-package=ampform-dpd --unsafe-package=pip --unsafe-package=setuptools # absl-py==2.0.0 accessible-pygments==0.0.4 -aiofiles==22.1.0 -aiosqlite==0.19.0 alabaster==0.7.13 ampform==0.14.6 anyio==4.0.0 argon2-cffi==23.1.0 argon2-cffi-bindings==21.2.0 -arrow==1.2.3 +arrow==1.3.0 asttokens==2.4.0 astunparse==1.6.3 +async-lru==2.0.4 attrs==23.1.0 -babel==2.12.1 +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.15.1 +cffi==1.16.0 cfgv==3.4.0 chardet==5.2.0 -charset-normalizer==3.2.0 +charset-normalizer==3.3.0 click==8.1.7 cloudpickle==2.2.1 colorama==0.4.6 comm==0.1.4 contourpy==1.1.1 -coverage==7.3.1 -cycler==0.11.0 +coverage==7.3.2 +cycler==0.12.1 debugpy==1.8.0 decorator==5.1.1 defusedxml==0.7.1 @@ -43,25 +42,24 @@ distlib==0.3.7 dm-tree==0.1.8 docstring-to-markdown==0.12 docutils==0.17.1 -entrypoints==0.4 exceptiongroup==1.1.3 execnet==2.0.2 -executing==1.2.0 -fastjsonschema==2.18.0 +executing==2.0.0 +fastjsonschema==2.18.1 filelock==3.12.4 flatbuffers==23.5.26 -fonttools==4.42.1 +fonttools==4.43.1 fqdn==1.5.1 gast==0.4.0 -google-auth==2.23.0 +google-auth==2.23.2 google-auth-oauthlib==1.0.0 google-pasta==0.2.0 graphviz==0.20.1 -greenlet==2.0.2 -grpcio==1.58.0 -h5py==3.9.0 +greenlet==3.0.0 +grpcio==1.59.0 +h5py==3.10.0 hepunits==2.3.2 -identify==2.5.29 +identify==2.5.30 idna==3.4 imagesize==1.4.1 iminuit==2.24.0 @@ -70,31 +68,28 @@ 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 jax==0.4.13 jaxlib==0.4.13 -jedi==0.19.0 +jedi==0.19.1 jinja2==3.1.2 json5==0.9.14 jsonpointer==2.4 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-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.5 +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 @@ -104,33 +99,31 @@ kiwisolver==1.4.5 latexcodec==2.0.1 libclang==16.0.6 livereload==2.6.3 -markdown==3.4.4 +markdown==3.5 markdown-it-py==2.2.0 markupsafe==2.1.3 matplotlib==3.7.3 matplotlib-inline==0.1.6 mdit-py-plugins==0.3.5 mdurl==0.1.2 -mistune==3.0.1 +mistune==3.0.2 ml-dtypes==0.2.0 mpmath==1.3.0 mypy-extensions==1.0.0 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.3 +nbmake==1.4.5 nest-asyncio==1.5.8 nodeenv==1.8.0 -notebook==6.5.6 notebook-shim==0.2.3 numpy==1.24.3 oauthlib==3.2.2 opt-einsum==3.3.0 overrides==7.4.0 -packaging==23.1 +packaging==23.2 pandocfilters==1.5.0 parso==0.8.3 particle==0.23.0 @@ -140,12 +133,12 @@ phasespace==1.9.0 pickleshare==0.7.5 pillow==10.0.1 pkgutil-resolve-name==1.3.10 -platformdirs==3.10.0 +platformdirs==3.11.0 pluggy==1.3.0 pre-commit==3.4.0 prometheus-client==0.17.1 prompt-toolkit==3.0.39 -protobuf==4.24.3 +protobuf==4.24.4 psutil==5.9.5 ptyprocess==0.7.0 pure-eval==0.2.2 @@ -164,22 +157,22 @@ pytest-xdist==3.3.1 python-constraint==1.4.0 python-dateutil==2.8.2 python-json-logger==2.0.7 -python-lsp-jsonrpc==1.1.1 -python-lsp-server==1.8.0 +python-lsp-jsonrpc==1.1.2 +python-lsp-server==1.8.2 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 requests-oauthlib==1.3.1 rfc3339-validator==0.1.4 rfc3986-validator==0.1.1 -rope==1.9.0 -rpds-py==0.10.3 +rope==1.10.0 +rpds-py==0.10.4 rsa==4.9 -ruff==0.0.290 +ruff==0.0.292 scipy==1.10.1 send2trash==1.8.2 six==1.16.0 @@ -201,12 +194,12 @@ sphinxcontrib-jsmath==1.0.1 sphinxcontrib-qthelp==1.0.3 sphinxcontrib-serializinghtml==1.1.5 sqlalchemy==2.0.21 -stack-data==0.6.2 +stack-data==0.6.3 sympy==1.12 tabulate==0.9.0 tensorboard==2.13.0 tensorboard-data-server==0.7.1 -tensorflow==2.13.0 +tensorflow==2.13.1 tensorflow-estimator==2.13.0 tensorflow-io-gcs-filesystem==0.34.0 tensorflow-probability==0.21.0 @@ -218,23 +211,23 @@ tomli==2.0.1 tornado==6.3.3 tox==4.11.3 tqdm==4.66.1 -traitlets==5.10.0 +traitlets==5.11.2 +types-python-dateutil==2.8.19.14 typing-extensions==4.5.0 ujson==5.8.0 uri-template==1.3.0 -urllib3==1.26.16 +urllib3==2.0.6 virtualenv==20.24.5 -wcwidth==0.2.6 +wcwidth==0.2.8 webcolors==1.13 webencodings==0.5.1 -websocket-client==1.6.3 -werkzeug==2.3.7 +websocket-client==1.6.4 +werkzeug==3.0.0 wheel==0.41.2 widgetsnbextension==4.0.9 wrapt==1.15.0 -y-py==0.6.0 -ypy-websocket==0.8.4 zipp==3.17.0 # The following packages are considered to be unsafe in a requirements file: +# ampform-dpd # setuptools diff --git a/.constraints/py3.9.txt b/.constraints/py3.9.txt index e4eee840..b512a957 100644 --- a/.constraints/py3.9.txt +++ b/.constraints/py3.9.txt @@ -2,39 +2,38 @@ # This file is autogenerated by pip-compile with Python 3.9 # by the following command: # -# pip-compile --extra=dev --no-annotate --output-file=.constraints/py3.9.txt --strip-extras +# pip-compile --extra=dev --no-annotate --output-file=.constraints/py3.9.txt --strip-extras --unsafe-package=ampform-dpd --unsafe-package=pip --unsafe-package=setuptools # absl-py==2.0.0 accessible-pygments==0.0.4 -aiofiles==22.1.0 -aiosqlite==0.19.0 alabaster==0.7.13 ampform==0.14.6 anyio==4.0.0 argon2-cffi==23.1.0 argon2-cffi-bindings==21.2.0 -arrow==1.2.3 +arrow==1.3.0 asttokens==2.4.0 astunparse==1.6.3 +async-lru==2.0.4 attrs==23.1.0 -babel==2.12.1 +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.15.1 +cffi==1.16.0 cfgv==3.4.0 chardet==5.2.0 -charset-normalizer==3.2.0 +charset-normalizer==3.3.0 click==8.1.7 cloudpickle==2.2.1 colorama==0.4.6 comm==0.1.4 contourpy==1.1.1 -coverage==7.3.1 -cycler==0.11.0 +coverage==7.3.2 +cycler==0.12.1 debugpy==1.8.0 decorator==5.1.1 defusedxml==0.7.1 @@ -43,25 +42,24 @@ distlib==0.3.7 dm-tree==0.1.8 docstring-to-markdown==0.12 docutils==0.17.1 -entrypoints==0.4 exceptiongroup==1.1.3 execnet==2.0.2 -executing==1.2.0 -fastjsonschema==2.18.0 +executing==2.0.0 +fastjsonschema==2.18.1 filelock==3.12.4 flatbuffers==23.5.26 -fonttools==4.42.1 +fonttools==4.43.1 fqdn==1.5.1 -gast==0.4.0 -google-auth==2.23.0 +gast==0.5.4 +google-auth==2.23.2 google-auth-oauthlib==1.0.0 google-pasta==0.2.0 graphviz==0.20.1 -greenlet==2.0.2 -grpcio==1.58.0 -h5py==3.9.0 +greenlet==3.0.0 +grpcio==1.59.0 +h5py==3.10.0 hepunits==2.3.2 -identify==2.5.29 +identify==2.5.30 idna==3.4 imagesize==1.4.1 iminuit==2.24.0 @@ -70,67 +68,62 @@ importlib-resources==6.1.0 iniconfig==2.0.0 ipykernel==6.25.2 ipympl==0.9.3 -ipython==8.15.0 +ipython==8.16.1 ipython-genutils==0.2.0 ipywidgets==8.1.1 isoduration==20.11.0 -jax==0.4.16 -jaxlib==0.4.16 -jedi==0.19.0 +jax==0.4.18 +jaxlib==0.4.18 +jedi==0.19.1 jinja2==3.1.2 json5==0.9.14 jsonpointer==2.4 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-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.5 +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 jupyterlab-widgets==3.0.9 -keras==2.13.1 +keras==2.14.0 kiwisolver==1.4.5 latexcodec==2.0.1 libclang==16.0.6 livereload==2.6.3 -markdown==3.4.4 +markdown==3.5 markdown-it-py==2.2.0 markupsafe==2.1.3 matplotlib==3.8.0 matplotlib-inline==0.1.6 mdit-py-plugins==0.3.5 mdurl==0.1.2 -mistune==3.0.1 -ml-dtypes==0.3.0 +mistune==3.0.2 +ml-dtypes==0.2.0 mpmath==1.3.0 mypy-extensions==1.0.0 myst-nb==0.17.2 myst-parser==0.18.1 -nbclassic==1.0.0 nbclient==0.6.8 -nbconvert==7.8.0 +nbconvert==7.9.2 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 notebook-shim==0.2.3 -numpy==1.24.3 +numpy==1.26.0 oauthlib==3.2.2 opt-einsum==3.3.0 overrides==7.4.0 -packaging==23.1 +packaging==23.2 pandocfilters==1.5.0 parso==0.8.3 particle==0.23.0 @@ -139,12 +132,12 @@ pexpect==4.8.0 phasespace==1.9.0 pickleshare==0.7.5 pillow==10.0.1 -platformdirs==3.10.0 +platformdirs==3.11.0 pluggy==1.3.0 pre-commit==3.4.0 prometheus-client==0.17.1 prompt-toolkit==3.0.39 -protobuf==4.24.3 +protobuf==4.24.4 psutil==5.9.5 ptyprocess==0.7.0 pure-eval==0.2.2 @@ -163,22 +156,22 @@ pytest-xdist==3.3.1 python-constraint==1.4.0 python-dateutil==2.8.2 python-json-logger==2.0.7 -python-lsp-jsonrpc==1.1.1 -python-lsp-server==1.8.0 +python-lsp-jsonrpc==1.1.2 +python-lsp-server==1.8.2 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 requests-oauthlib==1.3.1 rfc3339-validator==0.1.4 rfc3986-validator==0.1.1 -rope==1.9.0 -rpds-py==0.10.3 +rope==1.10.0 +rpds-py==0.10.4 rsa==4.9 -ruff==0.0.290 -scipy==1.11.2 +ruff==0.0.292 +scipy==1.11.3 send2trash==1.8.2 six==1.16.0 sniffio==1.3.0 @@ -199,15 +192,15 @@ sphinxcontrib-jsmath==1.0.1 sphinxcontrib-qthelp==1.0.6 sphinxcontrib-serializinghtml==1.1.9 sqlalchemy==2.0.21 -stack-data==0.6.2 +stack-data==0.6.3 sympy==1.12 tabulate==0.9.0 -tensorboard==2.13.0 +tensorboard==2.14.1 tensorboard-data-server==0.7.1 -tensorflow==2.13.0 -tensorflow-estimator==2.13.0 +tensorflow==2.14.0 +tensorflow-estimator==2.14.0 tensorflow-io-gcs-filesystem==0.34.0 -tensorflow-probability==0.21.0 +tensorflow-probability==0.22.0 tensorwaves==0.4.10 termcolor==2.3.0 terminado==0.17.1 @@ -216,23 +209,23 @@ tomli==2.0.1 tornado==6.3.3 tox==4.11.3 tqdm==4.66.1 -traitlets==5.10.0 +traitlets==5.11.2 +types-python-dateutil==2.8.19.14 typing-extensions==4.5.0 ujson==5.8.0 uri-template==1.3.0 -urllib3==1.26.16 +urllib3==2.0.6 virtualenv==20.24.5 -wcwidth==0.2.6 +wcwidth==0.2.8 webcolors==1.13 webencodings==0.5.1 -websocket-client==1.6.3 -werkzeug==2.3.7 +websocket-client==1.6.4 +werkzeug==3.0.0 wheel==0.41.2 widgetsnbextension==4.0.9 -wrapt==1.15.0 -y-py==0.6.0 -ypy-websocket==0.8.4 +wrapt==1.14.1 zipp==3.17.0 # The following packages are considered to be unsafe in a requirements file: +# ampform-dpd # setuptools diff --git a/.cspell.json b/.cspell.json index 22be7f02..037aad0a 100644 --- a/.cspell.json +++ b/.cspell.json @@ -13,41 +13,21 @@ "transisions" ], "ignorePaths": [ + "**/*.bib", "**/.cspell.json", - "*.bib", - "*.ico", - "*.root", - "*.rst_t", - "*.svg", - "*particle*.*ml", ".constraints/*.txt", ".editorconfig", ".gitignore", ".gitpod.*", - ".mypy.ini", ".pre-commit-config.yaml", ".prettierignore", - ".readthedocs.yml", ".vscode/*", ".vscode/.gitignore", - "CITATION.cff", "codecov.yml", - "Dockerfile", "docs/_templates/*", - "docs/adr/*/*", "docs/conf.py", - "labels.toml", - "Makefile", - "Manifest.toml", - "Project.toml", "pyproject.toml", - "pyrightconfig.json", - "pytest.ini", - "requirements*.txt", - "setup.cfg", - "setup.py", - "tox.ini", - "typings" + "tox.ini" ], "ignoreWords": [ "Jpsi", diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md deleted file mode 100644 index d0cc61cd..00000000 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ /dev/null @@ -1,32 +0,0 @@ ---- -name: Bug report -about: Create a report to help us improve -title: "" -labels: Bug -assignees: "" ---- - -## Bug description - - - - - -## How to reproduce? - -Steps to reproduce the behavior: - -1. - -## Expected behavior - - - -## System info - -Bug resulted on the following system: - -- OS: -- Version -- Python version: -- Virtual environment: diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md deleted file mode 100644 index 049eb32b..00000000 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -name: Feature request -about: Suggest an idea for this project -title: "" -labels: "✨ Enhancement" -assignees: "" ---- - -## Problem description - - - -## Proposed solution - - - - - - - diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md deleted file mode 100644 index 14b80852..00000000 --- a/.github/pull_request_template.md +++ /dev/null @@ -1,11 +0,0 @@ - - - - - diff --git a/.github/workflows/pr-linting.yml b/.github/workflows/pr-linting.yml index b7437b6a..cd3bb74f 100644 --- a/.github/workflows/pr-linting.yml +++ b/.github/workflows/pr-linting.yml @@ -1,5 +1,4 @@ name: PR linting - on: pull_request: types: @@ -15,8 +14,7 @@ jobs: name: Check labels runs-on: ubuntu-22.04 steps: - # cspell:ignore agilepathway - - uses: docker://agilepathway/pull-request-label-checker:latest + - uses: docker://agilepathway/pull-request-label-checker:latest # cspell:ignore agilepathway with: any_of: >- 🐛 Bug,✨ Feature,⚙️ Enhancement,⚠️ Interface,❗ Behavior,📝 Docs,🔨 Maintenance,🖱️ DX @@ -27,7 +25,9 @@ jobs: name: Check title runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v3 - - run: npm install @commitlint/config-conventional - # cspell:ignore commitlint kode - - uses: JulienKode/pull-request-name-linter-action@v0.5.0 + - uses: actions/checkout@v4 + - run: npm install @compwa/commitlint-config + - name: Create commitlint config + run: | + echo "module.exports = {extends: ['@compwa/commitlint-config']}" > commitlint.config.js + - uses: JulienKode/pull-request-name-linter-action@v0.5.0 # cspell:ignore kode diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml index d54187de..d64f197b 100644 --- a/.github/workflows/release-drafter.yml +++ b/.github/workflows/release-drafter.yml @@ -9,7 +9,7 @@ on: jobs: update_release_draft: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: release-drafter/release-drafter@v5 env: diff --git a/.gitpod.yml b/.gitpod.yml index a06228ce..94274fb1 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -17,6 +17,7 @@ vscode: - eamodio.gitlens - editorconfig.editorconfig - esbenp.prettier-vscode + - executablebookproject.myst-highlight - garaioag.garaio-vscode-unwanted-recommendations - github.vscode-github-actions - github.vscode-pull-request-github diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 1aec3b8d..c2f20dfd 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -12,7 +12,7 @@ repos: - id: check-useless-excludes - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.4.0 + rev: v4.5.0 hooks: - id: check-ast - id: check-case-conflict @@ -27,7 +27,7 @@ repos: - id: trailing-whitespace - repo: https://github.com/ComPWA/repo-maintenance - rev: 0.0.197 + rev: 0.1.0 hooks: - id: check-dev-files args: @@ -36,14 +36,11 @@ repos: - --pin-requirements=bimonthly - --repo-name=ampform-dpd - --repo-title=AmpForm-DPD - - id: format-setup-cfg + - id: colab-toc-visible - repo: https://github.com/nbQA-dev/nbQA rev: 1.7.0 hooks: - - id: nbqa-black - additional_dependencies: - - black>=22.1.0 - id: nbqa-pyupgrade args: - --py37-plus @@ -55,14 +52,17 @@ repos: rev: 23.9.1 hooks: - id: black + - id: black-jupyter + args: [--line-length=85] + types_or: [jupyter] - repo: https://github.com/streetsidesoftware/cspell-cli - rev: v7.3.0 + rev: v7.3.1 hooks: - 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 @@ -82,6 +82,7 @@ repos: cell.attachments cell.metadata.code_folding cell.metadata.id + cell.metadata.pycharm cell.metadata.user_expressions metadata.celltoolbar metadata.colab.name @@ -102,19 +103,19 @@ repos: - id: prettier - repo: https://github.com/ComPWA/mirrors-pyright - rev: v1.1.328 + rev: v1.1.330 hooks: - id: pyright - repo: https://github.com/asottile/pyupgrade - rev: v3.11.2 + rev: v3.15.0 hooks: - id: pyupgrade args: - --py37-plus - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.0.290 + rev: v0.0.292 hooks: - id: ruff args: @@ -124,3 +125,10 @@ repos: rev: v0.8.1 hooks: - id: taplo + + - repo: https://github.com/pappasam/toml-sort + rev: v0.23.1 + hooks: + - id: toml-sort + args: + - --in-place diff --git a/.taplo.toml b/.taplo.toml index f5caabee..0db1df7c 100644 --- a/.taplo.toml +++ b/.taplo.toml @@ -1,16 +1,12 @@ -exclude = [ - "**/Cargo.toml", - "**/Manifest.toml", - "**/Project.toml", - "labels*.toml", -] - [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/.vscode/extensions.json b/.vscode/extensions.json index 3274def2..0d61abf4 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -4,6 +4,7 @@ "eamodio.gitlens", "editorconfig.editorconfig", "esbenp.prettier-vscode", + "executablebookproject.myst-highlight", "garaioag.garaio-vscode-unwanted-recommendations", "github.vscode-github-actions", "github.vscode-pull-request-github", @@ -23,6 +24,7 @@ ], "unwantedRecommendations": [ "bungcip.better-toml", + "davidanson.vscode-markdownlint", "ms-python.flake8", "ms-python.isort", "ms-python.mypy-type-checker", diff --git a/.vscode/settings.json b/.vscode/settings.json index 2f83877f..d4f65dbd 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -3,6 +3,7 @@ "editor.formatOnSave": false }, "[git-commit]": { + "editor.rulers": [72], "rewrap.wrappingColumn": 72 }, "[json]": { @@ -14,7 +15,6 @@ "[markdown]": { "editor.defaultFormatter": "esbenp.prettier-vscode", "editor.rulers": [], - "editor.wordWrap": "bounded", "editor.wordWrapColumn": 80, "editor.wrappingIndent": "same", "editor.wrappingStrategy": "advanced" @@ -23,7 +23,8 @@ "editor.codeActionsOnSave": { "source.organizeImports": true }, - "editor.defaultFormatter": "ms-python.black-formatter" + "editor.defaultFormatter": "ms-python.black-formatter", + "editor.rulers": [88] }, "[yaml]": { "editor.defaultFormatter": "esbenp.prettier-vscode" @@ -31,10 +32,10 @@ "black-formatter.importStrategy": "fromEnvironment", "cSpell.enabled": true, "editor.formatOnSave": true, - "editor.rulers": [88], "files.eol": "\n", "github-actions.workflows.pinned.workflows": [".github/workflows/ci.yml"], "livePreview.defaultPreviewPath": "docs/_build/html", + "notebook.gotoSymbols.showAllSymbols": true, "python.analysis.autoImportCompletions": false, "python.analysis.inlayHints.pytestParameters": true, "python.analysis.typeCheckingMode": "strict", diff --git a/commitlint.config.js b/commitlint.config.js deleted file mode 100644 index d8b6bdcd..00000000 --- a/commitlint.config.js +++ /dev/null @@ -1,11 +0,0 @@ -module.exports = { - extends: ["@commitlint/config-conventional"], - rules: { - "type-case": [2, "always", ["upper-case"]], - "type-enum": [ - 2, - "always", - ["BEHAVIOR", "BREAK", "DOC", "DX", "ENH", "FEAT", "FIX", "MAINT"], - ], - }, -}; diff --git a/docs/comparison/d2kkk.ipynb b/docs/comparison/d2kkk.ipynb index dcec4204..17f05074 100644 --- a/docs/comparison/d2kkk.ipynb +++ b/docs/comparison/d2kkk.ipynb @@ -1019,6 +1019,9 @@ } ], "metadata": { + "colab": { + "toc_visible": true + }, "kernelspec": { "display_name": "Python 3 (ipykernel)", "language": "python", diff --git a/docs/comparison/jpsi2phipipi.ipynb b/docs/comparison/jpsi2phipipi.ipynb index 869f28a4..7da3a48c 100644 --- a/docs/comparison/jpsi2phipipi.ipynb +++ b/docs/comparison/jpsi2phipipi.ipynb @@ -1004,6 +1004,9 @@ } ], "metadata": { + "colab": { + "toc_visible": true + }, "kernelspec": { "display_name": "Python 3 (ipykernel)", "language": "python", diff --git a/docs/comparison/jpsi2pipipi.ipynb b/docs/comparison/jpsi2pipipi.ipynb index 92acc26d..9dc35ebf 100644 --- a/docs/comparison/jpsi2pipipi.ipynb +++ b/docs/comparison/jpsi2pipipi.ipynb @@ -1002,6 +1002,9 @@ } ], "metadata": { + "colab": { + "toc_visible": true + }, "kernelspec": { "display_name": "Python 3 (ipykernel)", "language": "python", diff --git a/docs/jpsi2ksp.ipynb b/docs/jpsi2ksp.ipynb index 705223fd..6a1c27c7 100644 --- a/docs/jpsi2ksp.ipynb +++ b/docs/jpsi2ksp.ipynb @@ -955,6 +955,9 @@ } ], "metadata": { + "colab": { + "toc_visible": true + }, "kernelspec": { "display_name": "Python 3 (ipykernel)", "language": "python", diff --git a/docs/lc2pkpi.ipynb b/docs/lc2pkpi.ipynb index d5147f1e..de41f112 100644 --- a/docs/lc2pkpi.ipynb +++ b/docs/lc2pkpi.ipynb @@ -358,6 +358,9 @@ } ], "metadata": { + "colab": { + "toc_visible": true + }, "kernelspec": { "display_name": "Python 3 (ipykernel)", "language": "python", diff --git a/pyproject.toml b/pyproject.toml index 5fd81195..948a5cd0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,10 +1,135 @@ [build-system] +build-backend = "setuptools.build_meta" requires = [ - "setuptools>=36.2.1", # environment markers + "setuptools>=61.2", "setuptools_scm", - "wheel", ] +[project] +authors = [{name = "Common Partial Wave Analysis", email = "compwa-admin@ep1.rub.de"}] +classifiers = [ + "Development Status :: 3 - Alpha", + "Intended Audience :: Developers", + "Intended Audience :: Education", + "Intended Audience :: Science/Research", + "License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)", + "Natural Language :: English", + "Operating System :: OS Independent", + "Programming Language :: Python :: 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", + "Topic :: Scientific/Engineering :: Physics", + "Topic :: Scientific/Engineering", + "Typing :: Typed", +] +dependencies = [ + "ampform ~=0.14.4", # Kibble and Kallen functions, perform_cached_doit + "attrs >=20.1.0", # on_setattr and https://www.attrs.org/en/stable/api.html#next-gen + "cloudpickle", + "sympy >=1.10", # module sympy.printing.numpy and array expressions with shape kwarg + "tensorwaves[jax]", + 'typing-extensions; python_version <"3.8.0"', +] +description = "Symbolic expressions for Dalitz-Plot Decomposition" +dynamic = ["version"] +license = {text = "GPLv3 or later"} +name = "ampform-dpd" +requires-python = ">=3.7" + +[project.optional-dependencies] +dev = [ + "ampform-dpd[doc]", + "ampform-dpd[jupyter]", + "ampform-dpd[sty]", + "ampform-dpd[test]", + "sphinx-autobuild", + "tox >=1.9", # for skip_install, use_develop +] +doc = [ + "graphviz", + "ipympl", + "ipywidgets", + "matplotlib", + "myst-nb >=0.14", # nb_render_markdown_format for Markdown tables + "sphinx-book-theme", + "sphinx-codeautolink[ipython]", + "sphinx-copybutton", + "sphinx-design", + "sphinx-togglebutton", + "sphinxcontrib-bibtex", + "tensorwaves[phsp]", + "tqdm", + 'importlib-metadata; python_version <"3.8.0"', +] +format = [ + "black", +] +jax = [ + "tensorwaves[jax]", +] +jupyter = [ + "ampform-dpd[doc]", + "jupyterlab >=3.0", + "jupyterlab-code-formatter", + "jupyterlab-lsp", + "jupyterlab-myst", + "python-lsp-server[rope]", + 'ypy-websocket <0.8.3; python_version <"3.8.0"', +] +lint = [ + "ruff", +] +numba = [ + "tensorwaves[numba]", +] +sty = [ + "ampform-dpd[format]", + "ampform-dpd[lint]", + "ampform-dpd[test]", # for pytest type hints + "docutils", + "pre-commit >=1.4.0", + "pybtex", + "sphinx", +] +tensorflow = [ + "ampform-dpd[tf]", +] +test = [ + "nbmake", + "numpy", + "pytest >=6.0", # pyproject.toml + "pytest-cov", + "pytest-xdist", + 'nbmake <1.3; python_version <"3.8.0"', +] +tf = [ + "tensorwaves[tf]", +] + +[project.readme] +content-type = "text/markdown" +file = "README.md" + +[project.urls] +Changelog = "https://github.com/ComPWA/ampform-dpd/releases" +Documentation = "https://compwa.github.io/ampform-dpd" +Source = "https://github.com/ComPWA/ampform-dpd" +Tracker = "https://github.com/ComPWA/ampform-dpd/issues" + +[tool.setuptools] +include-package-data = false +package-dir = {"" = "src"} + +[tool.setuptools.package-data] +ampform_dpd = ["py.typed"] + +[tool.setuptools.packages.find] +namespaces = false +where = ["src"] + [tool.setuptools_scm] write_to = "src/ampform_dpd/version.py" @@ -33,7 +158,6 @@ target-version = [ ] [tool.nbqa.addopts] -black = ["--line-length=85"] ruff = [ "--extend-ignore=B018", "--extend-ignore=C90", @@ -129,7 +253,7 @@ extend-select = [ "YTT", ] ignore = [ - "B028", # missing explicit stacklevel keyword + "B028", # missing explicit stacklevel keyword "C408", "D101", "D102", @@ -154,6 +278,19 @@ src = [ target-version = "py37" task-tags = ["cspell"] +[tool.ruff.pep8-naming] +ignore-names = [ + "A", + "H", + "L", + "R", + "R_dec", + "R_prod", + "S", + "Γ*", + "λ*", +] + [tool.ruff.per-file-ignores] "*" = ["D"] "docs/*" = [ @@ -174,18 +311,19 @@ task-tags = ["cspell"] "S101", ] -[tool.ruff.pep8-naming] -ignore-names = [ - "A", - "H", - "L", - "R", - "R_dec", - "R_prod", - "S", - "Γ*", - "λ*", -] - [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 diff --git a/setup.cfg b/setup.cfg deleted file mode 100644 index 5e4037b0..00000000 --- a/setup.cfg +++ /dev/null @@ -1,111 +0,0 @@ -[metadata] -name = ampform-dpd -description = Symbolic expressions for Dalitz-Plot Decomposition -author = Common Partial Wave Analysis -author_email = compwa-admin@ep1.rub.de -long_description = file: README.md -long_description_content_type = text/markdown -license = GPLv3 or later -project_urls = - Tracker = https://github.com/ComPWA/ampform-dpd/issues - Changelog = https://github.com/ComPWA/ampform-dpd/releases - Documentation = https://compwa.github.io/ampform-dpd - Source = https://github.com/ComPWA/ampform-dpd -classifiers = - Development Status :: 3 - Alpha - Intended Audience :: Developers - Intended Audience :: Education - Intended Audience :: Science/Research - License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+) - Natural Language :: English - Operating System :: OS Independent - Programming Language :: Python - Programming Language :: Python :: 3.7 - Programming Language :: Python :: 3.8 - Programming Language :: Python :: 3.9 - Programming Language :: Python :: 3.10 - Programming Language :: Python :: 3.11 - Topic :: Scientific/Engineering - Topic :: Scientific/Engineering :: Physics - Typing :: Typed - -[options] -python_requires = >=3.7 -setup_requires = - setuptools_scm -install_requires = - ampform ~=0.14.4 # Kibble and Kallen functions, perform_cached_doit - attrs >=20.1.0 # on_setattr and https://www.attrs.org/en/stable/api.html#next-gen - cloudpickle - sympy >=1.10 # module sympy.printing.numpy and array expressions with shape kwarg - tensorwaves[jax] - typing-extensions; python_version <"3.8.0" -packages = find: -package_dir = - =src - -[options.extras_require] -jax = - tensorwaves[jax] -numba = - tensorwaves[numba] -tf = - tensorwaves[tf] -tensorflow = - %(tf)s -doc = - graphviz - ipympl - ipywidgets - importlib-metadata; python_version <"3.8.0" - matplotlib - myst-nb >=0.14 # nb_render_markdown_format for Markdown tables - sphinx-book-theme - sphinx-codeautolink[ipython] - sphinx-copybutton - sphinx-design - sphinx-togglebutton - sphinxcontrib-bibtex - tensorwaves[phsp] - tqdm -jupyter = - %(doc)s - jupyterlab >=3.0 - jupyterlab-code-formatter - jupyterlab-lsp - jupyterlab-myst - python-lsp-server[rope] - ypy-websocket <0.8.3; python_version <"3.8.0" -test = - nbmake - nbmake <1.3; python_version <"3.8.0" - numpy - pytest >=6.0 # pyproject.toml - pytest-cov - pytest-xdist -format = - black -lint = - ruff -sty = - %(format)s - %(lint)s - %(test)s # for pytest type hints - docutils - pre-commit >=1.4.0 - pybtex - sphinx -dev = - %(doc)s - %(jupyter)s - %(sty)s - %(test)s - sphinx-autobuild - tox >=1.9 # for skip_install, use_develop - -[options.packages.find] -where = src - -[options.package_data] -ampform_dpd = - py.typed diff --git a/setup.py b/setup.py deleted file mode 100644 index f7b80f8d..00000000 --- a/setup.py +++ /dev/null @@ -1,6 +0,0 @@ -import setuptools - -setuptools.setup( - setup_requires=["setuptools_scm"], - use_scm_version=True, -)