From 6548b77cb1201a6c857263cfe518b28d4d7906d1 Mon Sep 17 00:00:00 2001 From: Remco de Boer <29308176+redeboer@users.noreply.github.com> Date: Tue, 7 Feb 2023 19:41:44 +0100 Subject: [PATCH] FIX: allow higher Python versions (#478) * MAINT: clean up version constraints * MAINT: do not install `flake8` for Python 3.7 * MAINT: update pip constraints and pre-commit --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: GitHub --- .constraints/py3.10.txt | 93 +++++++++++++++++------------ .constraints/py3.7.txt | 84 +++++++++++++------------- .constraints/py3.8.txt | 93 +++++++++++++++++------------ .constraints/py3.9.txt | 93 +++++++++++++++++------------ .github/workflows/cd.yml | 2 + .pre-commit-config.yaml | 8 +-- docs/amplitude-analysis.ipynb | 5 +- setup.cfg | 38 ++++++------ src/tensorwaves/optimizer/minuit.py | 2 +- 9 files changed, 236 insertions(+), 182 deletions(-) diff --git a/.constraints/py3.10.txt b/.constraints/py3.10.txt index 566fa6e8..fe3058d5 100644 --- a/.constraints/py3.10.txt +++ b/.constraints/py3.10.txt @@ -5,20 +5,23 @@ # pip-compile --extra=dev --no-annotate --output-file=.constraints/py3.10.txt --strip-extras setup.py # absl-py==1.4.0 +aiofiles==22.1.0 +aiosqlite==0.18.0 alabaster==0.7.13 ampform==0.14.5 anyio==3.6.2 aquirdturtle-collapsible-headings==3.1.0 argon2-cffi==21.3.0 argon2-cffi-bindings==21.2.0 -astroid==2.13.3 +arrow==1.2.3 +astroid==2.14.1 asttokens==2.2.1 astunparse==1.6.3 attrs==22.2.0 babel==2.11.0 backcall==0.2.0 -beautifulsoup4==4.11.1 -black==22.12.0 +beautifulsoup4==4.11.2 +black==23.1.0 bleach==6.0.0 cachetools==5.3.0 certifi==2022.12.7 @@ -45,19 +48,20 @@ execnet==1.9.0 executing==1.2.0 fastjsonschema==2.16.2 filelock==3.9.0 -flake8==6.0.0 -flake8-blind-except==0.2.1 -flake8-bugbear==23.1.20 -flake8-builtins==2.1.0 -flake8-comprehensions==3.10.1 -flake8-future-annotations==1.1.0 +flake8==6.0.0 ; python_version >= "3.8.0" +flake8-blind-except==0.2.1 ; python_version >= "3.8.0" +flake8-bugbear==23.1.20 ; python_version >= "3.8.0" +flake8-builtins==2.1.0 ; python_version >= "3.8.0" +flake8-comprehensions==3.10.1 ; python_version >= "3.8.0" +flake8-future-annotations==1.1.0 ; python_version >= "3.8.0" flake8-plugin-utils==1.3.2 -flake8-pytest-style==1.6.0 -flake8-rst-docstrings==0.3.0 +flake8-pytest-style==1.6.0 ; python_version >= "3.8.0" +flake8-rst-docstrings==0.3.0 ; python_version >= "3.8.0" flake8-type-ignore==0.1.0.post2 ; python_version >= "3.8.0" -flake8-use-fstring==1.4 +flake8-use-fstring==1.4 ; python_version >= "3.8.0" flatbuffers==23.1.21 fonttools==4.38.0 +fqdn==1.5.1 gast==0.4.0 google-auth==2.16.0 google-auth-oauthlib==0.4.6 @@ -67,31 +71,37 @@ greenlet==2.0.2 grpcio==1.51.1 h5py==3.8.0 hepunits==2.3.1 -identify==2.5.16 +identify==2.5.17 idna==3.4 imagesize==1.4.1 iminuit==2.18.0 importlib-metadata==6.0.0 iniconfig==2.0.0 -ipykernel==6.20.2 +ipykernel==6.21.1 ipympl==0.9.2 ipython==8.9.0 ipython-genutils==0.2.0 ipywidgets==8.0.4 +isoduration==20.11.0 isort==5.12.0 jax==0.4.2 jaxlib==0.4.2 jedi==0.18.2 jinja2==3.1.2 json5==0.9.11 +jsonpointer==2.3 jsonschema==4.17.3 jupyter==1.0.0 jupyter-cache==0.5.0 -jupyter-client==8.0.1 +jupyter-client==8.0.2 jupyter-console==6.4.4 -jupyter-core==5.1.5 +jupyter-core==5.2.0 +jupyter-events==0.5.0 jupyter-server==1.23.5 -jupyterlab==3.5.3 +jupyter-server-fileid==0.6.0 +jupyter-server-ydoc==0.6.1 +jupyter-ydoc==0.2.2 +jupyterlab==3.6.1 jupyterlab-code-formatter==1.5.3 jupyterlab-markup==1.1.0 jupyterlab-myst==0.1.6 @@ -112,17 +122,17 @@ matplotlib-inline==0.1.6 mccabe==0.7.0 mdit-py-plugins==0.3.3 mdurl==0.1.2 -mistune==2.0.4 +mistune==2.0.5 mpmath==1.2.1 -mypy==0.991 -mypy-extensions==0.4.3 +mypy==1.0.0 +mypy-extensions==1.0.0 myst-nb==0.17.1 myst-parser==0.18.1 nbclassic==0.5.1 nbclient==0.5.13 nbconvert==7.2.9 nbformat==5.7.3 -nbmake==1.3.0 +nbmake==1.2.1 nest-asyncio==1.5.6 nodeenv==1.7.0 notebook==6.5.2 @@ -135,16 +145,16 @@ packaging==23.0 pandas==1.5.3 pandocfilters==1.5.0 parso==0.8.3 -particle==0.21.1 +particle==0.21.2 pathspec==0.11.0 -pep8-naming==0.13.3 +pep8-naming==0.13.3 ; python_version >= "3.8.0" pexpect==4.8.0 phasespace==1.8.0 pickleshare==0.7.5 pillow==9.4.0 platformdirs==2.6.2 pluggy==1.0.0 -pre-commit==3.0.2 +pre-commit==3.0.4 prometheus-client==0.16.0 prompt-toolkit==3.0.36 protobuf==3.19.6 @@ -161,7 +171,7 @@ pydata-sphinx-theme==0.8.1 pydocstyle==6.3.0 pyflakes==3.0.1 pygments==2.14.0 -pylint==2.15.10 +pylint==2.16.1 pyparsing==3.0.9 pyproject-api==1.5.0 pyrsistent==0.19.3 @@ -169,9 +179,10 @@ pytest==7.2.1 pytest-benchmark==4.0.0 pytest-cov==4.0.0 pytest-mock==3.10.0 -pytest-xdist==3.1.0 +pytest-xdist==3.2.0 python-constraint==1.4.0 python-dateutil==2.8.2 +python-json-logger==2.0.4 pytz==2022.7.1 pyyaml==6.0 pyzmq==25.0.0 @@ -181,6 +192,8 @@ qtpy==2.3.0 requests==2.28.2 requests-oauthlib==1.3.1 restructuredtext-lint==1.4.0 +rfc3339-validator==0.1.4 +rfc3986-validator==0.1.1 rsa==4.9 scipy==1.10.0 send2trash==1.8.0 @@ -191,7 +204,7 @@ soupsieve==2.3.2.post1 sphinx==4.5.0 sphinx-autobuild==2021.3.14 sphinx-book-theme==0.3.3 -sphinx-codeautolink==0.14.0 +sphinx-codeautolink==0.14.1 sphinx-comments==0.0.3 sphinx-copybutton==0.5.1 sphinx-design==0.3.0 @@ -199,7 +212,7 @@ sphinx-thebe==0.2.1 sphinx-togglebutton==0.3.2 sphinxcontrib-applehelp==1.0.4 sphinxcontrib-devhelp==1.0.2 -sphinxcontrib-htmlhelp==2.0.0 +sphinxcontrib-htmlhelp==2.0.1 sphinxcontrib-jsmath==1.0.1 sphinxcontrib-qthelp==1.0.3 sphinxcontrib-serializinghtml==1.1.5 @@ -221,26 +234,30 @@ tinycss2==1.2.1 tomli==2.0.1 tomlkit==0.11.6 tornado==6.2 -tox==4.4.2 +tox==4.4.4 tqdm==4.64.1 -traitlets==5.8.1 -types-docutils==0.19.1.2 +traitlets==5.9.0 +types-docutils==0.19.1.3 types-pkg-resources==0.1.3 -types-pyyaml==6.0.12.3 -types-requests==2.28.11.8 -types-setuptools==65.7.0.3 -types-urllib3==1.26.25.4 +types-pyyaml==6.0.12.4 +types-requests==2.28.11.12 +types-setuptools==67.1.0.2 +types-urllib3==1.26.25.5 typing-extensions==4.4.0 +uri-template==1.2.0 urllib3==1.26.14 -virtualenv==20.17.1 +virtualenv==20.18.0 wcwidth==0.2.6 +webcolors==1.12 webencodings==0.5.1 -websocket-client==1.5.0 +websocket-client==1.5.1 werkzeug==2.2.2 wheel==0.38.4 widgetsnbextension==4.0.5 wrapt==1.14.1 -zipp==3.12.0 +y-py==0.5.5 +ypy-websocket==0.8.2 +zipp==3.12.1 # 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 4a1bfd60..7b1e18ae 100644 --- a/.constraints/py3.7.txt +++ b/.constraints/py3.7.txt @@ -5,20 +5,24 @@ # pip-compile --extra=dev --no-annotate --output-file=.constraints/py3.7.txt --strip-extras setup.py # absl-py==1.4.0 +aiofiles==22.1.0 +aiosqlite==0.18.0 alabaster==0.7.13 ampform==0.14.5 anyio==3.6.2 aquirdturtle-collapsible-headings==3.1.0 argon2-cffi==21.3.0 argon2-cffi-bindings==21.2.0 -astroid==2.13.3 +arrow==1.2.3 +astroid==2.14.1 astunparse==1.6.3 attrs==22.2.0 babel==2.11.0 backcall==0.2.0 -beautifulsoup4==4.11.1 -black==22.12.0 +beautifulsoup4==4.11.2 +black==23.1.0 bleach==6.0.0 +cached-property==1.5.2 cachetools==5.3.0 certifi==2022.12.7 cffi==1.15.1 @@ -41,18 +45,9 @@ exceptiongroup==1.1.0 execnet==1.9.0 fastjsonschema==2.16.2 filelock==3.9.0 -flake8==5.0.4 -flake8-blind-except==0.2.1 -flake8-bugbear==23.1.20 -flake8-builtins==2.1.0 -flake8-comprehensions==3.10.1 -flake8-future-annotations==1.1.0 -flake8-plugin-utils==1.3.2 -flake8-pytest-style==1.6.0 -flake8-rst-docstrings==0.3.0 -flake8-use-fstring==1.4 flatbuffers==23.1.21 fonttools==4.38.0 +fqdn==1.5.1 gast==0.4.0 google-auth==2.16.0 google-auth-oauthlib==0.4.6 @@ -62,11 +57,11 @@ greenlet==2.0.2 grpcio==1.51.1 h5py==3.8.0 hepunits==2.3.1 -identify==2.5.16 +identify==2.5.17 idna==3.4 imagesize==1.4.1 iminuit==2.18.0 -importlib-metadata==4.2.0 ; python_version < "3.8.0" +importlib-metadata==4.13.0 ; python_version < "3.8.0" importlib-resources==5.10.2 iniconfig==2.0.0 ipykernel==6.16.2 @@ -74,25 +69,31 @@ ipympl==0.9.2 ipython==7.34.0 ipython-genutils==0.2.0 ipywidgets==8.0.4 +isoduration==20.11.0 isort==5.11.5 jax==0.3.25 jaxlib==0.3.25 jedi==0.18.2 jinja2==3.1.2 json5==0.9.11 +jsonpointer==2.3 jsonschema==4.17.3 jupyter==1.0.0 jupyter-cache==0.5.0 jupyter-client==7.4.9 jupyter-console==6.4.4 jupyter-core==4.12.0 +jupyter-events==0.5.0 jupyter-server==1.23.5 -jupyterlab==3.5.3 +jupyter-server-fileid==0.6.0 +jupyter-server-ydoc==0.6.1 +jupyter-ydoc==0.2.2 +jupyterlab==3.6.1 jupyterlab-code-formatter==1.5.3 jupyterlab-markup==1.1.0 jupyterlab-myst==0.1.6 jupyterlab-pygments==0.2.2 -jupyterlab-server==2.15.2 ; python_version < "3.8.0" +jupyterlab-server==2.19.0 jupyterlab-widgets==3.0.5 keras==2.11.0 kiwisolver==1.4.4 @@ -100,7 +101,7 @@ lazy-object-proxy==1.9.0 libclang==15.0.6.1 livereload==2.6.3 llvmlite==0.39.1 -markdown==3.3.4 ; python_version < "3.8.0" +markdown==3.4.1 markdown-it-py==2.1.0 markupsafe==2.1.2 matplotlib==3.5.3 @@ -108,17 +109,17 @@ matplotlib-inline==0.1.6 mccabe==0.7.0 mdit-py-plugins==0.3.3 mdurl==0.1.2 -mistune==2.0.4 +mistune==2.0.5 mpmath==1.2.1 -mypy==0.991 -mypy-extensions==0.4.3 +mypy==1.0.0 +mypy-extensions==1.0.0 myst-nb==0.17.1 myst-parser==0.18.1 nbclassic==0.5.1 nbclient==0.5.13 nbconvert==7.2.9 nbformat==5.7.3 -nbmake==1.3.0 +nbmake==1.2.1 nest-asyncio==1.5.6 nodeenv==1.7.0 notebook==6.5.2 @@ -131,9 +132,8 @@ packaging==23.0 pandas==1.3.5 pandocfilters==1.5.0 parso==0.8.3 -particle==0.21.1 +particle==0.21.2 pathspec==0.11.0 -pep8-naming==0.13.3 pexpect==4.8.0 phasespace==1.8.0 pickleshare==0.7.5 @@ -151,23 +151,22 @@ py==1.11.0 py-cpuinfo==9.0.0 pyasn1==0.4.8 pyasn1-modules==0.2.8 -pycodestyle==2.9.1 pycparser==2.21 pydantic==1.10.4 pydata-sphinx-theme==0.8.1 pydocstyle==6.3.0 -pyflakes==2.5.0 pygments==2.14.0 -pylint==2.15.10 +pylint==2.16.1 pyparsing==3.0.9 pyrsistent==0.19.3 pytest==7.2.1 pytest-benchmark==4.0.0 pytest-cov==4.0.0 pytest-mock==3.10.0 -pytest-xdist==3.1.0 +pytest-xdist==3.2.0 python-constraint==1.4.0 python-dateutil==2.8.2 +python-json-logger==2.0.4 pytz==2022.7.1 pyyaml==6.0 pyzmq==25.0.0 @@ -176,7 +175,8 @@ qtconsole==5.4.0 qtpy==2.3.0 requests==2.28.2 requests-oauthlib==1.3.1 -restructuredtext-lint==1.4.0 +rfc3339-validator==0.1.4 +rfc3986-validator==0.1.1 rsa==4.9 scipy==1.7.3 send2trash==1.8.0 @@ -185,10 +185,10 @@ six==1.16.0 sniffio==1.3.0 snowballstemmer==2.2.0 soupsieve==2.3.2.post1 -sphinx==4.3.2 ; python_version < "3.8.0" +sphinx==4.5.0 sphinx-autobuild==2021.3.14 sphinx-book-theme==0.3.3 -sphinx-codeautolink==0.14.0 +sphinx-codeautolink==0.14.1 sphinx-comments==0.0.3 sphinx-copybutton==0.5.1 sphinx-design==0.3.0 @@ -219,25 +219,29 @@ tomlkit==0.11.6 tornado==6.2 tox==3.28.0 ; python_version < "3.8.0" tqdm==4.64.1 -traitlets==5.8.1 +traitlets==5.9.0 typed-ast==1.5.4 -types-docutils==0.19.1.2 +types-docutils==0.19.1.3 types-pkg-resources==0.1.3 -types-pyyaml==6.0.12.3 -types-requests==2.28.11.8 -types-setuptools==65.7.0.3 -types-urllib3==1.26.25.4 +types-pyyaml==6.0.12.4 +types-requests==2.28.11.12 +types-setuptools==67.1.0.2 +types-urllib3==1.26.25.5 typing-extensions==4.4.0 +uri-template==1.2.0 urllib3==1.26.14 -virtualenv==20.15.1 ; python_version < "3.8.0" +virtualenv==20.18.0 wcwidth==0.2.6 +webcolors==1.12 webencodings==0.5.1 -websocket-client==1.5.0 +websocket-client==1.5.1 werkzeug==2.2.2 wheel==0.38.4 widgetsnbextension==4.0.5 wrapt==1.14.1 -zipp==3.12.0 +y-py==0.5.5 +ypy-websocket==0.8.2 +zipp==3.12.1 # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/.constraints/py3.8.txt b/.constraints/py3.8.txt index 37284b8a..ccf2f64e 100644 --- a/.constraints/py3.8.txt +++ b/.constraints/py3.8.txt @@ -5,20 +5,23 @@ # pip-compile --extra=dev --no-annotate --output-file=.constraints/py3.8.txt --strip-extras setup.py # absl-py==1.4.0 +aiofiles==22.1.0 +aiosqlite==0.18.0 alabaster==0.7.13 ampform==0.14.5 anyio==3.6.2 aquirdturtle-collapsible-headings==3.1.0 argon2-cffi==21.3.0 argon2-cffi-bindings==21.2.0 -astroid==2.13.3 +arrow==1.2.3 +astroid==2.14.1 asttokens==2.2.1 astunparse==1.6.3 attrs==22.2.0 babel==2.11.0 backcall==0.2.0 -beautifulsoup4==4.11.1 -black==22.12.0 +beautifulsoup4==4.11.2 +black==23.1.0 bleach==6.0.0 cachetools==5.3.0 certifi==2022.12.7 @@ -45,19 +48,20 @@ execnet==1.9.0 executing==1.2.0 fastjsonschema==2.16.2 filelock==3.9.0 -flake8==6.0.0 -flake8-blind-except==0.2.1 -flake8-bugbear==23.1.20 -flake8-builtins==2.1.0 -flake8-comprehensions==3.10.1 -flake8-future-annotations==1.1.0 +flake8==6.0.0 ; python_version >= "3.8.0" +flake8-blind-except==0.2.1 ; python_version >= "3.8.0" +flake8-bugbear==23.1.20 ; python_version >= "3.8.0" +flake8-builtins==2.1.0 ; python_version >= "3.8.0" +flake8-comprehensions==3.10.1 ; python_version >= "3.8.0" +flake8-future-annotations==1.1.0 ; python_version >= "3.8.0" flake8-plugin-utils==1.3.2 -flake8-pytest-style==1.6.0 -flake8-rst-docstrings==0.3.0 +flake8-pytest-style==1.6.0 ; python_version >= "3.8.0" +flake8-rst-docstrings==0.3.0 ; python_version >= "3.8.0" flake8-type-ignore==0.1.0.post2 ; python_version >= "3.8.0" -flake8-use-fstring==1.4 +flake8-use-fstring==1.4 ; python_version >= "3.8.0" flatbuffers==23.1.21 fonttools==4.38.0 +fqdn==1.5.1 gast==0.4.0 google-auth==2.16.0 google-auth-oauthlib==0.4.6 @@ -67,32 +71,38 @@ greenlet==2.0.2 grpcio==1.51.1 h5py==3.8.0 hepunits==2.3.1 -identify==2.5.16 +identify==2.5.17 idna==3.4 imagesize==1.4.1 iminuit==2.18.0 importlib-metadata==6.0.0 importlib-resources==5.10.2 iniconfig==2.0.0 -ipykernel==6.20.2 +ipykernel==6.21.1 ipympl==0.9.2 ipython==8.9.0 ipython-genutils==0.2.0 ipywidgets==8.0.4 +isoduration==20.11.0 isort==5.12.0 jax==0.4.2 jaxlib==0.4.2 jedi==0.18.2 jinja2==3.1.2 json5==0.9.11 +jsonpointer==2.3 jsonschema==4.17.3 jupyter==1.0.0 jupyter-cache==0.5.0 -jupyter-client==8.0.1 +jupyter-client==8.0.2 jupyter-console==6.4.4 -jupyter-core==5.1.5 +jupyter-core==5.2.0 +jupyter-events==0.5.0 jupyter-server==1.23.5 -jupyterlab==3.5.3 +jupyter-server-fileid==0.6.0 +jupyter-server-ydoc==0.6.1 +jupyter-ydoc==0.2.2 +jupyterlab==3.6.1 jupyterlab-code-formatter==1.5.3 jupyterlab-markup==1.1.0 jupyterlab-myst==0.1.6 @@ -113,17 +123,17 @@ matplotlib-inline==0.1.6 mccabe==0.7.0 mdit-py-plugins==0.3.3 mdurl==0.1.2 -mistune==2.0.4 +mistune==2.0.5 mpmath==1.2.1 -mypy==0.991 -mypy-extensions==0.4.3 +mypy==1.0.0 +mypy-extensions==1.0.0 myst-nb==0.17.1 myst-parser==0.18.1 nbclassic==0.5.1 nbclient==0.5.13 nbconvert==7.2.9 nbformat==5.7.3 -nbmake==1.3.0 +nbmake==1.2.1 nest-asyncio==1.5.6 nodeenv==1.7.0 notebook==6.5.2 @@ -136,9 +146,9 @@ packaging==23.0 pandas==1.5.3 pandocfilters==1.5.0 parso==0.8.3 -particle==0.21.1 +particle==0.21.2 pathspec==0.11.0 -pep8-naming==0.13.3 +pep8-naming==0.13.3 ; python_version >= "3.8.0" pexpect==4.8.0 phasespace==1.8.0 pickleshare==0.7.5 @@ -146,7 +156,7 @@ pillow==9.4.0 pkgutil-resolve-name==1.3.10 platformdirs==2.6.2 pluggy==1.0.0 -pre-commit==3.0.2 +pre-commit==3.0.4 prometheus-client==0.16.0 prompt-toolkit==3.0.36 protobuf==3.19.6 @@ -163,7 +173,7 @@ pydata-sphinx-theme==0.8.1 pydocstyle==6.3.0 pyflakes==3.0.1 pygments==2.14.0 -pylint==2.15.10 +pylint==2.16.1 pyparsing==3.0.9 pyproject-api==1.5.0 pyrsistent==0.19.3 @@ -171,9 +181,10 @@ pytest==7.2.1 pytest-benchmark==4.0.0 pytest-cov==4.0.0 pytest-mock==3.10.0 -pytest-xdist==3.1.0 +pytest-xdist==3.2.0 python-constraint==1.4.0 python-dateutil==2.8.2 +python-json-logger==2.0.4 pytz==2022.7.1 pyyaml==6.0 pyzmq==25.0.0 @@ -183,6 +194,8 @@ qtpy==2.3.0 requests==2.28.2 requests-oauthlib==1.3.1 restructuredtext-lint==1.4.0 +rfc3339-validator==0.1.4 +rfc3986-validator==0.1.1 rsa==4.9 scipy==1.10.0 send2trash==1.8.0 @@ -193,7 +206,7 @@ soupsieve==2.3.2.post1 sphinx==4.5.0 sphinx-autobuild==2021.3.14 sphinx-book-theme==0.3.3 -sphinx-codeautolink==0.14.0 +sphinx-codeautolink==0.14.1 sphinx-comments==0.0.3 sphinx-copybutton==0.5.1 sphinx-design==0.3.0 @@ -201,7 +214,7 @@ sphinx-thebe==0.2.1 sphinx-togglebutton==0.3.2 sphinxcontrib-applehelp==1.0.4 sphinxcontrib-devhelp==1.0.2 -sphinxcontrib-htmlhelp==2.0.0 +sphinxcontrib-htmlhelp==2.0.1 sphinxcontrib-jsmath==1.0.1 sphinxcontrib-qthelp==1.0.3 sphinxcontrib-serializinghtml==1.1.5 @@ -223,26 +236,30 @@ tinycss2==1.2.1 tomli==2.0.1 tomlkit==0.11.6 tornado==6.2 -tox==4.4.2 +tox==4.4.4 tqdm==4.64.1 -traitlets==5.8.1 -types-docutils==0.19.1.2 +traitlets==5.9.0 +types-docutils==0.19.1.3 types-pkg-resources==0.1.3 -types-pyyaml==6.0.12.3 -types-requests==2.28.11.8 -types-setuptools==65.7.0.3 -types-urllib3==1.26.25.4 +types-pyyaml==6.0.12.4 +types-requests==2.28.11.12 +types-setuptools==67.1.0.2 +types-urllib3==1.26.25.5 typing-extensions==4.4.0 +uri-template==1.2.0 urllib3==1.26.14 -virtualenv==20.17.1 +virtualenv==20.18.0 wcwidth==0.2.6 +webcolors==1.12 webencodings==0.5.1 -websocket-client==1.5.0 +websocket-client==1.5.1 werkzeug==2.2.2 wheel==0.38.4 widgetsnbextension==4.0.5 wrapt==1.14.1 -zipp==3.12.0 +y-py==0.5.5 +ypy-websocket==0.8.2 +zipp==3.12.1 # 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 35bdff5c..c88ee8d9 100644 --- a/.constraints/py3.9.txt +++ b/.constraints/py3.9.txt @@ -5,20 +5,23 @@ # pip-compile --extra=dev --no-annotate --output-file=.constraints/py3.9.txt --strip-extras setup.py # absl-py==1.4.0 +aiofiles==22.1.0 +aiosqlite==0.18.0 alabaster==0.7.13 ampform==0.14.5 anyio==3.6.2 aquirdturtle-collapsible-headings==3.1.0 argon2-cffi==21.3.0 argon2-cffi-bindings==21.2.0 -astroid==2.13.3 +arrow==1.2.3 +astroid==2.14.1 asttokens==2.2.1 astunparse==1.6.3 attrs==22.2.0 babel==2.11.0 backcall==0.2.0 -beautifulsoup4==4.11.1 -black==22.12.0 +beautifulsoup4==4.11.2 +black==23.1.0 bleach==6.0.0 cachetools==5.3.0 certifi==2022.12.7 @@ -45,19 +48,20 @@ execnet==1.9.0 executing==1.2.0 fastjsonschema==2.16.2 filelock==3.9.0 -flake8==6.0.0 -flake8-blind-except==0.2.1 -flake8-bugbear==23.1.20 -flake8-builtins==2.1.0 -flake8-comprehensions==3.10.1 -flake8-future-annotations==1.1.0 +flake8==6.0.0 ; python_version >= "3.8.0" +flake8-blind-except==0.2.1 ; python_version >= "3.8.0" +flake8-bugbear==23.1.20 ; python_version >= "3.8.0" +flake8-builtins==2.1.0 ; python_version >= "3.8.0" +flake8-comprehensions==3.10.1 ; python_version >= "3.8.0" +flake8-future-annotations==1.1.0 ; python_version >= "3.8.0" flake8-plugin-utils==1.3.2 -flake8-pytest-style==1.6.0 -flake8-rst-docstrings==0.3.0 +flake8-pytest-style==1.6.0 ; python_version >= "3.8.0" +flake8-rst-docstrings==0.3.0 ; python_version >= "3.8.0" flake8-type-ignore==0.1.0.post2 ; python_version >= "3.8.0" -flake8-use-fstring==1.4 +flake8-use-fstring==1.4 ; python_version >= "3.8.0" flatbuffers==23.1.21 fonttools==4.38.0 +fqdn==1.5.1 gast==0.4.0 google-auth==2.16.0 google-auth-oauthlib==0.4.6 @@ -67,31 +71,37 @@ greenlet==2.0.2 grpcio==1.51.1 h5py==3.8.0 hepunits==2.3.1 -identify==2.5.16 +identify==2.5.17 idna==3.4 imagesize==1.4.1 iminuit==2.18.0 importlib-metadata==6.0.0 iniconfig==2.0.0 -ipykernel==6.20.2 +ipykernel==6.21.1 ipympl==0.9.2 ipython==8.9.0 ipython-genutils==0.2.0 ipywidgets==8.0.4 +isoduration==20.11.0 isort==5.12.0 jax==0.4.2 jaxlib==0.4.2 jedi==0.18.2 jinja2==3.1.2 json5==0.9.11 +jsonpointer==2.3 jsonschema==4.17.3 jupyter==1.0.0 jupyter-cache==0.5.0 -jupyter-client==8.0.1 +jupyter-client==8.0.2 jupyter-console==6.4.4 -jupyter-core==5.1.5 +jupyter-core==5.2.0 +jupyter-events==0.5.0 jupyter-server==1.23.5 -jupyterlab==3.5.3 +jupyter-server-fileid==0.6.0 +jupyter-server-ydoc==0.6.1 +jupyter-ydoc==0.2.2 +jupyterlab==3.6.1 jupyterlab-code-formatter==1.5.3 jupyterlab-markup==1.1.0 jupyterlab-myst==0.1.6 @@ -112,17 +122,17 @@ matplotlib-inline==0.1.6 mccabe==0.7.0 mdit-py-plugins==0.3.3 mdurl==0.1.2 -mistune==2.0.4 +mistune==2.0.5 mpmath==1.2.1 -mypy==0.991 -mypy-extensions==0.4.3 +mypy==1.0.0 +mypy-extensions==1.0.0 myst-nb==0.17.1 myst-parser==0.18.1 nbclassic==0.5.1 nbclient==0.5.13 nbconvert==7.2.9 nbformat==5.7.3 -nbmake==1.3.0 +nbmake==1.2.1 nest-asyncio==1.5.6 nodeenv==1.7.0 notebook==6.5.2 @@ -135,16 +145,16 @@ packaging==23.0 pandas==1.5.3 pandocfilters==1.5.0 parso==0.8.3 -particle==0.21.1 +particle==0.21.2 pathspec==0.11.0 -pep8-naming==0.13.3 +pep8-naming==0.13.3 ; python_version >= "3.8.0" pexpect==4.8.0 phasespace==1.8.0 pickleshare==0.7.5 pillow==9.4.0 platformdirs==2.6.2 pluggy==1.0.0 -pre-commit==3.0.2 +pre-commit==3.0.4 prometheus-client==0.16.0 prompt-toolkit==3.0.36 protobuf==3.19.6 @@ -161,7 +171,7 @@ pydata-sphinx-theme==0.8.1 pydocstyle==6.3.0 pyflakes==3.0.1 pygments==2.14.0 -pylint==2.15.10 +pylint==2.16.1 pyparsing==3.0.9 pyproject-api==1.5.0 pyrsistent==0.19.3 @@ -169,9 +179,10 @@ pytest==7.2.1 pytest-benchmark==4.0.0 pytest-cov==4.0.0 pytest-mock==3.10.0 -pytest-xdist==3.1.0 +pytest-xdist==3.2.0 python-constraint==1.4.0 python-dateutil==2.8.2 +python-json-logger==2.0.4 pytz==2022.7.1 pyyaml==6.0 pyzmq==25.0.0 @@ -181,6 +192,8 @@ qtpy==2.3.0 requests==2.28.2 requests-oauthlib==1.3.1 restructuredtext-lint==1.4.0 +rfc3339-validator==0.1.4 +rfc3986-validator==0.1.1 rsa==4.9 scipy==1.10.0 send2trash==1.8.0 @@ -191,7 +204,7 @@ soupsieve==2.3.2.post1 sphinx==4.5.0 sphinx-autobuild==2021.3.14 sphinx-book-theme==0.3.3 -sphinx-codeautolink==0.14.0 +sphinx-codeautolink==0.14.1 sphinx-comments==0.0.3 sphinx-copybutton==0.5.1 sphinx-design==0.3.0 @@ -199,7 +212,7 @@ sphinx-thebe==0.2.1 sphinx-togglebutton==0.3.2 sphinxcontrib-applehelp==1.0.4 sphinxcontrib-devhelp==1.0.2 -sphinxcontrib-htmlhelp==2.0.0 +sphinxcontrib-htmlhelp==2.0.1 sphinxcontrib-jsmath==1.0.1 sphinxcontrib-qthelp==1.0.3 sphinxcontrib-serializinghtml==1.1.5 @@ -221,26 +234,30 @@ tinycss2==1.2.1 tomli==2.0.1 tomlkit==0.11.6 tornado==6.2 -tox==4.4.2 +tox==4.4.4 tqdm==4.64.1 -traitlets==5.8.1 -types-docutils==0.19.1.2 +traitlets==5.9.0 +types-docutils==0.19.1.3 types-pkg-resources==0.1.3 -types-pyyaml==6.0.12.3 -types-requests==2.28.11.8 -types-setuptools==65.7.0.3 -types-urllib3==1.26.25.4 +types-pyyaml==6.0.12.4 +types-requests==2.28.11.12 +types-setuptools==67.1.0.2 +types-urllib3==1.26.25.5 typing-extensions==4.4.0 +uri-template==1.2.0 urllib3==1.26.14 -virtualenv==20.17.1 +virtualenv==20.18.0 wcwidth==0.2.6 +webcolors==1.12 webencodings==0.5.1 -websocket-client==1.5.0 +websocket-client==1.5.1 werkzeug==2.2.2 wheel==0.38.4 widgetsnbextension==4.0.5 wrapt==1.14.1 -zipp==3.12.0 +y-py==0.5.5 +ypy-websocket==0.8.2 +zipp==3.12.1 # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 22fb1808..925b84d6 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -12,7 +12,9 @@ jobs: uses: ComPWA/actions/.github/workflows/close-milestone.yml@v1 pypi: if: startsWith(github.ref, 'refs/tags') + secrets: inherit uses: ComPWA/actions/.github/workflows/publish-to-pypi.yml@v1 push: if: startsWith(github.ref, 'refs/tags') && !github.event.release.prerelease + secrets: inherit uses: ComPWA/actions/.github/workflows/push-to-version-branches.yml@v1 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 4fc4545e..d920ff0a 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -43,7 +43,7 @@ repos: - id: trailing-whitespace - repo: https://github.com/ComPWA/repo-maintenance - rev: 0.0.167 + rev: 0.0.168 hooks: - id: check-dev-files args: @@ -73,7 +73,7 @@ repos: - --py37-plus - repo: https://github.com/psf/black - rev: 22.12.0 + rev: 23.1.0 hooks: - id: black @@ -83,7 +83,7 @@ repos: - id: blacken-docs - repo: https://github.com/streetsidesoftware/cspell-cli - rev: v6.19.2 + rev: v6.22.0 hooks: - id: cspell @@ -175,7 +175,7 @@ repos: - python - repo: https://github.com/ComPWA/mirrors-pyright - rev: v1.1.291 + rev: v1.1.292 hooks: - id: pyright diff --git a/docs/amplitude-analysis.ipynb b/docs/amplitude-analysis.ipynb index 6b43fe2b..6ed80871 100644 --- a/docs/amplitude-analysis.ipynb +++ b/docs/amplitude-analysis.ipynb @@ -822,8 +822,9 @@ "outputs": [], "source": [ "initial_parameters = {\n", - " R\"C_{J/\\psi(1S) \\to {f_{0}(1500)}_{0} \\gamma_{+1}; f_{0}(1500) \\to \\pi^{0}_{0} \\pi^{0}_{0}}\": 1.0\n", - " + 0.0j,\n", + " R\"C_{J/\\psi(1S) \\to {f_{0}(1500)}_{0} \\gamma_{+1}; f_{0}(1500) \\to \\pi^{0}_{0} \\pi^{0}_{0}}\": (\n", + " 1.0 + 0.0j\n", + " ),\n", " \"m_{f_{0}(500)}\": 0.4,\n", " \"m_{f_{0}(980)}\": 0.88,\n", " \"m_{f_{0}(1370)}\": 1.22,\n", diff --git a/setup.cfg b/setup.cfg index b2ba4c0f..14b0c7c8 100644 --- a/setup.cfg +++ b/setup.cfg @@ -38,7 +38,7 @@ classifiers = Typing :: Typed [options] -python_requires = >=3.7, <3.11 +python_requires = >=3.7 setup_requires = setuptools_scm install_requires = @@ -59,12 +59,12 @@ jax = numba = numba tf = - tensorflow >=2.4, <3 # tensorflow.experimental.numpy + tensorflow >=2.4 # tensorflow.experimental.numpy tensorflow = %(tf)s phsp = %(tensorflow)s - phasespace[tf] >=1.7.0, <2 + phasespace[tf] >=1.7.0 phasespace = %(phsp)s pwa = @@ -85,14 +85,12 @@ doc = %(all)s importlib-metadata; python_version <"3.8.0" ipympl - ipython!=8.7.0 # https://github.com/ipython/ipython/issues/13845 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 <4.4; python_version <"3.8.0" # https://github.com/ComPWA/qrules/runs/4833302679 sphinx-book-theme sphinx-codeautolink[ipython] sphinx-comments @@ -108,8 +106,9 @@ test-types = test = %(test-types)s ampform >=0.13 # https://github.com/ComPWA/ampform/issues/208 - coverage!=6.3 # https://github.com/ComPWA/tensorwaves/runs/4988761243 - nbmake <=1.3.0 # https://github.com/ComPWA/tensorwaves/runs/7298085386?check_suite_focus=true#step:3:71 + nbmake + nbmake !=1.3.* # https://github.com/ComPWA/tensorwaves/actions/runs/4115773410/jobs/7104945298#step:3:84 + nbmake !=1.4.* # https://github.com/ComPWA/tensorwaves/actions/runs/4115722644/jobs/7104829138 pytest-benchmark pytest-cov pytest-xdist @@ -117,18 +116,17 @@ format = black isort flake8 = - flake8 >=4 # extend-select - flake8-blind-except - flake8-bugbear - flake8-builtins - flake8-comprehensions - flake8-future-annotations - flake8-pytest-style - flake8-rst-docstrings + flake8 >=4; python_version >="3.8.0" # extend-select + flake8-blind-except; python_version >="3.8.0" + flake8-bugbear; python_version >="3.8.0" + flake8-builtins; python_version >="3.8.0" + flake8-comprehensions; python_version >="3.8.0" + flake8-future-annotations; python_version >="3.8.0" + flake8-pytest-style; python_version >="3.8.0" + flake8-rst-docstrings; python_version >="3.8.0" flake8-type-ignore; python_version >="3.8.0" - flake8-use-fstring - markdown <3.3.6; python_version <"3.8.0" # https://github.com/ComPWA/tensorwaves/runs/6448378225#step:3:73 - pep8-naming + flake8-use-fstring; python_version >="3.8.0" + pep8-naming; python_version >="3.8.0" mypy = %(jax)s %(pwa)s @@ -157,11 +155,9 @@ dev = jupyterlab jupyterlab-code-formatter jupyterlab-myst - jupyterlab-server <2.16; python_version <"3.8.0" # https://github.com/ComPWA/tensorwaves/actions/runs/3366807875/jobs/5583673530#step:3:74 sphinx-autobuild tox >=1.9 # for skip_install, use_develop - tox <4; python_version <"3.8.0" # https://github.com/ComPWA/tensorwaves/actions/runs/3658736023/jobs/6183905960#step:3:88 - virtualenv <20.16; python_version <"3.8.0" # https://github.com/ComPWA/tensorwaves/runs/7718310760?check_suite_focus=true#step:3:80 + tox !=4.*; python_version <"3.8.0" # https://github.com/ComPWA/tensorwaves/actions/runs/4114638663/jobs/7102281592#step:3:97 [options.packages.find] where = src diff --git a/src/tensorwaves/optimizer/minuit.py b/src/tensorwaves/optimizer/minuit.py index 93aaa615..23ec90fd 100644 --- a/src/tensorwaves/optimizer/minuit.py +++ b/src/tensorwaves/optimizer/minuit.py @@ -18,7 +18,7 @@ class Minuit2(Optimizer): - """Adapter to `Minuit2 `_. + """Adapter to `Minuit2 `_. Implements the `~.interface.Optimizer` interface using `iminuit.Minuit`.