From dc5f29049e8219f47cef50e2f38e3bab231101a2 Mon Sep 17 00:00:00 2001 From: GitHub Date: Sat, 7 Oct 2023 03:18:33 +0000 Subject: [PATCH 1/5] MAINT: update pip constraints and pre-commit --- .constraints/py3.10.txt | 148 +++++++++++++++++++-------------------- .constraints/py3.11.txt | 146 +++++++++++++++++++------------------- .constraints/py3.7.txt | 45 ++++++------ .constraints/py3.8.txt | 128 +++++++++++++++++----------------- .constraints/py3.9.txt | 150 ++++++++++++++++++++-------------------- .pre-commit-config.yaml | 16 ++--- 6 files changed, 316 insertions(+), 317 deletions(-) diff --git a/.constraints/py3.10.txt b/.constraints/py3.10.txt index e88355cf..3c1b7e2a 100644 --- a/.constraints/py3.10.txt +++ b/.constraints/py3.10.txt @@ -4,7 +4,7 @@ # # pip-compile --extra=dev --no-annotate --output-file=.constraints/py3.10.txt --strip-extras # -absl-py==1.4.0 +absl-py==2.0.0 accessible-pygments==0.0.4 aiofiles==22.1.0 aiosqlite==0.19.0 @@ -13,29 +13,29 @@ ampform==0.14.6 anyio==4.0.0 argon2-cffi==23.1.0 argon2-cffi-bindings==21.2.0 -arrow==1.2.3 +arrow==1.3.0 asttokens==2.4.0 astunparse==1.6.3 attrs==23.1.0 -babel==2.12.1 +babel==2.13.0 backcall==0.2.0 beautifulsoup4==4.12.2 -black==23.9.0 -bleach==6.0.0 +black==23.9.1 +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.0 -coverage==7.3.1 -cycler==0.11.0 -debugpy==1.7.0 +contourpy==1.1.1 +coverage==7.3.2 +cycler==0.12.0 +debugpy==1.8.0 decorator==5.1.1 defusedxml==0.7.1 deprecated==1.2.14 @@ -46,22 +46,22 @@ docutils==0.19 entrypoints==0.4 exceptiongroup==1.1.3 execnet==2.0.2 -executing==1.2.0 -fastjsonschema==2.18.0 -filelock==3.12.2 +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.22.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 +greenlet==3.0.0 +grpcio==1.59.0 h5py==3.9.0 hepunits==2.3.2 -identify==2.5.27 +identify==2.5.30 idna==3.4 imagesize==1.4.1 iminuit==2.24.0 @@ -69,23 +69,23 @@ 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.0 +ipywidgets==8.1.1 isoduration==20.11.0 -jax==0.4.14 -jaxlib==0.4.14 -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.0 +jsonschema==4.19.1 jsonschema-specifications==2023.7.1 jupyter==1.0.0 jupyter-cache==0.6.1 jupyter-client==7.4.9 jupyter-console==6.6.3 -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 @@ -93,26 +93,26 @@ 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 -keras==2.13.1 +jupyterlab-server==2.25.0 +jupyterlab-widgets==3.0.9 +keras==2.14.0 kiwisolver==1.4.5 libclang==16.0.6 livereload==2.6.3 -llvmlite==0.40.1 -markdown==3.4.4 +llvmlite==0.41.0 +markdown==3.5 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 -mistune==3.0.1 +mistune==3.0.2 ml-dtypes==0.2.0 mpmath==1.3.0 mypy==1.5.1 @@ -121,20 +121,20 @@ 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 -nest-asyncio==1.5.7 +nbmake==1.4.5 +nest-asyncio==1.5.8 nodeenv==1.8.0 -notebook==6.5.5 +notebook==6.5.6 notebook-shim==0.2.3 -numba==0.57.1 -numpy==1.24.3 +numba==0.58.0 +numpy==1.25.2 oauthlib==3.2.2 opt-einsum==3.3.0 overrides==7.4.0 -packaging==23.1 -pandas==2.1.0 +packaging==23.2 +pandas==2.1.1 pandocfilters==1.5.0 parso==0.8.3 particle==0.23.0 @@ -142,13 +142,13 @@ pathspec==0.11.2 pexpect==4.8.0 phasespace==1.9.0 pickleshare==0.7.5 -pillow==10.0.0 -platformdirs==3.10.0 +pillow==10.0.1 +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 @@ -156,9 +156,9 @@ py-cpuinfo==9.0.0 pyasn1==0.5.0 pyasn1-modules==0.3.0 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-benchmark==4.0.0 @@ -168,8 +168,8 @@ 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-server==1.8.0 +python-lsp-jsonrpc==1.1.2 +python-lsp-server==1.8.1 pytoolconfig==1.2.5 pytz==2023.3.post1 pyyaml==6.0.1 @@ -182,11 +182,11 @@ 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.2 +rope==1.10.0 +rpds-py==0.10.4 rsa==4.9 -ruff==0.0.287 -scipy==1.11.2 +ruff==0.0.292 +scipy==1.11.3 send2trash==1.8.2 six==1.16.0 sniffio==1.3.0 @@ -208,47 +208,47 @@ sphinxcontrib-jsmath==1.0.1 sphinxcontrib-qthelp==1.0.6 sphinxcontrib-serializinghtml==1.1.9 sphobjinv==2.3.1 -sqlalchemy==2.0.20 -stack-data==0.6.2 +sqlalchemy==2.0.21 +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 termcolor==2.3.0 terminado==0.17.1 tinycss2==1.2.1 tomli==2.0.1 tornado==6.3.3 -tox==4.10.0 +tox==4.11.3 tqdm==4.66.1 -traitlets==5.9.0 +traitlets==5.11.2 types-docutils==0.20.0.3 types-pkg-resources==0.1.3 -types-pyyaml==6.0.12.11 -types-requests==2.31.0.2 +types-python-dateutil==2.8.19.14 +types-pyyaml==6.0.12.12 +types-requests==2.31.0.8 types-setuptools==68.2.0.0 -types-urllib3==1.26.25.14 typing-extensions==4.5.0 tzdata==2023.3 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.2 -werkzeug==2.3.7 +websocket-client==1.6.3 +werkzeug==3.0.0 wheel==0.41.2 -widgetsnbextension==4.0.8 -wrapt==1.15.0 -y-py==0.6.0 +widgetsnbextension==4.0.9 +wrapt==1.14.1 +y-py==0.6.2 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 70893bb3..b4dd5211 100644 --- a/.constraints/py3.11.txt +++ b/.constraints/py3.11.txt @@ -4,7 +4,7 @@ # # pip-compile --extra=dev --no-annotate --output-file=.constraints/py3.11.txt --strip-extras # -absl-py==1.4.0 +absl-py==2.0.0 accessible-pygments==0.0.4 aiofiles==22.1.0 aiosqlite==0.19.0 @@ -13,29 +13,29 @@ ampform==0.14.6 anyio==4.0.0 argon2-cffi==23.1.0 argon2-cffi-bindings==21.2.0 -arrow==1.2.3 +arrow==1.3.0 asttokens==2.4.0 astunparse==1.6.3 attrs==23.1.0 -babel==2.12.1 +babel==2.13.0 backcall==0.2.0 beautifulsoup4==4.12.2 -black==23.9.0 -bleach==6.0.0 +black==23.9.1 +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.0 -coverage==7.3.1 -cycler==0.11.0 -debugpy==1.7.0 +contourpy==1.1.1 +coverage==7.3.2 +cycler==0.12.0 +debugpy==1.8.0 decorator==5.1.1 defusedxml==0.7.1 deprecated==1.2.14 @@ -45,22 +45,22 @@ docstring-to-markdown==0.12 docutils==0.19 entrypoints==0.4 execnet==2.0.2 -executing==1.2.0 -fastjsonschema==2.18.0 -filelock==3.12.3 +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.22.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 +greenlet==3.0.0 +grpcio==1.59.0 h5py==3.9.0 hepunits==2.3.2 -identify==2.5.27 +identify==2.5.30 idna==3.4 imagesize==1.4.1 iminuit==2.24.0 @@ -68,23 +68,23 @@ 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.0 +ipywidgets==8.1.1 isoduration==20.11.0 -jax==0.4.14 -jaxlib==0.4.14 -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.0 +jsonschema==4.19.1 jsonschema-specifications==2023.7.1 jupyter==1.0.0 jupyter-cache==0.6.1 jupyter-client==7.4.9 jupyter-console==6.6.3 -jupyter-core==5.3.1 +jupyter-core==5.3.2 jupyter-events==0.7.0 jupyter-lsp==2.2.0 jupyter-server==2.7.3 @@ -92,26 +92,26 @@ 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 -keras==2.13.1 +jupyterlab-server==2.25.0 +jupyterlab-widgets==3.0.9 +keras==2.14.0 kiwisolver==1.4.5 libclang==16.0.6 livereload==2.6.3 -llvmlite==0.40.1 -markdown==3.4.4 +llvmlite==0.41.0 +markdown==3.5 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 -mistune==3.0.1 +mistune==3.0.2 ml-dtypes==0.2.0 mpmath==1.3.0 mypy==1.5.1 @@ -120,20 +120,20 @@ 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 -nest-asyncio==1.5.7 +nbmake==1.4.5 +nest-asyncio==1.5.8 nodeenv==1.8.0 -notebook==6.5.5 +notebook==6.5.6 notebook-shim==0.2.3 -numba==0.57.1 -numpy==1.24.3 +numba==0.58.0 +numpy==1.25.2 oauthlib==3.2.2 opt-einsum==3.3.0 overrides==7.4.0 -packaging==23.1 -pandas==2.1.0 +packaging==23.2 +pandas==2.1.1 pandocfilters==1.5.0 parso==0.8.3 particle==0.23.0 @@ -141,13 +141,13 @@ pathspec==0.11.2 pexpect==4.8.0 phasespace==1.9.0 pickleshare==0.7.5 -pillow==10.0.0 -platformdirs==3.10.0 +pillow==10.0.1 +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 @@ -155,9 +155,9 @@ py-cpuinfo==9.0.0 pyasn1==0.5.0 pyasn1-modules==0.3.0 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-benchmark==4.0.0 @@ -167,8 +167,8 @@ 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-server==1.8.0 +python-lsp-jsonrpc==1.1.2 +python-lsp-server==1.8.1 pytoolconfig==1.2.5 pytz==2023.3.post1 pyyaml==6.0.1 @@ -181,11 +181,11 @@ 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.2 +rope==1.10.0 +rpds-py==0.10.4 rsa==4.9 -ruff==0.0.287 -scipy==1.11.2 +ruff==0.0.292 +scipy==1.11.3 send2trash==1.8.2 six==1.16.0 sniffio==1.3.0 @@ -207,46 +207,46 @@ sphinxcontrib-jsmath==1.0.1 sphinxcontrib-qthelp==1.0.6 sphinxcontrib-serializinghtml==1.1.9 sphobjinv==2.3.1 -sqlalchemy==2.0.20 -stack-data==0.6.2 +sqlalchemy==2.0.21 +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 termcolor==2.3.0 terminado==0.17.1 tinycss2==1.2.1 tornado==6.3.3 tox==4.11.3 tqdm==4.66.1 -traitlets==5.9.0 +traitlets==5.11.2 types-docutils==0.20.0.3 types-pkg-resources==0.1.3 -types-pyyaml==6.0.12.11 -types-requests==2.31.0.2 +types-python-dateutil==2.8.19.14 +types-pyyaml==6.0.12.12 +types-requests==2.31.0.8 types-setuptools==68.2.0.0 -types-urllib3==1.26.25.14 typing-extensions==4.5.0 tzdata==2023.3 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.2 -werkzeug==2.3.7 +websocket-client==1.6.3 +werkzeug==3.0.0 wheel==0.41.2 -widgetsnbextension==4.0.8 -wrapt==1.15.0 -y-py==0.6.0 +widgetsnbextension==4.0.9 +wrapt==1.14.1 +y-py==0.6.2 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 1eaf4f5b..5f2aefc5 100644 --- a/.constraints/py3.7.txt +++ b/.constraints/py3.7.txt @@ -4,7 +4,7 @@ # # pip-compile --extra=dev --no-annotate --output-file=.constraints/py3.7.txt --resolver=backtracking --strip-extras # -absl-py==1.4.0 +absl-py==2.0.0 accessible-pygments==0.0.4 aiofiles==22.1.0 aiosqlite==0.19.0 @@ -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,18 +45,18 @@ docutils==0.19 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.22.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 @@ -70,7 +70,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 jax==0.3.25 jaxlib==0.3.25 @@ -90,13 +90,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 keras==2.11.0 kiwisolver==1.4.5 libclang==16.0.6 @@ -109,7 +109,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==1.4.1 mypy-extensions==1.0.0 @@ -120,15 +120,15 @@ nbclient==0.5.13 nbconvert==7.6.0 nbformat==5.8.0 nbmake==1.2.1 ; python_version < "3.8.0" -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 numba==0.56.4 numpy==1.21.6 oauthlib==3.2.2 opt-einsum==3.3.0 -packaging==23.1 +packaging==23.2 pandas==1.3.5 pandocfilters==1.5.0 parso==0.8.3 @@ -139,7 +139,7 @@ phasespace==1.8.0 ; python_version < "3.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 @@ py-cpuinfo==9.0.0 pyasn1==0.5.0 pyasn1-modules==0.3.0 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 @@ -180,7 +180,7 @@ rfc3339-validator==0.1.4 rfc3986-validator==0.1.1 rope==1.9.0 rsa==4.9 -ruff==0.0.287 +ruff==0.0.292 scipy==1.7.3 send2trash==1.8.2 singledispatchmethod==1.0 @@ -225,22 +225,21 @@ traitlets==5.9.0 typed-ast==1.5.5 types-docutils==0.20.0.3 types-pkg-resources==0.1.3 -types-pyyaml==6.0.12.11 -types-requests==2.31.0.2 +types-pyyaml==6.0.12.12 +types-requests==2.31.0.8 types-setuptools==68.2.0.0 -types-urllib3==1.26.25.14 typing-extensions==4.7.1 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 werkzeug==2.2.3 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 6e19fa5d..0e6d7ef2 100644 --- a/.constraints/py3.8.txt +++ b/.constraints/py3.8.txt @@ -4,7 +4,7 @@ # # pip-compile --extra=dev --no-annotate --output-file=.constraints/py3.8.txt --strip-extras # -absl-py==1.4.0 +absl-py==2.0.0 accessible-pygments==0.0.4 aiofiles==22.1.0 aiosqlite==0.19.0 @@ -13,29 +13,29 @@ ampform==0.14.6 anyio==4.0.0 argon2-cffi==23.1.0 argon2-cffi-bindings==21.2.0 -arrow==1.2.3 +arrow==1.3.0 asttokens==2.4.0 astunparse==1.6.3 attrs==23.1.0 -babel==2.12.1 +babel==2.13.0 backcall==0.2.0 beautifulsoup4==4.12.2 -black==23.9.0 -bleach==6.0.0 +black==23.9.1 +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.0 -coverage==7.3.1 -cycler==0.11.0 -debugpy==1.7.0 +contourpy==1.1.1 +coverage==7.3.2 +cycler==0.12.0 +debugpy==1.8.0 decorator==5.1.1 defusedxml==0.7.1 deprecated==1.2.14 @@ -46,47 +46,47 @@ docutils==0.19 entrypoints==0.4 exceptiongroup==1.1.3 execnet==2.0.2 -executing==1.2.0 -fastjsonschema==2.18.0 -filelock==3.12.2 +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.22.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 +greenlet==3.0.0 +grpcio==1.59.0 h5py==3.9.0 hepunits==2.3.2 -identify==2.5.27 +identify==2.5.30 idna==3.4 imagesize==1.4.1 iminuit==2.24.0 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==8.12.3 ipython-genutils==0.2.0 -ipywidgets==8.1.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.0 +jsonschema==4.19.1 jsonschema-specifications==2023.7.1 jupyter==1.0.0 jupyter-cache==0.6.1 jupyter-client==7.4.9 jupyter-console==6.6.3 -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 @@ -94,26 +94,26 @@ 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 keras==2.13.1 kiwisolver==1.4.5 libclang==16.0.6 livereload==2.6.3 -llvmlite==0.40.1 -markdown==3.4.4 +llvmlite==0.41.0 +markdown==3.5 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 -mistune==3.0.1 +mistune==3.0.2 ml-dtypes==0.2.0 mpmath==1.3.0 mypy==1.5.1 @@ -122,19 +122,19 @@ 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 -nest-asyncio==1.5.7 +nbmake==1.4.5 +nest-asyncio==1.5.8 nodeenv==1.8.0 -notebook==6.5.5 +notebook==6.5.6 notebook-shim==0.2.3 -numba==0.57.1 +numba==0.58.0 numpy==1.24.3 oauthlib==3.2.2 opt-einsum==3.3.0 overrides==7.4.0 -packaging==23.1 +packaging==23.2 pandas==2.0.3 pandocfilters==1.5.0 parso==0.8.3 @@ -143,14 +143,14 @@ pathspec==0.11.2 pexpect==4.8.0 phasespace==1.9.0 pickleshare==0.7.5 -pillow==10.0.0 +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 @@ -158,9 +158,9 @@ py-cpuinfo==9.0.0 pyasn1==0.5.0 pyasn1-modules==0.3.0 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-benchmark==4.0.0 @@ -170,8 +170,8 @@ 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-server==1.8.0 +python-lsp-jsonrpc==1.1.2 +python-lsp-server==1.8.1 pytoolconfig==1.2.5 pytz==2023.3.post1 pyyaml==6.0.1 @@ -184,10 +184,10 @@ 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.2 +rope==1.10.0 +rpds-py==0.10.4 rsa==4.9 -ruff==0.0.287 +ruff==0.0.292 scipy==1.10.1 send2trash==1.8.2 six==1.16.0 @@ -210,13 +210,13 @@ sphinxcontrib-jsmath==1.0.1 sphinxcontrib-qthelp==1.0.3 sphinxcontrib-serializinghtml==1.1.5 sphobjinv==2.3.1 -sqlalchemy==2.0.20 -stack-data==0.6.2 +sqlalchemy==2.0.21 +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 @@ -225,32 +225,32 @@ terminado==0.17.1 tinycss2==1.2.1 tomli==2.0.1 tornado==6.3.3 -tox==4.10.0 +tox==4.11.3 tqdm==4.66.1 -traitlets==5.9.0 +traitlets==5.11.2 types-docutils==0.20.0.3 types-pkg-resources==0.1.3 -types-pyyaml==6.0.12.11 -types-requests==2.31.0.2 +types-python-dateutil==2.8.19.14 +types-pyyaml==6.0.12.12 +types-requests==2.31.0.8 types-setuptools==68.2.0.0 -types-urllib3==1.26.25.14 typing-extensions==4.5.0 tzdata==2023.3 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.2 -werkzeug==2.3.7 +websocket-client==1.6.3 +werkzeug==3.0.0 wheel==0.41.2 -widgetsnbextension==4.0.8 +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.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 38cd686e..5384d8c5 100644 --- a/.constraints/py3.9.txt +++ b/.constraints/py3.9.txt @@ -4,7 +4,7 @@ # # pip-compile --extra=dev --no-annotate --output-file=.constraints/py3.9.txt --strip-extras # -absl-py==1.4.0 +absl-py==2.0.0 accessible-pygments==0.0.4 aiofiles==22.1.0 aiosqlite==0.19.0 @@ -13,29 +13,29 @@ ampform==0.14.6 anyio==4.0.0 argon2-cffi==23.1.0 argon2-cffi-bindings==21.2.0 -arrow==1.2.3 +arrow==1.3.0 asttokens==2.4.0 astunparse==1.6.3 attrs==23.1.0 -babel==2.12.1 +babel==2.13.0 backcall==0.2.0 beautifulsoup4==4.12.2 -black==23.9.0 -bleach==6.0.0 +black==23.9.1 +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.0 -coverage==7.3.1 -cycler==0.11.0 -debugpy==1.7.0 +contourpy==1.1.1 +coverage==7.3.2 +cycler==0.12.0 +debugpy==1.8.0 decorator==5.1.1 defusedxml==0.7.1 deprecated==1.2.14 @@ -46,47 +46,47 @@ docutils==0.19 entrypoints==0.4 exceptiongroup==1.1.3 execnet==2.0.2 -executing==1.2.0 -fastjsonschema==2.18.0 -filelock==3.12.2 +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.22.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 +greenlet==3.0.0 +grpcio==1.59.0 h5py==3.9.0 hepunits==2.3.2 -identify==2.5.27 +identify==2.5.30 idna==3.4 imagesize==1.4.1 iminuit==2.24.0 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==8.16.1 ipython-genutils==0.2.0 -ipywidgets==8.1.0 +ipywidgets==8.1.1 isoduration==20.11.0 -jax==0.4.14 -jaxlib==0.4.14 -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.0 +jsonschema==4.19.1 jsonschema-specifications==2023.7.1 jupyter==1.0.0 jupyter-cache==0.6.1 jupyter-client==7.4.9 jupyter-console==6.6.3 -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 @@ -94,26 +94,26 @@ 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 -keras==2.13.1 +jupyterlab-server==2.25.0 +jupyterlab-widgets==3.0.9 +keras==2.14.0 kiwisolver==1.4.5 libclang==16.0.6 livereload==2.6.3 -llvmlite==0.40.1 -markdown==3.4.4 +llvmlite==0.41.0 +markdown==3.5 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 -mistune==3.0.1 +mistune==3.0.2 ml-dtypes==0.2.0 mpmath==1.3.0 mypy==1.5.1 @@ -122,20 +122,20 @@ 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 -nest-asyncio==1.5.7 +nbmake==1.4.5 +nest-asyncio==1.5.8 nodeenv==1.8.0 -notebook==6.5.5 +notebook==6.5.6 notebook-shim==0.2.3 -numba==0.57.1 -numpy==1.24.3 +numba==0.58.0 +numpy==1.25.2 oauthlib==3.2.2 opt-einsum==3.3.0 overrides==7.4.0 -packaging==23.1 -pandas==2.1.0 +packaging==23.2 +pandas==2.1.1 pandocfilters==1.5.0 parso==0.8.3 particle==0.23.0 @@ -143,13 +143,13 @@ pathspec==0.11.2 pexpect==4.8.0 phasespace==1.9.0 pickleshare==0.7.5 -pillow==10.0.0 -platformdirs==3.10.0 +pillow==10.0.1 +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 @@ -157,9 +157,9 @@ py-cpuinfo==9.0.0 pyasn1==0.5.0 pyasn1-modules==0.3.0 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-benchmark==4.0.0 @@ -169,8 +169,8 @@ 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-server==1.8.0 +python-lsp-jsonrpc==1.1.2 +python-lsp-server==1.8.1 pytoolconfig==1.2.5 pytz==2023.3.post1 pyyaml==6.0.1 @@ -183,11 +183,11 @@ 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.2 +rope==1.10.0 +rpds-py==0.10.4 rsa==4.9 -ruff==0.0.287 -scipy==1.11.2 +ruff==0.0.292 +scipy==1.11.3 send2trash==1.8.2 six==1.16.0 sniffio==1.3.0 @@ -209,47 +209,47 @@ sphinxcontrib-jsmath==1.0.1 sphinxcontrib-qthelp==1.0.6 sphinxcontrib-serializinghtml==1.1.9 sphobjinv==2.3.1 -sqlalchemy==2.0.20 -stack-data==0.6.2 +sqlalchemy==2.0.21 +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 termcolor==2.3.0 terminado==0.17.1 tinycss2==1.2.1 tomli==2.0.1 tornado==6.3.3 -tox==4.10.0 +tox==4.11.3 tqdm==4.66.1 -traitlets==5.9.0 +traitlets==5.11.2 types-docutils==0.20.0.3 types-pkg-resources==0.1.3 -types-pyyaml==6.0.12.11 -types-requests==2.31.0.2 +types-python-dateutil==2.8.19.14 +types-pyyaml==6.0.12.12 +types-requests==2.31.0.8 types-setuptools==68.2.0.0 -types-urllib3==1.26.25.14 typing-extensions==4.5.0 tzdata==2023.3 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.2 -werkzeug==2.3.7 +websocket-client==1.6.3 +werkzeug==3.0.0 wheel==0.41.2 -widgetsnbextension==4.0.8 -wrapt==1.15.0 -y-py==0.6.0 +widgetsnbextension==4.0.9 +wrapt==1.14.1 +y-py==0.6.2 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 e2f307e2..8089aa08 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -41,7 +41,7 @@ repos: - id: trailing-whitespace - repo: https://github.com/ComPWA/repo-maintenance - rev: 0.0.197 + rev: 0.1.0rc0 hooks: - id: check-dev-files args: @@ -72,7 +72,7 @@ repos: - --fix - repo: https://github.com/psf/black - rev: 23.9.0 + rev: 23.9.1 hooks: - id: black @@ -82,7 +82,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 @@ -95,7 +95,7 @@ repos: pass_filenames: false - repo: https://github.com/streetsidesoftware/cspell-cli - rev: v7.3.0 + rev: v7.3.1 hooks: - id: cspell @@ -111,7 +111,7 @@ repos: )$ - repo: https://github.com/igorshubovych/markdownlint-cli - rev: v0.36.0 + rev: v0.37.0 hooks: - id: markdownlint @@ -155,19 +155,19 @@ repos: - id: prettier - repo: https://github.com/ComPWA/mirrors-pyright - rev: v1.1.326 + rev: v1.1.330 hooks: - id: pyright - repo: https://github.com/asottile/pyupgrade - rev: v3.10.1 + rev: v3.14.0 hooks: - id: pyupgrade args: - --py37-plus - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.0.287 + rev: v0.0.292 hooks: - id: ruff args: From 8cf024a5dd9d8464d1dcc49ec15ee6d963fe5997 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Sat, 7 Oct 2023 03:18:51 +0000 Subject: [PATCH 2/5] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- .cspell.json | 1 + .github/ISSUE_TEMPLATE/bug_report.md | 32 ---- .github/ISSUE_TEMPLATE/feature_request.md | 22 --- .github/pull_request_template.md | 11 -- .github/workflows/pr-linting.yml | 21 +-- .github/workflows/release-drafter.yml | 2 +- .gitignore | 1 - .gitpod.yml | 1 - .markdownlint.json | 7 - .pre-commit-config.yaml | 22 ++- .taplo.toml | 4 + .vscode/extensions.json | 2 +- .vscode/settings.json | 8 +- commitlint.config.js | 11 -- pyproject.toml | 199 +++++++++++++++++++++- setup.cfg | 157 ----------------- setup.py | 6 - 17 files changed, 232 insertions(+), 275 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 delete mode 100644 .markdownlint.json delete mode 100644 commitlint.config.js delete mode 100644 setup.cfg delete mode 100644 setup.py diff --git a/.cspell.json b/.cspell.json index 30c2e951..8cda5816 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/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 6449ddd5..cd3bb74f 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: @@ -14,19 +12,22 @@ 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 + - 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 }} check-title: name: Check title - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v3 - - run: npm install @commitlint/config-conventional - - 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/.gitignore b/.gitignore index e7d3526d..2b8d0d1a 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 360aad03..d981b21f 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/.markdownlint.json b/.markdownlint.json deleted file mode 100644 index 23bb7fa6..00000000 --- a/.markdownlint.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "MD013": { "line_length": 88 }, - "MD026": { "punctuation": ".,;:。，；：！" }, - "MD033": { - "allowed_elements": ["br"] - } -} diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 8089aa08..bebf5fa2 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -51,7 +51,6 @@ repos: - --repo-name=tensorwaves - --repo-title=TensorWaves - id: fix-nbformat-version - - id: format-setup-cfg - id: set-nb-cells args: - --add-install-cell @@ -61,9 +60,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 @@ -75,6 +71,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 @@ -110,11 +111,6 @@ repos: .*\.py )$ - - repo: https://github.com/igorshubovych/markdownlint-cli - rev: v0.37.0 - hooks: - - id: markdownlint - - repo: local hooks: - id: mypy @@ -135,6 +131,7 @@ repos: cell.attachments cell.metadata.code_folding cell.metadata.id + cell.metadata.pycharm cell.metadata.user_expressions metadata.celltoolbar metadata.colab.name @@ -177,3 +174,10 @@ repos: rev: v0.8.1 hooks: - id: taplo + + - repo: https://github.com/pappasam/toml-sort + rev: PLEASE-UPDATE + hooks: + - id: toml-sort + args: + - --in-place diff --git a/.taplo.toml b/.taplo.toml index f5caabee..0d0d4461 100644 --- a/.taplo.toml +++ b/.taplo.toml @@ -3,14 +3,18 @@ exclude = [ "**/Manifest.toml", "**/Project.toml", "labels*.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 0380e17e..bdeb608f 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", @@ -26,6 +25,7 @@ ], "unwantedRecommendations": [ "bungcip.better-toml", + "davidanson.vscode-markdownlint", "ms-python.flake8", "ms-python.isort", "ms-python.pylint", diff --git a/.vscode/settings.json b/.vscode/settings.json index 2f11cfcb..d0e660de 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, @@ -52,8 +53,9 @@ } ], "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, "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/pyproject.toml b/pyproject.toml index 2eaee7f8..2f58f7f3 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/tensorwaves/version.py" @@ -90,7 +90,6 @@ ignore_missing_imports = true module = ["tqdm.*"] [tool.nbqa.addopts] -black = ["--line-length=85"] ruff = [ "--extend-ignore=B018", "--extend-ignore=C90", @@ -260,3 +259,197 @@ task-tags = ["cspell"] [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] +tensorwaves = ["py.typed"] + +[project] +name = "tensorwaves" +description = "Python fitter package for multiple computational back-ends" +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", + "physics", + "tensorflow", +] +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", # https://www.attrs.org/en/stable/api.html#next-gen + "iminuit >=2.0", + "numpy", + "PyYAML >=5.1", # https://stackoverflow.com/a/55171433 + "sympy >=1.9", # lambdify cse + "tqdm >=4.24.0", # autonotebook +] +dynamic = ["version"] + +[project.readme] +file = "README.md" +content-type = "text/markdown" + +[project.urls] +Tracker = "https://github.com/ComPWA/tensorwaves/issues" +Changelog = "https://github.com/ComPWA/tensorwaves/releases" +Documentation = "https://tensorwaves.rtfd.io" +Source = "https://github.com/ComPWA/tensorwaves" + +[project.optional-dependencies] +jax = [ + "jax", + "jaxlib", +] +numba = [ + "numba", +] +tf = [ + "tensorflow >=2.4", # tensorflow.experimental.numpy +] +tensorflow = [ + "tensorwaves[tf]", +] +phsp = [ + "tensorwaves[tensorflow]", + "phasespace[tf] >=1.7.0", + 'phasespace <1.9.0; python_version <"3.8.0"', +] +phasespace = [ + "tensorwaves[phsp]", +] +pwa = [ + "tensorwaves[phsp]", + "ampform >=0.12.0", # https://github.com/ComPWA/ampform/pull/177 +] +scipy = [ + "scipy >=1", +] +viz = [ + "graphviz", +] +all = [ + "tensorwaves[jax]", + "tensorwaves[numba]", + "tensorwaves[pwa]", + "tensorwaves[scipy]", + "tensorwaves[tensorflow]", + "tensorwaves[viz]", +] +doc = [ + "tensorwaves[all]", + 'importlib-metadata; python_version <"3.8.0"', + "ipympl", + "jupyter", + "matplotlib", + "myst-nb >=0.14", # nb_ configuration prefixes + "nbclient >=0.5.5", # https://github.com/executablebooks/jupyter-book/issues/833 + "pandas", + "Sphinx >=3", + "sphinx-book-theme", + "sphinx-codeautolink[ipython]", + "sphinx-comments", + "sphinx-copybutton", + "sphinx-design", + "sphinx-thebe", + "sphinx-togglebutton", + "sphobjinv", +] +test-types = [ + "ipython", # test _repr_pretty_ + "pytest", + "pytest-mock >=3.3.0", +] +test = [ + "tensorwaves[test-types]", + "ampform >=0.13", # https://github.com/ComPWA/ampform/issues/208 + "nbmake", + 'nbmake <1.3; python_version <"3.8.0"', + "pytest-benchmark", + "pytest-cov", + "pytest-xdist", +] +format = [ + "black", +] +mypy = [ + "tensorwaves[jax]", + "tensorwaves[pwa]", + "tensorwaves[test-types]", + "mypy >=0.570", # attrs support + "types-docutils", + "types-pkg-resources", + "types-PyYAML", + "types-requests", + "types-setuptools", +] +lint = [ + "tensorwaves[mypy]", + "ruff", +] +sty = [ + "tensorwaves[format]", + "tensorwaves[lint]", + "pre-commit >=1.4.0", +] +jupyter = [ + "tensorwaves[doc]", + "jupyterlab", + "jupyterlab-code-formatter", + "jupyterlab-lsp", + "jupyterlab-myst", + "python-lsp-server[rope]", + 'ypy-websocket <0.8.3; python_version <"3.8.0"', +] +dev = [ + "tensorwaves[all]", + "tensorwaves[doc]", + "tensorwaves[jupyter]", + "tensorwaves[sty]", + "tensorwaves[test]", + "sphinx-autobuild", + "tox >=1.9", # for skip_install, use_develop +] diff --git a/setup.cfg b/setup.cfg deleted file mode 100644 index fba45ef7..00000000 --- a/setup.cfg +++ /dev/null @@ -1,157 +0,0 @@ -[metadata] -name = tensorwaves -description = Python fitter package for multiple computational back-ends -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/tensorwaves/issues - Changelog = https://github.com/ComPWA/tensorwaves/releases - Documentation = https://tensorwaves.rtfd.io - Source = https://github.com/ComPWA/tensorwaves -license = GPLv3 or later -keywords = - HEP - PWA - amplitude analysis - partial wave analysis - particle physics - physics - tensorflow -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 # https://www.attrs.org/en/stable/api.html#next-gen - iminuit >=2.0 - numpy - PyYAML >=5.1 # https://stackoverflow.com/a/55171433 - sympy >=1.9 # lambdify cse - tqdm >=4.24.0 # autonotebook -packages = find: -package_dir = - =src - -[options.extras_require] -jax = - jax - jaxlib -numba = - numba -tf = - tensorflow >=2.4 # tensorflow.experimental.numpy -tensorflow = - %(tf)s -phsp = - %(tensorflow)s - phasespace[tf] >=1.7.0 - phasespace <1.9.0; python_version <"3.8.0" -phasespace = - %(phsp)s -pwa = - %(phsp)s - ampform >=0.12.0 # https://github.com/ComPWA/ampform/pull/177 -scipy = - scipy >=1 -viz = - graphviz -all = - %(jax)s - %(numba)s - %(pwa)s - %(scipy)s - %(tensorflow)s - %(viz)s -doc = - %(all)s - importlib-metadata; python_version <"3.8.0" - ipympl - jupyter - matplotlib - myst-nb >=0.14 # nb_ configuration prefixes - nbclient >=0.5.5 # https://github.com/executablebooks/jupyter-book/issues/833 - pandas - Sphinx >=3 - sphinx-book-theme - sphinx-codeautolink[ipython] - sphinx-comments - sphinx-copybutton - sphinx-design - sphinx-thebe - sphinx-togglebutton - sphobjinv -test-types = - ipython # test _repr_pretty_ - pytest - pytest-mock >=3.3.0 -test = - %(test-types)s - ampform >=0.13 # https://github.com/ComPWA/ampform/issues/208 - nbmake - nbmake <1.3; python_version <"3.8.0" - pytest-benchmark - pytest-cov - pytest-xdist -format = - black -mypy = - %(jax)s - %(pwa)s - %(test-types)s - mypy >=0.570 # attrs support - types-docutils - types-pkg-resources - types-PyYAML - types-requests - types-setuptools -lint = - %(mypy)s - ruff -sty = - %(format)s - %(lint)s - pre-commit >=1.4.0 -jupyter = - %(doc)s - 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] -tensorwaves = - py.typed diff --git a/setup.py b/setup.py deleted file mode 100644 index 93296978..00000000 --- a/setup.py +++ /dev/null @@ -1,6 +0,0 @@ -from setuptools import setup - -setup( - use_scm_version=True, - setup_requires=["setuptools_scm"], -) From a5d92b1dce4e19a182ba7211097c26478ddb0e6c Mon Sep 17 00:00:00 2001 From: GitHub Date: Sat, 7 Oct 2023 03:22:06 +0000 Subject: [PATCH 3/5] MAINT: update pip constraints and pre-commit --- .constraints/py3.10.txt | 3 ++- .constraints/py3.11.txt | 3 ++- .constraints/py3.7.txt | 11 ++++++----- .constraints/py3.8.txt | 3 ++- .constraints/py3.9.txt | 3 ++- .pre-commit-config.yaml | 2 +- 6 files changed, 15 insertions(+), 10 deletions(-) diff --git a/.constraints/py3.10.txt b/.constraints/py3.10.txt index 3c1b7e2a..2eb1b191 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=pip --unsafe-package=setuptools --unsafe-package=tensorwaves # absl-py==2.0.0 accessible-pygments==0.0.4 @@ -252,3 +252,4 @@ zipp==3.17.0 # The following packages are considered to be unsafe in a requirements file: # setuptools +# tensorwaves diff --git a/.constraints/py3.11.txt b/.constraints/py3.11.txt index b4dd5211..a6cf39ef 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=pip --unsafe-package=setuptools --unsafe-package=tensorwaves # absl-py==2.0.0 accessible-pygments==0.0.4 @@ -250,3 +250,4 @@ zipp==3.17.0 # The following packages are considered to be unsafe in a requirements file: # setuptools +# tensorwaves diff --git a/.constraints/py3.7.txt b/.constraints/py3.7.txt index 5f2aefc5..2c4534f3 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=pip --unsafe-package=setuptools --unsafe-package=tensorwaves # absl-py==2.0.0 accessible-pygments==0.0.4 @@ -63,7 +63,7 @@ identify==2.5.24 idna==3.4 imagesize==1.4.1 iminuit==2.18.0 -importlib-metadata==6.7.0 ; python_version < "3.8.0" +importlib-metadata==6.7.0 importlib-resources==5.12.0 iniconfig==2.0.0 ipykernel==6.16.2 @@ -119,7 +119,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 @@ -135,7 +135,7 @@ parso==0.8.3 particle==0.23.0 pathspec==0.11.2 pexpect==4.8.0 -phasespace==1.8.0 ; python_version < "3.8.0" +phasespace==1.8.0 pickleshare==0.7.5 pillow==9.5.0 pkgutil-resolve-name==1.3.10 @@ -242,8 +242,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: # setuptools +# tensorwaves diff --git a/.constraints/py3.8.txt b/.constraints/py3.8.txt index 0e6d7ef2..8b5786a4 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=pip --unsafe-package=setuptools --unsafe-package=tensorwaves # absl-py==2.0.0 accessible-pygments==0.0.4 @@ -254,3 +254,4 @@ zipp==3.17.0 # The following packages are considered to be unsafe in a requirements file: # setuptools +# tensorwaves diff --git a/.constraints/py3.9.txt b/.constraints/py3.9.txt index 5384d8c5..1d66f688 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=pip --unsafe-package=setuptools --unsafe-package=tensorwaves # absl-py==2.0.0 accessible-pygments==0.0.4 @@ -253,3 +253,4 @@ zipp==3.17.0 # The following packages are considered to be unsafe in a requirements file: # setuptools +# tensorwaves diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index bebf5fa2..e797f81f 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -176,7 +176,7 @@ repos: - id: taplo - repo: https://github.com/pappasam/toml-sort - rev: PLEASE-UPDATE + rev: v0.23.1 hooks: - id: toml-sort args: From 6774545698583d6be81c0a4b3b3b1867ddac96ee Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Sat, 7 Oct 2023 03:22:32 +0000 Subject: [PATCH 4/5] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- pyproject.toml | 362 ++++++++++++++++++++++++------------------------- 1 file changed, 181 insertions(+), 181 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 2f58f7f3..329087a2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,9 +1,189 @@ [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", # https://www.attrs.org/en/stable/api.html#next-gen + "iminuit >=2.0", + "numpy", + "PyYAML >=5.1", # https://stackoverflow.com/a/55171433 + "sympy >=1.9", # lambdify cse + "tqdm >=4.24.0", # autonotebook +] +description = "Python fitter package for multiple computational back-ends" +dynamic = ["version"] +keywords = [ + "HEP", + "PWA", + "amplitude analysis", + "partial wave analysis", + "particle physics", + "physics", + "tensorflow", +] +license = {text = "GPLv3 or later"} +maintainers = [{email = "compwa-admin@ep1.rub.de"}] +name = "tensorwaves" +requires-python = ">=3.7" + +[project.optional-dependencies] +all = [ + "tensorwaves[jax]", + "tensorwaves[numba]", + "tensorwaves[pwa]", + "tensorwaves[scipy]", + "tensorwaves[tensorflow]", + "tensorwaves[viz]", +] +dev = [ + "tensorwaves[all]", + "tensorwaves[doc]", + "tensorwaves[jupyter]", + "tensorwaves[sty]", + "tensorwaves[test]", + "sphinx-autobuild", + "tox >=1.9", # for skip_install, use_develop +] +doc = [ + "tensorwaves[all]", + 'importlib-metadata; python_version <"3.8.0"', + "ipympl", + "jupyter", + "matplotlib", + "myst-nb >=0.14", # nb_ configuration prefixes + "nbclient >=0.5.5", # https://github.com/executablebooks/jupyter-book/issues/833 + "pandas", + "Sphinx >=3", + "sphinx-book-theme", + "sphinx-codeautolink[ipython]", + "sphinx-comments", + "sphinx-copybutton", + "sphinx-design", + "sphinx-thebe", + "sphinx-togglebutton", + "sphobjinv", +] +format = [ + "black", +] +jax = [ + "jax", + "jaxlib", +] +jupyter = [ + "tensorwaves[doc]", + "jupyterlab", + "jupyterlab-code-formatter", + "jupyterlab-lsp", + "jupyterlab-myst", + "python-lsp-server[rope]", + 'ypy-websocket <0.8.3; python_version <"3.8.0"', +] +lint = [ + "tensorwaves[mypy]", + "ruff", +] +mypy = [ + "tensorwaves[jax]", + "tensorwaves[pwa]", + "tensorwaves[test-types]", + "mypy >=0.570", # attrs support + "types-docutils", + "types-pkg-resources", + "types-PyYAML", + "types-requests", + "types-setuptools", +] +numba = [ + "numba", +] +phasespace = [ + "tensorwaves[phsp]", +] +phsp = [ + "tensorwaves[tensorflow]", + "phasespace[tf] >=1.7.0", + 'phasespace <1.9.0; python_version <"3.8.0"', +] +pwa = [ + "tensorwaves[phsp]", + "ampform >=0.12.0", # https://github.com/ComPWA/ampform/pull/177 +] +scipy = [ + "scipy >=1", +] +sty = [ + "tensorwaves[format]", + "tensorwaves[lint]", + "pre-commit >=1.4.0", +] +tensorflow = [ + "tensorwaves[tf]", +] +test = [ + "tensorwaves[test-types]", + "ampform >=0.13", # https://github.com/ComPWA/ampform/issues/208 + "nbmake", + 'nbmake <1.3; python_version <"3.8.0"', + "pytest-benchmark", + "pytest-cov", + "pytest-xdist", +] +test-types = [ + "ipython", # test _repr_pretty_ + "pytest", + "pytest-mock >=3.3.0", +] +tf = [ + "tensorflow >=2.4", # tensorflow.experimental.numpy +] +viz = [ + "graphviz", +] + +[project.readme] +content-type = "text/markdown" +file = "README.md" + +[project.urls] +Changelog = "https://github.com/ComPWA/tensorwaves/releases" +Documentation = "https://tensorwaves.rtfd.io" +Source = "https://github.com/ComPWA/tensorwaves" +Tracker = "https://github.com/ComPWA/tensorwaves/issues" + +[tool.setuptools] +include-package-data = false +package-dir = {"" = "src"} + +[tool.setuptools.package-data] +tensorwaves = ["py.typed"] + +[tool.setuptools.packages.find] +namespaces = false +where = ["src"] [tool.setuptools_scm] write_to = "src/tensorwaves/version.py" @@ -273,183 +453,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] -tensorwaves = ["py.typed"] - -[project] -name = "tensorwaves" -description = "Python fitter package for multiple computational back-ends" -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", - "physics", - "tensorflow", -] -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", # https://www.attrs.org/en/stable/api.html#next-gen - "iminuit >=2.0", - "numpy", - "PyYAML >=5.1", # https://stackoverflow.com/a/55171433 - "sympy >=1.9", # lambdify cse - "tqdm >=4.24.0", # autonotebook -] -dynamic = ["version"] - -[project.readme] -file = "README.md" -content-type = "text/markdown" - -[project.urls] -Tracker = "https://github.com/ComPWA/tensorwaves/issues" -Changelog = "https://github.com/ComPWA/tensorwaves/releases" -Documentation = "https://tensorwaves.rtfd.io" -Source = "https://github.com/ComPWA/tensorwaves" - -[project.optional-dependencies] -jax = [ - "jax", - "jaxlib", -] -numba = [ - "numba", -] -tf = [ - "tensorflow >=2.4", # tensorflow.experimental.numpy -] -tensorflow = [ - "tensorwaves[tf]", -] -phsp = [ - "tensorwaves[tensorflow]", - "phasespace[tf] >=1.7.0", - 'phasespace <1.9.0; python_version <"3.8.0"', -] -phasespace = [ - "tensorwaves[phsp]", -] -pwa = [ - "tensorwaves[phsp]", - "ampform >=0.12.0", # https://github.com/ComPWA/ampform/pull/177 -] -scipy = [ - "scipy >=1", -] -viz = [ - "graphviz", -] -all = [ - "tensorwaves[jax]", - "tensorwaves[numba]", - "tensorwaves[pwa]", - "tensorwaves[scipy]", - "tensorwaves[tensorflow]", - "tensorwaves[viz]", -] -doc = [ - "tensorwaves[all]", - 'importlib-metadata; python_version <"3.8.0"', - "ipympl", - "jupyter", - "matplotlib", - "myst-nb >=0.14", # nb_ configuration prefixes - "nbclient >=0.5.5", # https://github.com/executablebooks/jupyter-book/issues/833 - "pandas", - "Sphinx >=3", - "sphinx-book-theme", - "sphinx-codeautolink[ipython]", - "sphinx-comments", - "sphinx-copybutton", - "sphinx-design", - "sphinx-thebe", - "sphinx-togglebutton", - "sphobjinv", -] -test-types = [ - "ipython", # test _repr_pretty_ - "pytest", - "pytest-mock >=3.3.0", -] -test = [ - "tensorwaves[test-types]", - "ampform >=0.13", # https://github.com/ComPWA/ampform/issues/208 - "nbmake", - 'nbmake <1.3; python_version <"3.8.0"', - "pytest-benchmark", - "pytest-cov", - "pytest-xdist", -] -format = [ - "black", -] -mypy = [ - "tensorwaves[jax]", - "tensorwaves[pwa]", - "tensorwaves[test-types]", - "mypy >=0.570", # attrs support - "types-docutils", - "types-pkg-resources", - "types-PyYAML", - "types-requests", - "types-setuptools", -] -lint = [ - "tensorwaves[mypy]", - "ruff", -] -sty = [ - "tensorwaves[format]", - "tensorwaves[lint]", - "pre-commit >=1.4.0", -] -jupyter = [ - "tensorwaves[doc]", - "jupyterlab", - "jupyterlab-code-formatter", - "jupyterlab-lsp", - "jupyterlab-myst", - "python-lsp-server[rope]", - 'ypy-websocket <0.8.3; python_version <"3.8.0"', -] -dev = [ - "tensorwaves[all]", - "tensorwaves[doc]", - "tensorwaves[jupyter]", - "tensorwaves[sty]", - "tensorwaves[test]", - "sphinx-autobuild", - "tox >=1.9", # for skip_install, use_develop -] From 3a2baeb85ccec763e97d4caa01e138db0d2a4e27 Mon Sep 17 00:00:00 2001 From: GitHub Date: Sat, 7 Oct 2023 03:26:37 +0000 Subject: [PATCH 5/5] MAINT: implement updates from pre-commit hooks --- pyproject.toml | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 329087a2..36857589 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 = [ + "PyYAML >=5.1", # https://stackoverflow.com/a/55171433 "attrs >=20.1.0", # https://www.attrs.org/en/stable/api.html#next-gen "iminuit >=2.0", "numpy", - "PyYAML >=5.1", # https://stackoverflow.com/a/55171433 "sympy >=1.9", # lambdify cse "tqdm >=4.24.0", # autonotebook ] @@ -59,24 +59,22 @@ all = [ "tensorwaves[viz]", ] dev = [ + "sphinx-autobuild", "tensorwaves[all]", "tensorwaves[doc]", "tensorwaves[jupyter]", "tensorwaves[sty]", "tensorwaves[test]", - "sphinx-autobuild", "tox >=1.9", # for skip_install, use_develop ] doc = [ - "tensorwaves[all]", - 'importlib-metadata; python_version <"3.8.0"', + "Sphinx >=3", "ipympl", "jupyter", "matplotlib", "myst-nb >=0.14", # nb_ configuration prefixes "nbclient >=0.5.5", # https://github.com/executablebooks/jupyter-book/issues/833 "pandas", - "Sphinx >=3", "sphinx-book-theme", "sphinx-codeautolink[ipython]", "sphinx-comments", @@ -85,6 +83,8 @@ doc = [ "sphinx-thebe", "sphinx-togglebutton", "sphobjinv", + "tensorwaves[all]", + 'importlib-metadata; python_version <"3.8.0"', ] format = [ "black", @@ -94,26 +94,26 @@ jax = [ "jaxlib", ] jupyter = [ - "tensorwaves[doc]", "jupyterlab", "jupyterlab-code-formatter", "jupyterlab-lsp", "jupyterlab-myst", "python-lsp-server[rope]", + "tensorwaves[doc]", 'ypy-websocket <0.8.3; python_version <"3.8.0"', ] lint = [ - "tensorwaves[mypy]", "ruff", + "tensorwaves[mypy]", ] mypy = [ + "mypy >=0.570", # attrs support "tensorwaves[jax]", "tensorwaves[pwa]", "tensorwaves[test-types]", - "mypy >=0.570", # attrs support + "types-PyYAML", "types-docutils", "types-pkg-resources", - "types-PyYAML", "types-requests", "types-setuptools", ] @@ -124,33 +124,33 @@ phasespace = [ "tensorwaves[phsp]", ] phsp = [ - "tensorwaves[tensorflow]", "phasespace[tf] >=1.7.0", + "tensorwaves[tensorflow]", 'phasespace <1.9.0; python_version <"3.8.0"', ] pwa = [ - "tensorwaves[phsp]", "ampform >=0.12.0", # https://github.com/ComPWA/ampform/pull/177 + "tensorwaves[phsp]", ] scipy = [ "scipy >=1", ] sty = [ + "pre-commit >=1.4.0", "tensorwaves[format]", "tensorwaves[lint]", - "pre-commit >=1.4.0", ] tensorflow = [ "tensorwaves[tf]", ] test = [ - "tensorwaves[test-types]", "ampform >=0.13", # https://github.com/ComPWA/ampform/issues/208 "nbmake", - 'nbmake <1.3; python_version <"3.8.0"', "pytest-benchmark", "pytest-cov", "pytest-xdist", + "tensorwaves[test-types]", + 'nbmake <1.3; python_version <"3.8.0"', ] test-types = [ "ipython", # test _repr_pretty_