diff --git a/.constraints/py3.10.txt b/.constraints/py3.10.txt index ce718bab..1b0e79f8 100644 --- a/.constraints/py3.10.txt +++ b/.constraints/py3.10.txt @@ -10,47 +10,46 @@ anyio==4.0.0 argon2-cffi==23.1.0 argon2-cffi-bindings==21.2.0 arrow==1.3.0 -asttokens==2.4.0 +asttokens==2.4.1 async-lru==2.0.4 attrs==23.1.0 -babel==2.13.0 -backcall==0.2.0 +babel==2.13.1 beautifulsoup4==4.12.2 -black==23.9.1 +black==23.11.0 bleach==6.1.0 -cachetools==5.3.1 +cachetools==5.3.2 certifi==2023.7.22 cffi==1.16.0 cfgv==3.4.0 chardet==5.2.0 -charset-normalizer==3.3.0 +charset-normalizer==3.3.2 click==8.1.7 colorama==0.4.6 -comm==0.1.4 -contourpy==1.1.1 +comm==0.2.0 +contourpy==1.2.0 cycler==0.12.1 debugpy==1.8.0 decorator==5.1.1 defusedxml==0.7.1 distlib==0.3.7 -docstring-to-markdown==0.12 +docstring-to-markdown==0.13 docutils==0.17.1 exceptiongroup==1.1.3 -executing==2.0.0 +executing==2.0.1 fastjsonschema==2.18.1 -filelock==3.12.4 -fonttools==4.43.1 +filelock==3.13.1 +fonttools==4.44.0 fqdn==1.5.1 graphviz==0.20.1 -greenlet==3.0.0 -identify==2.5.30 +greenlet==3.0.1 +identify==2.5.31 idna==3.4 imagesize==1.4.1 importlib-metadata==6.8.0 iniconfig==2.0.0 -ipykernel==6.25.2 +ipykernel==6.26.0 ipympl==0.9.3 -ipython==8.16.1 +ipython==8.17.2 ipython-genutils==0.2.0 ipywidgets==8.1.1 isoduration==20.11.0 @@ -58,30 +57,30 @@ jedi==0.19.1 jinja2==3.1.2 json5==0.9.14 jsonpointer==2.4 -jsonschema==4.19.1 +jsonschema==4.19.2 jsonschema-specifications==2023.7.1 jupyter==1.0.0 jupyter-cache==0.6.1 -jupyter-client==8.3.1 +jupyter-client==8.6.0 jupyter-console==6.6.3 -jupyter-core==5.3.2 -jupyter-events==0.7.0 +jupyter-core==5.5.0 +jupyter-events==0.9.0 jupyter-lsp==2.2.0 -jupyter-server==2.7.3 +jupyter-server==2.10.0 jupyter-server-terminals==0.4.4 -jupyterlab==4.0.6 +jupyterlab==4.0.8 jupyterlab-code-formatter==2.2.1 jupyterlab-lsp==5.0.0 -jupyterlab-myst==2.0.2 +jupyterlab-myst==2.1.0 jupyterlab-pygments==0.2.2 -jupyterlab-server==2.25.0 +jupyterlab-server==2.25.1 jupyterlab-widgets==3.0.9 kiwisolver==1.4.5 latexcodec==2.0.1 livereload==2.6.3 markdown-it-py==2.2.0 markupsafe==2.1.3 -matplotlib==3.8.0 +matplotlib==3.8.1 matplotlib-inline==0.1.6 mdit-py-plugins==0.3.5 mdurl==0.1.2 @@ -91,54 +90,53 @@ mypy-extensions==1.0.0 myst-nb==0.17.2 myst-parser==0.18.1 nbclient==0.6.8 -nbconvert==7.9.2 +nbconvert==7.11.0 nbformat==5.9.2 -nbmake==1.4.5 +nbmake==1.4.6 nest-asyncio==1.5.8 nodeenv==1.8.0 -notebook==7.0.4 +notebook==7.0.6 notebook-shim==0.2.3 -numpy==1.26.0 +numpy==1.26.1 overrides==7.4.0 packaging==23.2 pandocfilters==1.5.0 parso==0.8.3 pathspec==0.11.2 pexpect==4.8.0 -pickleshare==0.7.5 -pillow==10.0.1 +pillow==10.1.0 platformdirs==3.11.0 pluggy==1.3.0 -pre-commit==3.4.0 -prometheus-client==0.17.1 +pre-commit==3.5.0 +prometheus-client==0.18.0 prompt-toolkit==3.0.39 -psutil==5.9.5 +psutil==5.9.6 ptyprocess==0.7.0 pure-eval==0.2.2 pybtex==0.24.0 pybtex-docutils==1.0.3 pycparser==2.21 -pydata-sphinx-theme==0.14.1 +pydata-sphinx-theme==0.14.3 pygments==2.16.1 pyparsing==3.1.1 pyproject-api==1.6.1 -pytest==7.4.2 +pytest==7.4.3 python-dateutil==2.8.2 python-json-logger==2.0.7 python-lsp-jsonrpc==1.1.2 -python-lsp-server==1.8.2 -pytoolconfig==1.2.5 +python-lsp-server==1.9.0 +pytoolconfig==1.2.6 pyyaml==6.0.1 pyzmq==25.1.1 -qtconsole==5.4.4 -qtpy==2.4.0 +qtconsole==5.5.0 +qtpy==2.4.1 referencing==0.30.2 requests==2.31.0 rfc3339-validator==0.1.4 rfc3986-validator==0.1.1 -rope==1.10.0 -rpds-py==0.10.4 -ruff==0.0.292 +rope==1.11.0 +rpds-py==0.12.0 +ruff==0.1.4 send2trash==1.8.2 six==1.16.0 sniffio==1.3.0 @@ -153,7 +151,7 @@ sphinx-copybutton==0.5.2 sphinx-design==0.5.0 sphinx-hep-pdgref==0.2.0 sphinx-remove-toctrees==0.0.3 -sphinx-thebe==0.2.1 +sphinx-thebe==0.3.0 sphinx-togglebutton==0.3.2 sphinxcontrib-applehelp==1.0.7 sphinxcontrib-bibtex==2.6.1 @@ -162,7 +160,7 @@ sphinxcontrib-htmlhelp==2.0.4 sphinxcontrib-jsmath==1.0.1 sphinxcontrib-qthelp==1.0.6 sphinxcontrib-serializinghtml==1.1.9 -sqlalchemy==2.0.21 +sqlalchemy==2.0.23 stack-data==0.6.3 tabulate==0.9.0 terminado==0.17.1 @@ -170,18 +168,18 @@ tinycss2==1.2.1 tomli==2.0.1 tornado==6.3.3 tox==4.11.3 -traitlets==5.11.2 +traitlets==5.13.0 types-python-dateutil==2.8.19.14 typing-extensions==4.8.0 ujson==5.8.0 uri-template==1.3.0 -urllib3==2.0.6 -virtualenv==20.24.5 -wcwidth==0.2.8 +urllib3==2.0.7 +virtualenv==20.24.6 +wcwidth==0.2.9 webcolors==1.13 webencodings==0.5.1 websocket-client==1.6.4 -wheel==0.41.2 +wheel==0.41.3 widgetsnbextension==4.0.9 zipp==3.17.0 diff --git a/.constraints/py3.11.txt b/.constraints/py3.11.txt index e46a7b85..51b99233 100644 --- a/.constraints/py3.11.txt +++ b/.constraints/py3.11.txt @@ -10,46 +10,45 @@ anyio==4.0.0 argon2-cffi==23.1.0 argon2-cffi-bindings==21.2.0 arrow==1.3.0 -asttokens==2.4.0 +asttokens==2.4.1 async-lru==2.0.4 attrs==23.1.0 -babel==2.13.0 -backcall==0.2.0 +babel==2.13.1 beautifulsoup4==4.12.2 -black==23.9.1 +black==23.11.0 bleach==6.1.0 -cachetools==5.3.1 +cachetools==5.3.2 certifi==2023.7.22 cffi==1.16.0 cfgv==3.4.0 chardet==5.2.0 -charset-normalizer==3.3.0 +charset-normalizer==3.3.2 click==8.1.7 colorama==0.4.6 -comm==0.1.4 -contourpy==1.1.1 +comm==0.2.0 +contourpy==1.2.0 cycler==0.12.1 debugpy==1.8.0 decorator==5.1.1 defusedxml==0.7.1 distlib==0.3.7 -docstring-to-markdown==0.12 +docstring-to-markdown==0.13 docutils==0.17.1 -executing==2.0.0 +executing==2.0.1 fastjsonschema==2.18.1 -filelock==3.12.4 -fonttools==4.43.1 +filelock==3.13.1 +fonttools==4.44.0 fqdn==1.5.1 graphviz==0.20.1 -greenlet==3.0.0 -identify==2.5.30 +greenlet==3.0.1 +identify==2.5.31 idna==3.4 imagesize==1.4.1 importlib-metadata==6.8.0 iniconfig==2.0.0 -ipykernel==6.25.2 +ipykernel==6.26.0 ipympl==0.9.3 -ipython==8.16.1 +ipython==8.17.2 ipython-genutils==0.2.0 ipywidgets==8.1.1 isoduration==20.11.0 @@ -57,30 +56,30 @@ jedi==0.19.1 jinja2==3.1.2 json5==0.9.14 jsonpointer==2.4 -jsonschema==4.19.1 +jsonschema==4.19.2 jsonschema-specifications==2023.7.1 jupyter==1.0.0 jupyter-cache==0.6.1 -jupyter-client==8.3.1 +jupyter-client==8.6.0 jupyter-console==6.6.3 -jupyter-core==5.3.2 -jupyter-events==0.7.0 +jupyter-core==5.5.0 +jupyter-events==0.9.0 jupyter-lsp==2.2.0 -jupyter-server==2.7.3 +jupyter-server==2.10.0 jupyter-server-terminals==0.4.4 -jupyterlab==4.0.6 +jupyterlab==4.0.8 jupyterlab-code-formatter==2.2.1 jupyterlab-lsp==5.0.0 -jupyterlab-myst==2.0.2 +jupyterlab-myst==2.1.0 jupyterlab-pygments==0.2.2 -jupyterlab-server==2.25.0 +jupyterlab-server==2.25.1 jupyterlab-widgets==3.0.9 kiwisolver==1.4.5 latexcodec==2.0.1 livereload==2.6.3 markdown-it-py==2.2.0 markupsafe==2.1.3 -matplotlib==3.8.0 +matplotlib==3.8.1 matplotlib-inline==0.1.6 mdit-py-plugins==0.3.5 mdurl==0.1.2 @@ -90,54 +89,53 @@ mypy-extensions==1.0.0 myst-nb==0.17.2 myst-parser==0.18.1 nbclient==0.6.8 -nbconvert==7.9.2 +nbconvert==7.11.0 nbformat==5.9.2 -nbmake==1.4.5 +nbmake==1.4.6 nest-asyncio==1.5.8 nodeenv==1.8.0 -notebook==7.0.4 +notebook==7.0.6 notebook-shim==0.2.3 -numpy==1.26.0 +numpy==1.26.1 overrides==7.4.0 packaging==23.2 pandocfilters==1.5.0 parso==0.8.3 pathspec==0.11.2 pexpect==4.8.0 -pickleshare==0.7.5 -pillow==10.0.1 +pillow==10.1.0 platformdirs==3.11.0 pluggy==1.3.0 -pre-commit==3.4.0 -prometheus-client==0.17.1 +pre-commit==3.5.0 +prometheus-client==0.18.0 prompt-toolkit==3.0.39 -psutil==5.9.5 +psutil==5.9.6 ptyprocess==0.7.0 pure-eval==0.2.2 pybtex==0.24.0 pybtex-docutils==1.0.3 pycparser==2.21 -pydata-sphinx-theme==0.14.1 +pydata-sphinx-theme==0.14.3 pygments==2.16.1 pyparsing==3.1.1 pyproject-api==1.6.1 -pytest==7.4.2 +pytest==7.4.3 python-dateutil==2.8.2 python-json-logger==2.0.7 python-lsp-jsonrpc==1.1.2 -python-lsp-server==1.8.2 -pytoolconfig==1.2.5 +python-lsp-server==1.9.0 +pytoolconfig==1.2.6 pyyaml==6.0.1 pyzmq==25.1.1 -qtconsole==5.4.4 -qtpy==2.4.0 +qtconsole==5.5.0 +qtpy==2.4.1 referencing==0.30.2 requests==2.31.0 rfc3339-validator==0.1.4 rfc3986-validator==0.1.1 -rope==1.10.0 -rpds-py==0.10.4 -ruff==0.0.292 +rope==1.11.0 +rpds-py==0.12.0 +ruff==0.1.4 send2trash==1.8.2 six==1.16.0 sniffio==1.3.0 @@ -152,7 +150,7 @@ sphinx-copybutton==0.5.2 sphinx-design==0.5.0 sphinx-hep-pdgref==0.2.0 sphinx-remove-toctrees==0.0.3 -sphinx-thebe==0.2.1 +sphinx-thebe==0.3.0 sphinx-togglebutton==0.3.2 sphinxcontrib-applehelp==1.0.7 sphinxcontrib-bibtex==2.6.1 @@ -161,25 +159,25 @@ sphinxcontrib-htmlhelp==2.0.4 sphinxcontrib-jsmath==1.0.1 sphinxcontrib-qthelp==1.0.6 sphinxcontrib-serializinghtml==1.1.9 -sqlalchemy==2.0.21 +sqlalchemy==2.0.23 stack-data==0.6.3 tabulate==0.9.0 terminado==0.17.1 tinycss2==1.2.1 tornado==6.3.3 tox==4.11.3 -traitlets==5.11.2 +traitlets==5.13.0 types-python-dateutil==2.8.19.14 typing-extensions==4.8.0 ujson==5.8.0 uri-template==1.3.0 -urllib3==2.0.6 -virtualenv==20.24.5 -wcwidth==0.2.8 +urllib3==2.0.7 +virtualenv==20.24.6 +wcwidth==0.2.9 webcolors==1.13 webencodings==0.5.1 websocket-client==1.6.4 -wheel==0.41.2 +wheel==0.41.3 widgetsnbextension==4.0.9 zipp==3.17.0 diff --git a/.constraints/py3.7.txt b/.constraints/py3.7.txt index 88318dd4..00b981f9 100644 --- a/.constraints/py3.7.txt +++ b/.constraints/py3.7.txt @@ -13,18 +13,18 @@ argon2-cffi==23.1.0 argon2-cffi-bindings==21.2.0 arrow==1.2.3 attrs==23.1.0 -babel==2.13.0 +babel==2.13.1 backcall==0.2.0 beautifulsoup4==4.12.2 black==23.3.0 bleach==6.0.0 cached-property==1.5.2 -cachetools==5.3.1 +cachetools==5.3.2 certifi==2023.7.22 cffi==1.15.1 cfgv==3.3.1 chardet==5.2.0 -charset-normalizer==3.3.0 +charset-normalizer==3.3.2 click==8.1.7 colorama==0.4.6 comm==0.1.4 @@ -33,7 +33,7 @@ debugpy==1.7.0 decorator==5.1.1 defusedxml==0.7.1 distlib==0.3.7 -docstring-to-markdown==0.12 +docstring-to-markdown==0.13 docutils==0.17.1 entrypoints==0.4 exceptiongroup==1.1.3 @@ -42,7 +42,7 @@ filelock==3.12.2 fonttools==4.38.0 fqdn==1.5.1 graphviz==0.20.1 -greenlet==3.0.0 +greenlet==3.0.1 identify==2.5.24 idna==3.4 imagesize==1.4.1 @@ -115,7 +115,7 @@ pluggy==1.2.0 pre-commit==2.21.0 prometheus-client==0.17.1 prompt-toolkit==3.0.39 -psutil==5.9.5 +psutil==5.9.6 ptyprocess==0.7.0 pybtex==0.24.0 pybtex-docutils==1.0.3 @@ -126,22 +126,22 @@ pygments==2.16.1 pyparsing==3.1.1 pyproject-api==1.5.3 pyrsistent==0.19.3 -pytest==7.4.2 +pytest==7.4.3 python-dateutil==2.8.2 python-json-logger==2.0.7 python-lsp-jsonrpc==1.0.0 python-lsp-server==1.7.4 -pytoolconfig==1.2.5 +pytoolconfig==1.2.6 pytz==2023.3.post1 pyyaml==6.0.1 pyzmq==24.0.1 qtconsole==5.4.4 -qtpy==2.4.0 +qtpy==2.4.1 requests==2.31.0 rfc3339-validator==0.1.4 rfc3986-validator==0.1.1 rope==1.9.0 -ruff==0.0.292 +ruff==0.1.4 send2trash==1.8.2 six==1.16.0 sniffio==1.3.0 @@ -165,7 +165,7 @@ sphinxcontrib-htmlhelp==2.0.0 sphinxcontrib-jsmath==1.0.1 sphinxcontrib-qthelp==1.0.3 sphinxcontrib-serializinghtml==1.1.5 -sqlalchemy==1.4.49 +sqlalchemy==1.4.50 tabulate==0.9.0 terminado==0.17.1 tinycss2==1.2.1 @@ -177,13 +177,13 @@ typed-ast==1.5.5 typing-extensions==4.7.1 ujson==5.7.0 uri-template==1.3.0 -urllib3==2.0.6 -virtualenv==20.24.5 -wcwidth==0.2.8 +urllib3==2.0.7 +virtualenv==20.24.6 +wcwidth==0.2.9 webcolors==1.13 webencodings==0.5.1 websocket-client==1.6.1 -wheel==0.41.2 +wheel==0.41.3 widgetsnbextension==4.0.9 y-py==0.5.9 ypy-websocket==0.8.2 diff --git a/.constraints/py3.8.txt b/.constraints/py3.8.txt index 64b4abb5..18d82d1a 100644 --- a/.constraints/py3.8.txt +++ b/.constraints/py3.8.txt @@ -10,46 +10,46 @@ anyio==4.0.0 argon2-cffi==23.1.0 argon2-cffi-bindings==21.2.0 arrow==1.3.0 -asttokens==2.4.0 +asttokens==2.4.1 async-lru==2.0.4 attrs==23.1.0 -babel==2.13.0 +babel==2.13.1 backcall==0.2.0 beautifulsoup4==4.12.2 -black==23.9.1 +black==23.11.0 bleach==6.1.0 -cachetools==5.3.1 +cachetools==5.3.2 certifi==2023.7.22 cffi==1.16.0 cfgv==3.4.0 chardet==5.2.0 -charset-normalizer==3.3.0 +charset-normalizer==3.3.2 click==8.1.7 colorama==0.4.6 -comm==0.1.4 +comm==0.2.0 contourpy==1.1.1 cycler==0.12.1 debugpy==1.8.0 decorator==5.1.1 defusedxml==0.7.1 distlib==0.3.7 -docstring-to-markdown==0.12 +docstring-to-markdown==0.13 docutils==0.17.1 exceptiongroup==1.1.3 -executing==2.0.0 +executing==2.0.1 fastjsonschema==2.18.1 -filelock==3.12.4 -fonttools==4.43.1 +filelock==3.13.1 +fonttools==4.44.0 fqdn==1.5.1 graphviz==0.20.1 -greenlet==3.0.0 -identify==2.5.30 +greenlet==3.0.1 +identify==2.5.31 idna==3.4 imagesize==1.4.1 importlib-metadata==6.8.0 -importlib-resources==6.1.0 +importlib-resources==6.1.1 iniconfig==2.0.0 -ipykernel==6.25.2 +ipykernel==6.26.0 ipympl==0.9.3 ipython==8.12.3 ipython-genutils==0.2.0 @@ -59,23 +59,23 @@ jedi==0.19.1 jinja2==3.1.2 json5==0.9.14 jsonpointer==2.4 -jsonschema==4.19.1 +jsonschema==4.19.2 jsonschema-specifications==2023.7.1 jupyter==1.0.0 jupyter-cache==0.6.1 -jupyter-client==8.3.1 +jupyter-client==8.6.0 jupyter-console==6.6.3 -jupyter-core==5.3.2 -jupyter-events==0.7.0 +jupyter-core==5.5.0 +jupyter-events==0.9.0 jupyter-lsp==2.2.0 -jupyter-server==2.7.3 +jupyter-server==2.10.0 jupyter-server-terminals==0.4.4 -jupyterlab==4.0.6 +jupyterlab==4.0.8 jupyterlab-code-formatter==2.2.1 jupyterlab-lsp==5.0.0 -jupyterlab-myst==2.0.2 +jupyterlab-myst==2.1.0 jupyterlab-pygments==0.2.2 -jupyterlab-server==2.25.0 +jupyterlab-server==2.25.1 jupyterlab-widgets==3.0.9 kiwisolver==1.4.5 latexcodec==2.0.1 @@ -92,12 +92,12 @@ mypy-extensions==1.0.0 myst-nb==0.17.2 myst-parser==0.18.1 nbclient==0.6.8 -nbconvert==7.9.2 +nbconvert==7.11.0 nbformat==5.9.2 -nbmake==1.4.5 +nbmake==1.4.6 nest-asyncio==1.5.8 nodeenv==1.8.0 -notebook==7.0.4 +notebook==7.0.6 notebook-shim==0.2.3 numpy==1.24.4 overrides==7.4.0 @@ -107,41 +107,41 @@ parso==0.8.3 pathspec==0.11.2 pexpect==4.8.0 pickleshare==0.7.5 -pillow==10.0.1 +pillow==10.1.0 pkgutil-resolve-name==1.3.10 platformdirs==3.11.0 pluggy==1.3.0 -pre-commit==3.4.0 -prometheus-client==0.17.1 +pre-commit==3.5.0 +prometheus-client==0.18.0 prompt-toolkit==3.0.39 -psutil==5.9.5 +psutil==5.9.6 ptyprocess==0.7.0 pure-eval==0.2.2 pybtex==0.24.0 pybtex-docutils==1.0.3 pycparser==2.21 -pydata-sphinx-theme==0.14.1 +pydata-sphinx-theme==0.14.3 pygments==2.16.1 pyparsing==3.1.1 pyproject-api==1.6.1 -pytest==7.4.2 +pytest==7.4.3 python-dateutil==2.8.2 python-json-logger==2.0.7 python-lsp-jsonrpc==1.1.2 -python-lsp-server==1.8.2 -pytoolconfig==1.2.5 +python-lsp-server==1.9.0 +pytoolconfig==1.2.6 pytz==2023.3.post1 pyyaml==6.0.1 pyzmq==25.1.1 -qtconsole==5.4.4 -qtpy==2.4.0 +qtconsole==5.5.0 +qtpy==2.4.1 referencing==0.30.2 requests==2.31.0 rfc3339-validator==0.1.4 rfc3986-validator==0.1.1 -rope==1.10.0 -rpds-py==0.10.4 -ruff==0.0.292 +rope==1.11.0 +rpds-py==0.12.0 +ruff==0.1.4 send2trash==1.8.2 six==1.16.0 sniffio==1.3.0 @@ -156,7 +156,7 @@ sphinx-copybutton==0.5.2 sphinx-design==0.5.0 sphinx-hep-pdgref==0.2.0 sphinx-remove-toctrees==0.0.3 -sphinx-thebe==0.2.1 +sphinx-thebe==0.3.0 sphinx-togglebutton==0.3.2 sphinxcontrib-applehelp==1.0.4 sphinxcontrib-bibtex==2.6.1 @@ -165,7 +165,7 @@ sphinxcontrib-htmlhelp==2.0.1 sphinxcontrib-jsmath==1.0.1 sphinxcontrib-qthelp==1.0.3 sphinxcontrib-serializinghtml==1.1.5 -sqlalchemy==2.0.21 +sqlalchemy==2.0.23 stack-data==0.6.3 tabulate==0.9.0 terminado==0.17.1 @@ -173,18 +173,18 @@ tinycss2==1.2.1 tomli==2.0.1 tornado==6.3.3 tox==4.11.3 -traitlets==5.11.2 +traitlets==5.13.0 types-python-dateutil==2.8.19.14 typing-extensions==4.8.0 ujson==5.8.0 uri-template==1.3.0 -urllib3==2.0.6 -virtualenv==20.24.5 -wcwidth==0.2.8 +urllib3==2.0.7 +virtualenv==20.24.6 +wcwidth==0.2.9 webcolors==1.13 webencodings==0.5.1 websocket-client==1.6.4 -wheel==0.41.2 +wheel==0.41.3 widgetsnbextension==4.0.9 zipp==3.17.0 diff --git a/.constraints/py3.9.txt b/.constraints/py3.9.txt index 8b616965..d6e5bdba 100644 --- a/.constraints/py3.9.txt +++ b/.constraints/py3.9.txt @@ -10,48 +10,47 @@ anyio==4.0.0 argon2-cffi==23.1.0 argon2-cffi-bindings==21.2.0 arrow==1.3.0 -asttokens==2.4.0 +asttokens==2.4.1 async-lru==2.0.4 attrs==23.1.0 -babel==2.13.0 -backcall==0.2.0 +babel==2.13.1 beautifulsoup4==4.12.2 -black==23.9.1 +black==23.11.0 bleach==6.1.0 -cachetools==5.3.1 +cachetools==5.3.2 certifi==2023.7.22 cffi==1.16.0 cfgv==3.4.0 chardet==5.2.0 -charset-normalizer==3.3.0 +charset-normalizer==3.3.2 click==8.1.7 colorama==0.4.6 -comm==0.1.4 -contourpy==1.1.1 +comm==0.2.0 +contourpy==1.2.0 cycler==0.12.1 debugpy==1.8.0 decorator==5.1.1 defusedxml==0.7.1 distlib==0.3.7 -docstring-to-markdown==0.12 +docstring-to-markdown==0.13 docutils==0.17.1 exceptiongroup==1.1.3 -executing==2.0.0 +executing==2.0.1 fastjsonschema==2.18.1 -filelock==3.12.4 -fonttools==4.43.1 +filelock==3.13.1 +fonttools==4.44.0 fqdn==1.5.1 graphviz==0.20.1 -greenlet==3.0.0 -identify==2.5.30 +greenlet==3.0.1 +identify==2.5.31 idna==3.4 imagesize==1.4.1 importlib-metadata==6.8.0 -importlib-resources==6.1.0 +importlib-resources==6.1.1 iniconfig==2.0.0 -ipykernel==6.25.2 +ipykernel==6.26.0 ipympl==0.9.3 -ipython==8.16.1 +ipython==8.17.2 ipython-genutils==0.2.0 ipywidgets==8.1.1 isoduration==20.11.0 @@ -59,30 +58,30 @@ jedi==0.19.1 jinja2==3.1.2 json5==0.9.14 jsonpointer==2.4 -jsonschema==4.19.1 +jsonschema==4.19.2 jsonschema-specifications==2023.7.1 jupyter==1.0.0 jupyter-cache==0.6.1 -jupyter-client==8.3.1 +jupyter-client==8.6.0 jupyter-console==6.6.3 -jupyter-core==5.3.2 -jupyter-events==0.7.0 +jupyter-core==5.5.0 +jupyter-events==0.9.0 jupyter-lsp==2.2.0 -jupyter-server==2.7.3 +jupyter-server==2.10.0 jupyter-server-terminals==0.4.4 -jupyterlab==4.0.6 +jupyterlab==4.0.8 jupyterlab-code-formatter==2.2.1 jupyterlab-lsp==5.0.0 -jupyterlab-myst==2.0.2 +jupyterlab-myst==2.1.0 jupyterlab-pygments==0.2.2 -jupyterlab-server==2.25.0 +jupyterlab-server==2.25.1 jupyterlab-widgets==3.0.9 kiwisolver==1.4.5 latexcodec==2.0.1 livereload==2.6.3 markdown-it-py==2.2.0 markupsafe==2.1.3 -matplotlib==3.8.0 +matplotlib==3.8.1 matplotlib-inline==0.1.6 mdit-py-plugins==0.3.5 mdurl==0.1.2 @@ -92,54 +91,53 @@ mypy-extensions==1.0.0 myst-nb==0.17.2 myst-parser==0.18.1 nbclient==0.6.8 -nbconvert==7.9.2 +nbconvert==7.11.0 nbformat==5.9.2 -nbmake==1.4.5 +nbmake==1.4.6 nest-asyncio==1.5.8 nodeenv==1.8.0 -notebook==7.0.4 +notebook==7.0.6 notebook-shim==0.2.3 -numpy==1.26.0 +numpy==1.26.1 overrides==7.4.0 packaging==23.2 pandocfilters==1.5.0 parso==0.8.3 pathspec==0.11.2 pexpect==4.8.0 -pickleshare==0.7.5 -pillow==10.0.1 +pillow==10.1.0 platformdirs==3.11.0 pluggy==1.3.0 -pre-commit==3.4.0 -prometheus-client==0.17.1 +pre-commit==3.5.0 +prometheus-client==0.18.0 prompt-toolkit==3.0.39 -psutil==5.9.5 +psutil==5.9.6 ptyprocess==0.7.0 pure-eval==0.2.2 pybtex==0.24.0 pybtex-docutils==1.0.3 pycparser==2.21 -pydata-sphinx-theme==0.14.1 +pydata-sphinx-theme==0.14.3 pygments==2.16.1 pyparsing==3.1.1 pyproject-api==1.6.1 -pytest==7.4.2 +pytest==7.4.3 python-dateutil==2.8.2 python-json-logger==2.0.7 python-lsp-jsonrpc==1.1.2 -python-lsp-server==1.8.2 -pytoolconfig==1.2.5 +python-lsp-server==1.9.0 +pytoolconfig==1.2.6 pyyaml==6.0.1 pyzmq==25.1.1 -qtconsole==5.4.4 -qtpy==2.4.0 +qtconsole==5.5.0 +qtpy==2.4.1 referencing==0.30.2 requests==2.31.0 rfc3339-validator==0.1.4 rfc3986-validator==0.1.1 -rope==1.10.0 -rpds-py==0.10.4 -ruff==0.0.292 +rope==1.11.0 +rpds-py==0.12.0 +ruff==0.1.4 send2trash==1.8.2 six==1.16.0 sniffio==1.3.0 @@ -154,7 +152,7 @@ sphinx-copybutton==0.5.2 sphinx-design==0.5.0 sphinx-hep-pdgref==0.2.0 sphinx-remove-toctrees==0.0.3 -sphinx-thebe==0.2.1 +sphinx-thebe==0.3.0 sphinx-togglebutton==0.3.2 sphinxcontrib-applehelp==1.0.7 sphinxcontrib-bibtex==2.6.1 @@ -163,7 +161,7 @@ sphinxcontrib-htmlhelp==2.0.4 sphinxcontrib-jsmath==1.0.1 sphinxcontrib-qthelp==1.0.6 sphinxcontrib-serializinghtml==1.1.9 -sqlalchemy==2.0.21 +sqlalchemy==2.0.23 stack-data==0.6.3 tabulate==0.9.0 terminado==0.17.1 @@ -171,18 +169,18 @@ tinycss2==1.2.1 tomli==2.0.1 tornado==6.3.3 tox==4.11.3 -traitlets==5.11.2 +traitlets==5.13.0 types-python-dateutil==2.8.19.14 typing-extensions==4.8.0 ujson==5.8.0 uri-template==1.3.0 -urllib3==2.0.6 -virtualenv==20.24.5 -wcwidth==0.2.8 +urllib3==2.0.7 +virtualenv==20.24.6 +wcwidth==0.2.9 webcolors==1.13 webencodings==0.5.1 websocket-client==1.6.4 -wheel==0.41.2 +wheel==0.41.3 widgetsnbextension==4.0.9 zipp==3.17.0 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 878c1e0d..cecfe78f 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -38,7 +38,7 @@ repos: )$ - repo: https://github.com/ComPWA/repo-maintenance - rev: 0.1.0 + rev: 0.1.1 hooks: - id: check-dev-files args: @@ -61,8 +61,8 @@ repos: args: - --fix - - repo: https://github.com/psf/black - rev: 23.9.1 + - repo: https://github.com/psf/black-pre-commit-mirror + rev: 23.11.0 hooks: - id: black - id: black-jupyter @@ -75,7 +75,7 @@ repos: - id: blacken-docs - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.27.0 + rev: 0.27.1 hooks: - id: check-jsonschema name: Check CITATION.cff @@ -88,12 +88,12 @@ repos: pass_filenames: false - repo: https://github.com/streetsidesoftware/cspell-cli - rev: v7.3.1 + rev: v8.0.0 hooks: - id: cspell - repo: https://github.com/editorconfig-checker/editorconfig-checker.python - rev: 2.7.2 + rev: 2.7.3 hooks: - id: editorconfig-checker name: editorconfig @@ -144,7 +144,7 @@ repos: - id: prettier - repo: https://github.com/ComPWA/mirrors-pyright - rev: v1.1.330 + rev: v1.1.334 hooks: - id: pyright @@ -156,7 +156,7 @@ repos: - --py37-plus - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.0.292 + rev: v0.1.4 hooks: - id: ruff args: diff --git a/docs/adr/001/sympy.ipynb b/docs/adr/001/sympy.ipynb index 60504ba1..391583cd 100644 --- a/docs/adr/001/sympy.ipynb +++ b/docs/adr/001/sympy.ipynb @@ -123,12 +123,10 @@ "for i in range(1, N_COMPONENTS + 1):\n", " mu = sp.Symbol(Rf\"\\mu_{i}\")\n", " sigma = sp.Symbol(Rf\"\\sigma_{i}\")\n", - " model.initial_values.update(\n", - " {\n", - " mu: float(i),\n", - " sigma: 1 / (2 * i),\n", - " }\n", - " )\n", + " model.initial_values.update({\n", + " mu: float(i),\n", + " sigma: 1 / (2 * i),\n", + " })\n", " gauss = sp.exp(-((x - mu) ** 2) / (sigma**2)) / (sigma * sp.sqrt(2 * sp.pi))\n", " dyn_symbol = sp.Symbol(Rf\"\\mathrm{{dyn}}_{i}\")\n", " model.dynamics[dyn_symbol] = gauss\n", @@ -1115,25 +1113,23 @@ "real0 = tf.constant(0, dtype=tf.float64)\n", "real1 = tf.constant(1, dtype=tf.float64)\n", "intensity_result = tf_intensity(\n", - " np.array(\n", + " np.array([\n", + " [\n", + " tf.complex(real1, real0),\n", + " tf.complex(real0, real0),\n", + " -tf.complex(real0, real1),\n", + " ],\n", + " [\n", + " tf.complex(real0, real0),\n", + " tf.complex(real1, real0),\n", + " tf.complex(real0, real0),\n", + " ],\n", " [\n", - " [\n", - " tf.complex(real1, real0),\n", - " tf.complex(real0, real0),\n", - " -tf.complex(real0, real1),\n", - " ],\n", - " [\n", - " tf.complex(real0, real0),\n", - " tf.complex(real1, real0),\n", - " tf.complex(real0, real0),\n", - " ],\n", - " [\n", - " tf.complex(real0, real1),\n", - " tf.complex(real0, real0),\n", - " tf.complex(real1, real0),\n", - " ],\n", - " ]\n", - " ),\n", + " tf.complex(real0, real1),\n", + " tf.complex(real0, real0),\n", + " tf.complex(real1, real0),\n", + " ],\n", + " ]),\n", ")\n", "intensity_result" ] diff --git a/docs/adr/002/helpers.py b/docs/adr/002/helpers.py index 2819ed97..c8367d99 100644 --- a/docs/adr/002/helpers.py +++ b/docs/adr/002/helpers.py @@ -45,9 +45,7 @@ def blatt_weisskopf( def two_body_momentum_squared( m_d: sp.Symbol, m_a: sp.Symbol, m_b: sp.Symbol ) -> sp.Expr: - return ( - (m_d**2 - (m_a + m_b) ** 2) * (m_d**2 - (m_a - m_b) ** 2) / (4 * m_d**2) - ) + return (m_d**2 - (m_a + m_b) ** 2) * (m_d**2 - (m_a - m_b) ** 2) / (4 * m_d**2) def determine_attached_final_state( diff --git a/docs/conf.py b/docs/conf.py index 195553a9..90d65650 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -118,12 +118,10 @@ def fetch_logo(url: str, output_path: str) -> None: "members": True, "undoc-members": True, "show-inheritance": True, - "special-members": ", ".join( - [ - "__call__", - "__eq__", - ] - ), + "special-members": ", ".join([ + "__call__", + "__eq__", + ]), } codeautolink_concat_default = True codeautolink_global_preface = """ diff --git a/docs/report/004.ipynb b/docs/report/004.ipynb index 1e858b15..8def892e 100644 --- a/docs/report/004.ipynb +++ b/docs/report/004.ipynb @@ -190,12 +190,10 @@ }, "outputs": [], "source": [ - "rho.subs(\n", - " {\n", - " m1: 1,\n", - " m2: 1,\n", - " }\n", - ")" + "rho.subs({\n", + " m1: 1,\n", + " m2: 1,\n", + "})" ] }, { diff --git a/docs/report/005.ipynb b/docs/report/005.ipynb index 5182a9f0..ba306869 100644 --- a/docs/report/005.ipynb +++ b/docs/report/005.ipynb @@ -453,9 +453,9 @@ ], "source": [ "K_symbol = sp.IndexedBase(\"K\", shape=(n_channels, n_channels))\n", - "K = sp.Matrix(\n", - " [[K_symbol[i, j] for j in range(n_channels)] for i in range(n_channels)]\n", - ")\n", + "K = sp.Matrix([\n", + " [K_symbol[i, j] for j in range(n_channels)] for i in range(n_channels)\n", + "])\n", "display(K_symbol[i, j], K)" ] }, @@ -525,13 +525,11 @@ } ], "source": [ - "T_subs = T.subs(\n", - " {\n", - " K[i, j]: Kij(m, M, Gamma, gamma, i, j, n_resonances)\n", - " for i in range(n_channels)\n", - " for j in range(n_channels)\n", - " }\n", - ")\n", + "T_subs = T.subs({\n", + " K[i, j]: Kij(m, M, Gamma, gamma, i, j, n_resonances)\n", + " for i in range(n_channels)\n", + " for j in range(n_channels)\n", + "})\n", "T_subs" ] }, @@ -620,13 +618,11 @@ " K = create_symbol_matrix(\"K\", n_channels)\n", " T = K * (sp.eye(n_channels) - sp.I * K).inv()\n", " # Substitute elements\n", - " return T.subs(\n", - " {\n", - " K[i, j]: Kij(m, M, Gamma, gamma, i, j, n_resonances)\n", - " for i in range(n_channels)\n", - " for j in range(n_channels)\n", - " }\n", - " )" + " return T.subs({\n", + " K[i, j]: Kij(m, M, Gamma, gamma, i, j, n_resonances)\n", + " for i in range(n_channels)\n", + " for j in range(n_channels)\n", + " })" ] }, { @@ -835,21 +831,17 @@ " m0_values = m0_values[1:-1]\n", " for R in range(n_resonances):\n", " for i in range(n_channels):\n", - " sliders.set_ranges(\n", - " {\n", - " \"i\": (0, n_channels - 1),\n", - " f\"m{R}\": (0, 3, 100),\n", - " f\"Gamma{R}\": (-1, 1, 100),\n", - " Rf\"\\gamma_{{{R},{i}}}\": (0, 2, 100),\n", - " }\n", - " )\n", - " sliders.set_values(\n", - " {\n", - " f\"m{R}\": m0_values[R],\n", - " f\"Gamma{R}\": (R + 1) * 0.1,\n", - " Rf\"\\gamma_{{{R},{i}}}\": 1 - 0.1 * R + 0.1 * i,\n", - " }\n", - " )\n", + " sliders.set_ranges({\n", + " \"i\": (0, n_channels - 1),\n", + " f\"m{R}\": (0, 3, 100),\n", + " f\"Gamma{R}\": (-1, 1, 100),\n", + " Rf\"\\gamma_{{{R},{i}}}\": (0, 2, 100),\n", + " })\n", + " sliders.set_values({\n", + " f\"m{R}\": m0_values[R],\n", + " f\"Gamma{R}\": (R + 1) * 0.1,\n", + " Rf\"\\gamma_{{{R},{i}}}\": 1 - 0.1 * R + 0.1 * i,\n", + " })\n", "\n", " # Create interactive plots\n", " controls = Controls(**sliders)\n", diff --git a/docs/report/008.ipynb b/docs/report/008.ipynb index e6d49e4c..12218e0b 100644 --- a/docs/report/008.ipynb +++ b/docs/report/008.ipynb @@ -243,13 +243,9 @@ "outputs": [], "source": [ "def replace_indexed_symbols(expression: sp.Expr) -> sp.Expr:\n", - " return expression.subs(\n", - " {\n", - " s: to_symbol(s)\n", - " for s in expression.free_symbols\n", - " if isinstance(s, sp.Indexed)\n", - " }\n", - " )" + " return expression.subs({\n", + " s: to_symbol(s) for s in expression.free_symbols if isinstance(s, sp.Indexed)\n", + " })" ] }, { diff --git a/docs/report/009.ipynb b/docs/report/009.ipynb index 068c0184..3a0afd67 100644 --- a/docs/report/009.ipynb +++ b/docs/report/009.ipynb @@ -490,22 +490,20 @@ " T_hat = K * (sp.eye(n_channels) - sp.I * rho * K).inv()\n", " T = sqrt_rho_dagger * T_hat * sqrt_rho\n", " # Substitute elements\n", - " return T.subs(\n", - " {\n", - " K[i, j]: Kij_relativistic(\n", - " m=m,\n", - " M=M,\n", - " Gamma=Gamma,\n", - " gamma=gamma,\n", - " i=i,\n", - " j=j,\n", - " n_resonances=n_resonances,\n", - " angular_momentum=angular_momentum,\n", - " )\n", - " for i in range(n_channels)\n", - " for j in range(n_channels)\n", - " }\n", - " )\n", + " return T.subs({\n", + " K[i, j]: Kij_relativistic(\n", + " m=m,\n", + " M=M,\n", + " Gamma=Gamma,\n", + " gamma=gamma,\n", + " i=i,\n", + " j=j,\n", + " n_resonances=n_resonances,\n", + " angular_momentum=angular_momentum,\n", + " )\n", + " for i in range(n_channels)\n", + " for j in range(n_channels)\n", + " })\n", "\n", "\n", "def create_symbol_matrix(name: str, n: int) -> sp.Matrix:\n", @@ -733,26 +731,22 @@ " sliders.set_ranges(L=(0, 8))\n", " for R in range(n_resonances):\n", " for i in range(n_channels):\n", - " sliders.set_ranges(\n", - " {\n", - " \"i\": (0, n_channels - 1),\n", - " \"epsilon\": (y_min * 0.2, y_max * 0.2, 0.01),\n", - " f\"m{R}\": (0, 3, 100),\n", - " Rf\"\\Gamma_{{{R},{i}}}\": (-2, +2, 100),\n", - " Rf\"\\gamma_{{{R},{i}}}\": (0, 10, 100),\n", - " f\"m_a{i}\": (0, 1, 0.01),\n", - " f\"m_b{i}\": (0, 1, 0.01),\n", - " }\n", - " )\n", - " sliders.set_values(\n", - " {\n", - " f\"m{R}\": m0_values[R],\n", - " Rf\"\\Gamma_{{{R},{i}}}\": 2.0 * (0.4 + R * 0.2 - i * 0.3),\n", - " Rf\"\\gamma_{{{R},{i}}}\": 0.25 * (10 - R + i),\n", - " f\"m_a{i}\": (i + 1) * 0.25,\n", - " f\"m_b{i}\": (i + 1) * 0.25,\n", - " }\n", - " )\n", + " sliders.set_ranges({\n", + " \"i\": (0, n_channels - 1),\n", + " \"epsilon\": (y_min * 0.2, y_max * 0.2, 0.01),\n", + " f\"m{R}\": (0, 3, 100),\n", + " Rf\"\\Gamma_{{{R},{i}}}\": (-2, +2, 100),\n", + " Rf\"\\gamma_{{{R},{i}}}\": (0, 10, 100),\n", + " f\"m_a{i}\": (0, 1, 0.01),\n", + " f\"m_b{i}\": (0, 1, 0.01),\n", + " })\n", + " sliders.set_values({\n", + " f\"m{R}\": m0_values[R],\n", + " Rf\"\\Gamma_{{{R},{i}}}\": 2.0 * (0.4 + R * 0.2 - i * 0.3),\n", + " Rf\"\\gamma_{{{R},{i}}}\": 0.25 * (10 - R + i),\n", + " f\"m_a{i}\": (i + 1) * 0.25,\n", + " f\"m_b{i}\": (i + 1) * 0.25,\n", + " })\n", "\n", " # Create interactive plots\n", " controls = Controls(**sliders)\n", diff --git a/docs/report/010.ipynb b/docs/report/010.ipynb index dde486bb..2b679a11 100644 --- a/docs/report/010.ipynb +++ b/docs/report/010.ipynb @@ -366,42 +366,38 @@ " K = create_symbol_matrix(\"K\", n_channels, n_channels)\n", " F = (sp.eye(n_channels) - sp.I * K * rho).inv() * P\n", " # Substitute elements\n", - " return F.subs(\n", - " {\n", - " K[i, j]: Kij_relativistic(\n", - " m=m,\n", - " M=M,\n", - " Gamma=Gamma,\n", - " gamma=gamma,\n", - " m_a=m_a,\n", - " m_b=m_b,\n", - " i=i,\n", - " j=j,\n", - " R=R,\n", - " n_resonances=n_resonances,\n", - " angular_momentum=angular_momentum,\n", - " )\n", - " for i in range(n_channels)\n", - " for j in range(n_channels)\n", - " }\n", - " ).subs(\n", - " {\n", - " P[i]: Pi_relativistic(\n", - " m=m,\n", - " M=M,\n", - " Gamma=Gamma,\n", - " gamma=gamma,\n", - " beta=beta,\n", - " i=i,\n", - " m_a=m_a,\n", - " m_b=m_b,\n", - " R=R,\n", - " n_resonances=n_resonances,\n", - " angular_momentum=angular_momentum,\n", - " )\n", - " for i in range(n_channels)\n", - " }\n", - " )\n", + " return F.subs({\n", + " K[i, j]: Kij_relativistic(\n", + " m=m,\n", + " M=M,\n", + " Gamma=Gamma,\n", + " gamma=gamma,\n", + " m_a=m_a,\n", + " m_b=m_b,\n", + " i=i,\n", + " j=j,\n", + " R=R,\n", + " n_resonances=n_resonances,\n", + " angular_momentum=angular_momentum,\n", + " )\n", + " for i in range(n_channels)\n", + " for j in range(n_channels)\n", + " }).subs({\n", + " P[i]: Pi_relativistic(\n", + " m=m,\n", + " M=M,\n", + " Gamma=Gamma,\n", + " gamma=gamma,\n", + " beta=beta,\n", + " i=i,\n", + " m_a=m_a,\n", + " m_b=m_b,\n", + " R=R,\n", + " n_resonances=n_resonances,\n", + " angular_momentum=angular_momentum,\n", + " )\n", + " for i in range(n_channels)\n", + " })\n", "\n", "\n", "def create_symbol_matrix(name: str, m: int, n: int) -> sp.Matrix:\n", @@ -509,26 +505,22 @@ " )\n", " for R in range(n_resonances):\n", " for i in range(n_channels):\n", - " sliders.set_ranges(\n", - " {\n", - " f\"m{R}\": (0, 3, 100),\n", - " f\"beta{R}\": (0, 5, 0.1),\n", - " Rf\"\\Gamma_{{{R},{i}}}\": (-5, +5, 100),\n", - " Rf\"\\gamma_{{{R},{i}}}\": (0, 20, 100),\n", - " f\"m_a{i}\": (0, 1, 0.01),\n", - " f\"m_b{i}\": (0, 1, 0.01),\n", - " }\n", - " )\n", - " sliders.set_values(\n", - " {\n", - " f\"m{R}\": m0_values[R],\n", - " f\"beta{R}\": 1,\n", - " Rf\"\\Gamma_{{{R},{i}}}\": 3 * (0.4 + R * 0.2 - i * 0.3),\n", - " Rf\"\\gamma_{{{R},{i}}}\": 0.2 * (10 - R + i),\n", - " f\"m_a{i}\": (i + 1) * 0.25,\n", - " f\"m_b{i}\": (i + 1) * 0.25,\n", - " }\n", - " )\n", + " sliders.set_ranges({\n", + " f\"m{R}\": (0, 3, 100),\n", + " f\"beta{R}\": (0, 5, 0.1),\n", + " Rf\"\\Gamma_{{{R},{i}}}\": (-5, +5, 100),\n", + " Rf\"\\gamma_{{{R},{i}}}\": (0, 20, 100),\n", + " f\"m_a{i}\": (0, 1, 0.01),\n", + " f\"m_b{i}\": (0, 1, 0.01),\n", + " })\n", + " sliders.set_values({\n", + " f\"m{R}\": m0_values[R],\n", + " f\"beta{R}\": 1,\n", + " Rf\"\\Gamma_{{{R},{i}}}\": 3 * (0.4 + R * 0.2 - i * 0.3),\n", + " Rf\"\\gamma_{{{R},{i}}}\": 0.2 * (10 - R + i),\n", + " f\"m_a{i}\": (i + 1) * 0.25,\n", + " f\"m_b{i}\": (i + 1) * 0.25,\n", + " })\n", "\n", " set_default_values()\n", "\n", diff --git a/docs/report/011.ipynb b/docs/report/011.ipynb index 8166c2fe..e04a5c60 100644 --- a/docs/report/011.ipynb +++ b/docs/report/011.ipynb @@ -208,38 +208,28 @@ }, "outputs": [], "source": [ - "events = EventCollection(\n", - " {\n", - " 0: np.array( # pi0\n", - " [\n", - " (1.35527, 0.514208, -0.184219, 1.23296),\n", - " (0.841933, 0.0727385, -0.0528868, 0.826163),\n", - " (0.550927, -0.162529, 0.29976, -0.411133),\n", - " ]\n", - " ),\n", - " 1: np.array( # gamma\n", - " [\n", - " (0.755744, -0.305812, 0.284, -0.630057),\n", - " (1.02861, 0.784483, 0.614347, -0.255334),\n", - " (0.356875, -0.20767, 0.272796, 0.0990739),\n", - " ]\n", - " ),\n", - " 2: np.array( # pi0\n", - " [\n", - " (0.208274, -0.061663, -0.0211864, 0.144596),\n", - " (0.461193, -0.243319, -0.283044, -0.234866),\n", - " (1.03294, 0.82872, -0.0465425, -0.599834),\n", - " ]\n", - " ),\n", - " 3: np.array( # pi0\n", - " [\n", - " (0.777613, -0.146733, -0.0785946, -0.747499),\n", - " (0.765168, -0.613903, -0.278416, -0.335962),\n", - " (1.15616, -0.458522, -0.526014, 0.911894),\n", - " ]\n", - " ),\n", - " }\n", - ")" + "events = EventCollection({\n", + " 0: np.array([ # pi0\n", + " (1.35527, 0.514208, -0.184219, 1.23296),\n", + " (0.841933, 0.0727385, -0.0528868, 0.826163),\n", + " (0.550927, -0.162529, 0.29976, -0.411133),\n", + " ]),\n", + " 1: np.array([ # gamma\n", + " (0.755744, -0.305812, 0.284, -0.630057),\n", + " (1.02861, 0.784483, 0.614347, -0.255334),\n", + " (0.356875, -0.20767, 0.272796, 0.0990739),\n", + " ]),\n", + " 2: np.array([ # pi0\n", + " (0.208274, -0.061663, -0.0211864, 0.144596),\n", + " (0.461193, -0.243319, -0.283044, -0.234866),\n", + " (1.03294, 0.82872, -0.0465425, -0.599834),\n", + " ]),\n", + " 3: np.array([ # pi0\n", + " (0.777613, -0.146733, -0.0785946, -0.747499),\n", + " (0.765168, -0.613903, -0.278416, -0.335962),\n", + " (1.15616, -0.458522, -0.526014, 0.911894),\n", + " ]),\n", + "})" ] }, { @@ -314,14 +304,12 @@ "\n", " def as_explicit(self) -> sp.Expr:\n", " gamma = 1 / sp.sqrt(1 - beta**2)\n", - " return sp.Matrix(\n", - " [\n", - " [gamma, 0, 0, -gamma * beta],\n", - " [0, 1, 0, 0],\n", - " [0, 0, 1, 0],\n", - " [-gamma * beta, 0, 0, gamma],\n", - " ]\n", - " )\n", + " return sp.Matrix([\n", + " [gamma, 0, 0, -gamma * beta],\n", + " [0, 1, 0, 0],\n", + " [0, 0, 1, 0],\n", + " [-gamma * beta, 0, 0, gamma],\n", + " ])\n", "\n", " def _latex(self, printer, *args) -> str:\n", " beta, *_ = self.args\n", @@ -343,14 +331,12 @@ "\n", " def as_explicit(self) -> sp.Expr:\n", " angle = self.args[0]\n", - " return sp.Matrix(\n", - " [\n", - " [1, 0, 0, 0],\n", - " [0, sp.cos(angle), 0, sp.sin(angle)],\n", - " [0, 0, 1, 0],\n", - " [0, -sp.sin(angle), 0, sp.cos(angle)],\n", - " ]\n", - " )\n", + " return sp.Matrix([\n", + " [1, 0, 0, 0],\n", + " [0, sp.cos(angle), 0, sp.sin(angle)],\n", + " [0, 0, 1, 0],\n", + " [0, -sp.sin(angle), 0, sp.cos(angle)],\n", + " ])\n", "\n", " def _latex(self, printer, *args) -> str:\n", " angle, *_ = self.args\n", @@ -377,14 +363,12 @@ "\n", " def as_explicit(self) -> sp.Expr:\n", " angle = self.args[0]\n", - " return sp.Matrix(\n", - " [\n", - " [1, 0, 0, 0],\n", - " [0, sp.cos(angle), -sp.sin(angle), 0],\n", - " [0, sp.sin(angle), sp.cos(angle), 0],\n", - " [0, 0, 0, 1],\n", - " ]\n", - " )\n", + " return sp.Matrix([\n", + " [1, 0, 0, 0],\n", + " [0, sp.cos(angle), -sp.sin(angle), 0],\n", + " [0, sp.sin(angle), sp.cos(angle), 0],\n", + " [0, 0, 0, 1],\n", + " ])\n", "\n", " def _latex(self, printer, *args) -> str:\n", " angle, *_ = self.args\n", diff --git a/docs/report/014.ipynb b/docs/report/014.ipynb index 2aa44086..854fd6df 100644 --- a/docs/report/014.ipynb +++ b/docs/report/014.ipynb @@ -645,12 +645,10 @@ ], "source": [ "wigner_functions = {\n", - " sp.Mul(\n", - " *[\n", - " formulate_wigner_d(transition, node_id)\n", - " for node_id in transition.topology.nodes\n", - " ]\n", - " )\n", + " sp.Mul(*[\n", + " formulate_wigner_d(transition, node_id)\n", + " for node_id in transition.topology.nodes\n", + " ])\n", " for transition in reaction.transitions\n", "}\n", "display(*wigner_functions)" @@ -777,12 +775,10 @@ "source": [ "def formulate_intensity(reaction: ReactionInfo):\n", " wigner_functions = {\n", - " sp.Mul(\n", - " *[\n", - " formulate_wigner_d(transition, node_id)\n", - " for node_id in transition.topology.nodes\n", - " ]\n", - " )\n", + " sp.Mul(*[\n", + " formulate_wigner_d(transition, node_id)\n", + " for node_id in transition.topology.nodes\n", + " ])\n", " for transition in reaction.transitions\n", " }\n", " inner_helicities = get_helicities(reaction, which=\"inner\")\n", @@ -850,16 +846,12 @@ ")\n", "assert len(reaction_two_resonances.transition_groups) == 2\n", "dot = qrules.io.asdot(reaction, collapse_graphs=True)\n", - "display(\n", - " *[\n", - " graphviz.Source(\n", - " qrules.io.asdot(\n", - " g, collapse_graphs=True, size=4, render_resonance_id=True\n", - " )\n", - " )\n", - " for g in reaction_two_resonances.transition_groups\n", - " ]\n", - ")" + "display(*[\n", + " graphviz.Source(\n", + " qrules.io.asdot(g, collapse_graphs=True, size=4, render_resonance_id=True)\n", + " )\n", + " for g in reaction_two_resonances.transition_groups\n", + "])" ] }, { diff --git a/docs/report/015.ipynb b/docs/report/015.ipynb index b27fe832..424124bb 100644 --- a/docs/report/015.ipynb +++ b/docs/report/015.ipynb @@ -1405,33 +1405,27 @@ "import numpy as np\n", "\n", "phsp = {\n", - " \"p0\": np.array(\n", - " [\n", - " [0.63140486, 0.13166435, -0.35734744, 0.07760603],\n", - " [0.65169531, 0.37242432, 0.12027178, 0.15467675],\n", - " [0.60647425, -0.22286205, -0.175258, 0.19952806],\n", - " [0.72744323, 0.05529811, 0.30502402, -0.43064999],\n", - " [0.76778868, -0.43557036, 0.35491651, -0.16185017],\n", - " ]\n", - " ),\n", - " \"p1\": np.array(\n", - " [\n", - " [1.37017117, 0.173769668, 0.355893315, -0.553093198],\n", - " [1.34556663, -5.272033e-04, -0.3074542, -0.54901747],\n", - " [1.41660182, 0.634007973, -0.0457976658, -0.433700564],\n", - " [1.38592340, 0.138369075, -0.258624859, 0.648189682],\n", - " [1.37858847, 0.551405385, -0.338705615, 0.259105737],\n", - " ]\n", - " ),\n", - " \"p2\": np.array(\n", - " [\n", - " [1.09532397, -0.30543402, 0.00145413, 0.47548716],\n", - " [1.09963805, -0.37189712, 0.18718247, 0.39434072],\n", - " [1.07382393, -0.41114592, 0.22105567, 0.2341725],\n", - " [0.98353336, -0.19366719, -0.04639917, -0.21753969],\n", - " [0.95052285, -0.11583502, -0.01621089, -0.09725557],\n", - " ]\n", - " ),\n", + " \"p0\": np.array([\n", + " [0.63140486, 0.13166435, -0.35734744, 0.07760603],\n", + " [0.65169531, 0.37242432, 0.12027178, 0.15467675],\n", + " [0.60647425, -0.22286205, -0.175258, 0.19952806],\n", + " [0.72744323, 0.05529811, 0.30502402, -0.43064999],\n", + " [0.76778868, -0.43557036, 0.35491651, -0.16185017],\n", + " ]),\n", + " \"p1\": np.array([\n", + " [1.37017117, 0.173769668, 0.355893315, -0.553093198],\n", + " [1.34556663, -5.272033e-04, -0.3074542, -0.54901747],\n", + " [1.41660182, 0.634007973, -0.0457976658, -0.433700564],\n", + " [1.38592340, 0.138369075, -0.258624859, 0.648189682],\n", + " [1.37858847, 0.551405385, -0.338705615, 0.259105737],\n", + " ]),\n", + " \"p2\": np.array([\n", + " [1.09532397, -0.30543402, 0.00145413, 0.47548716],\n", + " [1.09963805, -0.37189712, 0.18718247, 0.39434072],\n", + " [1.07382393, -0.41114592, 0.22105567, 0.2341725],\n", + " [0.98353336, -0.19366719, -0.04639917, -0.21753969],\n", + " [0.95052285, -0.11583502, -0.01621089, -0.09725557],\n", + " ]),\n", "}" ] }, diff --git a/docs/report/020.ipynb b/docs/report/020.ipynb index b4b83772..abfc24bb 100644 --- a/docs/report/020.ipynb +++ b/docs/report/020.ipynb @@ -922,9 +922,9 @@ " # this here is rather to take full control, it is always possible\n", "\n", " # updating the parameters of the model. This seems not very TF compatible?\n", - " self.intensity.update_parameters(\n", - " {p.name: float(p) for p in self.params.values()}\n", - " )\n", + " self.intensity.update_parameters({\n", + " p.name: float(p) for p in self.params.values()\n", + " })\n", "\n", " # converting the data to a dict for tensorwaves\n", " data = {ob: jnp.asarray(ar) for ob, ar in zip(self.obs, z.unstack_x(x))}\n", diff --git a/docs/report/021.ipynb b/docs/report/021.ipynb index de0db534..f20494d8 100644 --- a/docs/report/021.ipynb +++ b/docs/report/021.ipynb @@ -640,9 +640,9 @@ " 1: 1 / (1 + z**2),\n", " 2: 1 / (9 + 3 * z**2 + z**4),\n", " }\n", - " return sp.Piecewise(\n", - " *[(sp.sqrt(expr), sp.Eq(L, l_val)) for l_val, expr in cases.items()]\n", - " )\n", + " return sp.Piecewise(*[\n", + " (sp.sqrt(expr), sp.Eq(L, l_val)) for l_val, expr in cases.items()\n", + " ])\n", "\n", " def _latex(self, printer, *args):\n", " z, L = map(printer._print, self.args)\n", @@ -1002,55 +1002,49 @@ "\n", "def formulate_K_amplitude(λ_Λc, λ_p, resonances: list[Resonance]):\n", " τ = sp.Symbol(\"tau\", rational=True)\n", - " return sp.Add(\n", - " *[\n", - " PoolSum(\n", - " sp.KroneckerDelta(λ_Λc, τ - λ_p)\n", - " * H_prod[stringify(res), τ, λ_p]\n", - " * formulate_dynamics(res, σ1, m2, m3)\n", - " * (-1) ** (half - λ_p)\n", - " * Wigner.d(sp.Rational(res.particle.spin), τ, 0, θ23)\n", - " * H_dec[stringify(res), 0, 0],\n", - " (τ, create_spin_range(res.particle.spin)),\n", - " )\n", - " for res in resonances\n", - " ]\n", - " )\n", + " return sp.Add(*[\n", + " PoolSum(\n", + " sp.KroneckerDelta(λ_Λc, τ - λ_p)\n", + " * H_prod[stringify(res), τ, λ_p]\n", + " * formulate_dynamics(res, σ1, m2, m3)\n", + " * (-1) ** (half - λ_p)\n", + " * Wigner.d(sp.Rational(res.particle.spin), τ, 0, θ23)\n", + " * H_dec[stringify(res), 0, 0],\n", + " (τ, create_spin_range(res.particle.spin)),\n", + " )\n", + " for res in resonances\n", + " ])\n", "\n", "\n", "def formulate_Λ_amplitude(λ_Λc, λ_p, resonances: list[Resonance]):\n", " τ = sp.Symbol(\"tau\", rational=True)\n", - " return sp.Add(\n", - " *[\n", - " PoolSum(\n", - " sp.KroneckerDelta(λ_Λc, τ)\n", - " * H_prod[stringify(res), τ, 0]\n", - " * formulate_dynamics(res, σ2, m1, m3)\n", - " * Wigner.d(sp.Rational(res.particle.spin), τ, -λ_p, θ31)\n", - " * H_dec[stringify(res), 0, λ_p]\n", - " * (-1) ** (half - λ_p),\n", - " (τ, create_spin_range(res.particle.spin)),\n", - " )\n", - " for res in resonances\n", - " ]\n", - " )\n", + " return sp.Add(*[\n", + " PoolSum(\n", + " sp.KroneckerDelta(λ_Λc, τ)\n", + " * H_prod[stringify(res), τ, 0]\n", + " * formulate_dynamics(res, σ2, m1, m3)\n", + " * Wigner.d(sp.Rational(res.particle.spin), τ, -λ_p, θ31)\n", + " * H_dec[stringify(res), 0, λ_p]\n", + " * (-1) ** (half - λ_p),\n", + " (τ, create_spin_range(res.particle.spin)),\n", + " )\n", + " for res in resonances\n", + " ])\n", "\n", "\n", "def formulate_Δ_amplitude(λ_Λc, λ_p, resonances: list[Resonance]):\n", " τ = sp.Symbol(\"tau\", rational=True)\n", - " return sp.Add(\n", - " *[\n", - " PoolSum(\n", - " sp.KroneckerDelta(λ_Λc, τ)\n", - " * H_prod[stringify(res), τ, 0]\n", - " * formulate_dynamics(res, σ3, m1, m2)\n", - " * Wigner.d(sp.Rational(res.particle.spin), τ, λ_p, θ12)\n", - " * H_dec[stringify(res), λ_p, 0],\n", - " (τ, create_spin_range(res.particle.spin)),\n", - " )\n", - " for res in resonances\n", - " ]\n", - " )\n", + " return sp.Add(*[\n", + " PoolSum(\n", + " sp.KroneckerDelta(λ_Λc, τ)\n", + " * H_prod[stringify(res), τ, 0]\n", + " * formulate_dynamics(res, σ3, m1, m2)\n", + " * Wigner.d(sp.Rational(res.particle.spin), τ, λ_p, θ12)\n", + " * H_dec[stringify(res), λ_p, 0],\n", + " (τ, create_spin_range(res.particle.spin)),\n", + " )\n", + " for res in resonances\n", + " ])\n", "\n", "\n", "def formulate_dynamics(decay: Resonance, s, m1, m2):\n", @@ -1143,34 +1137,16 @@ "m0 = sp.Symbol(R\"m_{\\Lambda_c}\", nonnegative=True)\n", "angles = {\n", " θ12: sp.acos(\n", - " (\n", - " 2 * σ3 * (σ2 - m3**2 - m1**2)\n", - " - (σ3 + m1**2 - m2**2) * (m0**2 - σ3 - m3**2)\n", - " )\n", - " / (\n", - " sp.sqrt(Källén(m0**2, m3**2, σ3))\n", - " * sp.sqrt(Källén(σ3, m1**2, m2**2))\n", - " )\n", + " (2 * σ3 * (σ2 - m3**2 - m1**2) - (σ3 + m1**2 - m2**2) * (m0**2 - σ3 - m3**2))\n", + " / (sp.sqrt(Källén(m0**2, m3**2, σ3)) * sp.sqrt(Källén(σ3, m1**2, m2**2)))\n", " ),\n", " θ23: sp.acos(\n", - " (\n", - " 2 * σ1 * (σ3 - m1**2 - m2**2)\n", - " - (σ1 + m2**2 - m3**2) * (m0**2 - σ1 - m1**2)\n", - " )\n", - " / (\n", - " sp.sqrt(Källén(m0**2, m1**2, σ1))\n", - " * sp.sqrt(Källén(σ1, m2**2, m3**2))\n", - " )\n", + " (2 * σ1 * (σ3 - m1**2 - m2**2) - (σ1 + m2**2 - m3**2) * (m0**2 - σ1 - m1**2))\n", + " / (sp.sqrt(Källén(m0**2, m1**2, σ1)) * sp.sqrt(Källén(σ1, m2**2, m3**2)))\n", " ),\n", " θ31: sp.acos(\n", - " (\n", - " 2 * σ2 * (σ1 - m2**2 - m3**2)\n", - " - (σ2 + m3**2 - m1**2) * (m0**2 - σ2 - m2**2)\n", - " )\n", - " / (\n", - " sp.sqrt(Källén(m0**2, m2**2, σ2))\n", - " * sp.sqrt(Källén(σ2, m3**2, m1**2))\n", - " )\n", + " (2 * σ2 * (σ1 - m2**2 - m3**2) - (σ2 + m3**2 - m1**2) * (m0**2 - σ2 - m2**2))\n", + " / (sp.sqrt(Källén(m0**2, m2**2, σ2)) * sp.sqrt(Källén(σ2, m3**2, m1**2)))\n", " ),\n", " ζ_0_11: sp.S.Zero, # = \\hat\\theta^0_{1(1)}\n", " ζ_0_21: -sp.acos( # = -\\hat\\theta^{1(2)}\n", @@ -1178,20 +1154,14 @@ " (m0**2 + m1**2 - σ1) * (m0**2 + m2**2 - σ2)\n", " - 2 * m0**2 * (σ3 - m1**2 - m2**2)\n", " )\n", - " / (\n", - " sp.sqrt(Källén(m0**2, m2**2, σ2))\n", - " * sp.sqrt(Källén(m0**2, σ1, m1**2))\n", - " )\n", + " / (sp.sqrt(Källén(m0**2, m2**2, σ2)) * sp.sqrt(Källén(m0**2, σ1, m1**2)))\n", " ),\n", " ζ_0_31: sp.acos( # = \\hat\\theta^{3(1)}\n", " (\n", " (m0**2 + m3**2 - σ3) * (m0**2 + m1**2 - σ1)\n", " - 2 * m0**2 * (σ2 - m3**2 - m1**2)\n", " )\n", - " / (\n", - " sp.sqrt(Källén(m0**2, m1**2, σ1))\n", - " * sp.sqrt(Källén(m0**2, σ3, m3**2))\n", - " )\n", + " / (sp.sqrt(Källén(m0**2, m1**2, σ1)) * sp.sqrt(Källén(m0**2, σ3, m3**2)))\n", " ),\n", " ζ_1_11: sp.S.Zero,\n", " ζ_1_21: sp.acos(\n", @@ -1199,20 +1169,14 @@ " 2 * m1**2 * (σ3 - m0**2 - m3**2)\n", " + (m0**2 + m1**2 - σ1) * (σ2 - m1**2 - m3**2)\n", " )\n", - " / (\n", - " sp.sqrt(Källén(m0**2, m1**2, σ1))\n", - " * sp.sqrt(Källén(σ2, m1**2, m3**2))\n", - " )\n", + " / (sp.sqrt(Källén(m0**2, m1**2, σ1)) * sp.sqrt(Källén(σ2, m1**2, m3**2)))\n", " ),\n", " ζ_1_31: -sp.acos( # = -\\zeta^1_{1(3)}\n", " (\n", " 2 * m1**2 * (σ2 - m0**2 - m2**2)\n", " + (m0**2 + m1**2 - σ1) * (σ3 - m1**2 - m2**2)\n", " )\n", - " / (\n", - " sp.sqrt(Källén(m0**2, m1**2, σ1))\n", - " * sp.sqrt(Källén(σ3, m1**2, m2**2))\n", - " )\n", + " / (sp.sqrt(Källén(m0**2, m1**2, σ1)) * sp.sqrt(Källén(σ3, m1**2, m2**2)))\n", " ),\n", "}\n", "\n", diff --git a/docs/report/022.ipynb b/docs/report/022.ipynb index 6bcc4fed..9c67f73d 100644 --- a/docs/report/022.ipynb +++ b/docs/report/022.ipynb @@ -423,9 +423,9 @@ } ], "source": [ - "B_arrays = jnp.array(\n", - " [[B_funcs[τ, ρ](GRID_SAMPLE) for ρ in range(4)] for τ in range(4)]\n", - ")\n", + "B_arrays = jnp.array([\n", + " [B_funcs[τ, ρ](GRID_SAMPLE) for ρ in range(4)] for τ in range(4)\n", + "])\n", "B_norm = B_arrays / B_arrays[0, 0]\n", "B_arrays.shape" ]