From e989995d0e10177259acce7783b854e90209e64e Mon Sep 17 00:00:00 2001 From: GitHub Date: Sun, 7 Jan 2024 03:16:44 +0000 Subject: [PATCH 01/24] MAINT: update pip constraints and pre-commit --- .constraints/py3.10.txt | 114 ++++++++++++++++++++-------------------- .constraints/py3.11.txt | 112 +++++++++++++++++++-------------------- .constraints/py3.12.txt | 112 +++++++++++++++++++-------------------- .constraints/py3.8.txt | 106 ++++++++++++++++++------------------- .constraints/py3.9.txt | 114 ++++++++++++++++++++-------------------- .pre-commit-config.yaml | 8 +-- 6 files changed, 283 insertions(+), 283 deletions(-) diff --git a/.constraints/py3.10.txt b/.constraints/py3.10.txt index 9973cf5..d9af1e7 100644 --- a/.constraints/py3.10.txt +++ b/.constraints/py3.10.txt @@ -6,79 +6,79 @@ # accessible-pygments==0.0.4 alabaster==0.7.13 -anyio==4.0.0 +anyio==4.2.0 argon2-cffi==23.1.0 argon2-cffi-bindings==21.2.0 arrow==1.3.0 asttokens==2.4.1 async-lru==2.0.4 -attrs==23.1.0 -babel==2.13.1 +attrs==23.2.0 +babel==2.14.0 beautifulsoup4==4.12.2 -black==23.11.0 +black==23.12.1 bleach==6.1.0 cachetools==5.3.2 -certifi==2023.7.22 +certifi==2023.11.17 cffi==1.16.0 cfgv==3.4.0 chardet==5.2.0 charset-normalizer==3.3.2 click==8.1.7 colorama==0.4.6 -comm==0.2.0 +comm==0.2.1 contourpy==1.2.0 cycler==0.12.1 debugpy==1.8.0 decorator==5.1.1 defusedxml==0.7.1 -distlib==0.3.7 +distlib==0.3.8 docstring-to-markdown==0.13 docutils==0.19 -exceptiongroup==1.1.3 +exceptiongroup==1.2.0 executing==2.0.1 -fastjsonschema==2.18.1 +fastjsonschema==2.19.1 filelock==3.13.1 flake8==6.1.0 -fonttools==4.44.0 +fonttools==4.47.0 fqdn==1.5.1 -greenlet==3.0.1 -identify==2.5.31 -idna==3.4 +greenlet==3.0.3 +identify==2.5.33 +idna==3.6 imagesize==1.4.1 -importlib-metadata==6.8.0 +importlib-metadata==7.0.1 iniconfig==2.0.0 -ipykernel==6.26.0 +ipykernel==6.28.0 ipympl==0.9.3 -ipython==8.17.2 +ipython==8.19.0 ipython-genutils==0.2.0 ipywidgets==8.1.1 isoduration==20.11.0 -isort==5.12.0 +isort==5.13.2 jedi==0.19.1 jinja2==3.1.2 json5==0.9.14 jsonpointer==2.4 -jsonschema==4.19.2 -jsonschema-specifications==2023.7.1 +jsonschema==4.20.0 +jsonschema-specifications==2023.12.1 jupyter-cache==1.0.0 jupyter-client==8.6.0 -jupyter-core==5.5.0 +jupyter-core==5.7.0 jupyter-events==0.9.0 -jupyter-lsp==2.2.0 -jupyter-server==2.10.0 -jupyter-server-terminals==0.4.4 -jupyterlab==4.0.8 +jupyter-lsp==2.2.1 +jupyter-server==2.12.2 +jupyter-server-terminals==0.5.1 +jupyterlab==4.0.10 jupyterlab-code-formatter==2.2.1 -jupyterlab-lsp==5.0.0 +jupyterlab-lsp==5.0.1 jupyterlab-myst==2.1.0 -jupyterlab-pygments==0.2.2 -jupyterlab-server==2.25.1 +jupyterlab-pygments==0.3.0 +jupyterlab-server==2.25.2 jupyterlab-widgets==3.0.9 kiwisolver==1.4.5 livereload==2.6.3 markdown-it-py==2.2.0 markupsafe==2.1.3 -matplotlib==3.8.1 +matplotlib==3.8.2 matplotlib-inline==0.1.6 mccabe==0.7.0 mdit-py-plugins==0.3.5 @@ -88,49 +88,49 @@ mypy-extensions==1.0.0 myst-nb==1.0.0 myst-parser==1.0.0 nbclient==0.6.8 -nbconvert==7.11.0 +nbconvert==7.14.0 nbformat==5.9.2 nbmake==1.4.6 nest-asyncio==1.5.8 nodeenv==1.8.0 notebook-shim==0.2.3 -numpy==1.26.1 +numpy==1.26.3 overrides==7.4.0 packaging==23.2 pandocfilters==1.5.0 parso==0.8.3 -pathspec==0.11.2 -pexpect==4.8.0 -pillow==10.1.0 -platformdirs==3.11.0 +pathspec==0.12.1 +pexpect==4.9.0 +pillow==10.2.0 +platformdirs==4.1.0 pluggy==1.3.0 -pre-commit==3.5.0 -prometheus-client==0.18.0 -prompt-toolkit==3.0.40 -psutil==5.9.6 +pre-commit==3.6.0 +prometheus-client==0.19.0 +prompt-toolkit==3.0.43 +psutil==5.9.7 ptyprocess==0.7.0 pure-eval==0.2.2 pycodestyle==2.11.1 pycparser==2.21 -pydata-sphinx-theme==0.14.3 +pydata-sphinx-theme==0.15.1 pyflakes==3.1.0 -pygments==2.16.1 +pygments==2.17.2 pyparsing==3.1.1 pyproject-api==1.6.1 -pytest==7.4.3 +pytest==7.4.4 python-dateutil==2.8.2 python-json-logger==2.0.7 python-lsp-jsonrpc==1.1.2 python-lsp-server==1.9.0 pytoolconfig==1.2.6 pyyaml==6.0.1 -pyzmq==25.1.1 -referencing==0.30.2 +pyzmq==25.1.2 +referencing==0.32.1 requests==2.31.0 rfc3339-validator==0.1.4 rfc3986-validator==0.1.1 rope==1.11.0 -rpds-py==0.12.0 +rpds-py==0.16.2 send2trash==1.8.2 six==1.16.0 sniffio==1.3.0 @@ -138,7 +138,7 @@ snowballstemmer==2.2.0 soupsieve==2.5 sphinx==5.3.0 sphinx-autobuild==2021.3.14 -sphinx-book-theme==1.0.1 +sphinx-book-theme==1.1.0 sphinx-comments==0.0.3 sphinx-copybutton==0.5.2 sphinx-design==0.5.0 @@ -150,26 +150,26 @@ sphinxcontrib-htmlhelp==2.0.4 sphinxcontrib-jsmath==1.0.1 sphinxcontrib-qthelp==1.0.6 sphinxcontrib-serializinghtml==1.1.9 -sqlalchemy==2.0.23 +sqlalchemy==2.0.25 stack-data==0.6.3 tabulate==0.9.0 terminado==0.18.0 tinycss2==1.2.1 tomli==2.0.1 -tornado==6.3.3 -tox==4.11.3 -traitlets==5.13.0 -types-python-dateutil==2.8.19.14 -typing-extensions==4.8.0 -ujson==5.8.0 +tornado==6.4 +tox==4.11.4 +traitlets==5.14.1 +types-python-dateutil==2.8.19.20240106 +typing-extensions==4.9.0 +ujson==5.9.0 uri-template==1.3.0 -urllib3==2.0.7 -virtualenv==20.24.6 -wcwidth==0.2.9 +urllib3==2.1.0 +virtualenv==20.25.0 +wcwidth==0.2.13 webcolors==1.13 webencodings==0.5.1 -websocket-client==1.6.4 -wheel==0.41.3 +websocket-client==1.7.0 +wheel==0.42.0 widgetsnbextension==4.0.9 zipp==3.17.0 diff --git a/.constraints/py3.11.txt b/.constraints/py3.11.txt index 2f4d853..cd82187 100644 --- a/.constraints/py3.11.txt +++ b/.constraints/py3.11.txt @@ -6,78 +6,78 @@ # accessible-pygments==0.0.4 alabaster==0.7.13 -anyio==4.0.0 +anyio==4.2.0 argon2-cffi==23.1.0 argon2-cffi-bindings==21.2.0 arrow==1.3.0 asttokens==2.4.1 async-lru==2.0.4 -attrs==23.1.0 -babel==2.13.1 +attrs==23.2.0 +babel==2.14.0 beautifulsoup4==4.12.2 -black==23.11.0 +black==23.12.1 bleach==6.1.0 cachetools==5.3.2 -certifi==2023.7.22 +certifi==2023.11.17 cffi==1.16.0 cfgv==3.4.0 chardet==5.2.0 charset-normalizer==3.3.2 click==8.1.7 colorama==0.4.6 -comm==0.2.0 +comm==0.2.1 contourpy==1.2.0 cycler==0.12.1 debugpy==1.8.0 decorator==5.1.1 defusedxml==0.7.1 -distlib==0.3.7 +distlib==0.3.8 docstring-to-markdown==0.13 docutils==0.19 executing==2.0.1 -fastjsonschema==2.18.1 +fastjsonschema==2.19.1 filelock==3.13.1 flake8==6.1.0 -fonttools==4.44.0 +fonttools==4.47.0 fqdn==1.5.1 -greenlet==3.0.1 -identify==2.5.31 -idna==3.4 +greenlet==3.0.3 +identify==2.5.33 +idna==3.6 imagesize==1.4.1 -importlib-metadata==6.8.0 +importlib-metadata==7.0.1 iniconfig==2.0.0 -ipykernel==6.26.0 +ipykernel==6.28.0 ipympl==0.9.3 -ipython==8.17.2 +ipython==8.19.0 ipython-genutils==0.2.0 ipywidgets==8.1.1 isoduration==20.11.0 -isort==5.12.0 +isort==5.13.2 jedi==0.19.1 jinja2==3.1.2 json5==0.9.14 jsonpointer==2.4 -jsonschema==4.19.2 -jsonschema-specifications==2023.7.1 +jsonschema==4.20.0 +jsonschema-specifications==2023.12.1 jupyter-cache==1.0.0 jupyter-client==8.6.0 -jupyter-core==5.5.0 +jupyter-core==5.7.0 jupyter-events==0.9.0 -jupyter-lsp==2.2.0 -jupyter-server==2.10.0 -jupyter-server-terminals==0.4.4 -jupyterlab==4.0.8 +jupyter-lsp==2.2.1 +jupyter-server==2.12.2 +jupyter-server-terminals==0.5.1 +jupyterlab==4.0.10 jupyterlab-code-formatter==2.2.1 -jupyterlab-lsp==5.0.0 +jupyterlab-lsp==5.0.1 jupyterlab-myst==2.1.0 -jupyterlab-pygments==0.2.2 -jupyterlab-server==2.25.1 +jupyterlab-pygments==0.3.0 +jupyterlab-server==2.25.2 jupyterlab-widgets==3.0.9 kiwisolver==1.4.5 livereload==2.6.3 markdown-it-py==2.2.0 markupsafe==2.1.3 -matplotlib==3.8.1 +matplotlib==3.8.2 matplotlib-inline==0.1.6 mccabe==0.7.0 mdit-py-plugins==0.3.5 @@ -87,49 +87,49 @@ mypy-extensions==1.0.0 myst-nb==1.0.0 myst-parser==1.0.0 nbclient==0.6.8 -nbconvert==7.11.0 +nbconvert==7.14.0 nbformat==5.9.2 nbmake==1.4.6 nest-asyncio==1.5.8 nodeenv==1.8.0 notebook-shim==0.2.3 -numpy==1.26.1 +numpy==1.26.3 overrides==7.4.0 packaging==23.2 pandocfilters==1.5.0 parso==0.8.3 -pathspec==0.11.2 -pexpect==4.8.0 -pillow==10.1.0 -platformdirs==3.11.0 +pathspec==0.12.1 +pexpect==4.9.0 +pillow==10.2.0 +platformdirs==4.1.0 pluggy==1.3.0 -pre-commit==3.5.0 -prometheus-client==0.18.0 -prompt-toolkit==3.0.40 -psutil==5.9.6 +pre-commit==3.6.0 +prometheus-client==0.19.0 +prompt-toolkit==3.0.43 +psutil==5.9.7 ptyprocess==0.7.0 pure-eval==0.2.2 pycodestyle==2.11.1 pycparser==2.21 -pydata-sphinx-theme==0.14.3 +pydata-sphinx-theme==0.15.1 pyflakes==3.1.0 -pygments==2.16.1 +pygments==2.17.2 pyparsing==3.1.1 pyproject-api==1.6.1 -pytest==7.4.3 +pytest==7.4.4 python-dateutil==2.8.2 python-json-logger==2.0.7 python-lsp-jsonrpc==1.1.2 python-lsp-server==1.9.0 pytoolconfig==1.2.6 pyyaml==6.0.1 -pyzmq==25.1.1 -referencing==0.30.2 +pyzmq==25.1.2 +referencing==0.32.1 requests==2.31.0 rfc3339-validator==0.1.4 rfc3986-validator==0.1.1 rope==1.11.0 -rpds-py==0.12.0 +rpds-py==0.16.2 send2trash==1.8.2 six==1.16.0 sniffio==1.3.0 @@ -137,7 +137,7 @@ snowballstemmer==2.2.0 soupsieve==2.5 sphinx==5.3.0 sphinx-autobuild==2021.3.14 -sphinx-book-theme==1.0.1 +sphinx-book-theme==1.1.0 sphinx-comments==0.0.3 sphinx-copybutton==0.5.2 sphinx-design==0.5.0 @@ -149,25 +149,25 @@ sphinxcontrib-htmlhelp==2.0.4 sphinxcontrib-jsmath==1.0.1 sphinxcontrib-qthelp==1.0.6 sphinxcontrib-serializinghtml==1.1.9 -sqlalchemy==2.0.23 +sqlalchemy==2.0.25 stack-data==0.6.3 tabulate==0.9.0 terminado==0.18.0 tinycss2==1.2.1 -tornado==6.3.3 -tox==4.11.3 -traitlets==5.13.0 -types-python-dateutil==2.8.19.14 -typing-extensions==4.8.0 -ujson==5.8.0 +tornado==6.4 +tox==4.11.4 +traitlets==5.14.1 +types-python-dateutil==2.8.19.20240106 +typing-extensions==4.9.0 +ujson==5.9.0 uri-template==1.3.0 -urllib3==2.0.7 -virtualenv==20.24.6 -wcwidth==0.2.9 +urllib3==2.1.0 +virtualenv==20.25.0 +wcwidth==0.2.13 webcolors==1.13 webencodings==0.5.1 -websocket-client==1.6.4 -wheel==0.41.3 +websocket-client==1.7.0 +wheel==0.42.0 widgetsnbextension==4.0.9 zipp==3.17.0 diff --git a/.constraints/py3.12.txt b/.constraints/py3.12.txt index ffda5f5..686abfa 100644 --- a/.constraints/py3.12.txt +++ b/.constraints/py3.12.txt @@ -6,78 +6,78 @@ # accessible-pygments==0.0.4 alabaster==0.7.13 -anyio==4.0.0 +anyio==4.2.0 argon2-cffi==23.1.0 argon2-cffi-bindings==21.2.0 arrow==1.3.0 asttokens==2.4.1 async-lru==2.0.4 -attrs==23.1.0 -babel==2.13.1 +attrs==23.2.0 +babel==2.14.0 beautifulsoup4==4.12.2 -black==23.11.0 +black==23.12.1 bleach==6.1.0 cachetools==5.3.2 -certifi==2023.7.22 +certifi==2023.11.17 cffi==1.16.0 cfgv==3.4.0 chardet==5.2.0 charset-normalizer==3.3.2 click==8.1.7 colorama==0.4.6 -comm==0.2.0 +comm==0.2.1 contourpy==1.2.0 cycler==0.12.1 debugpy==1.8.0 decorator==5.1.1 defusedxml==0.7.1 -distlib==0.3.7 +distlib==0.3.8 docstring-to-markdown==0.13 docutils==0.19 executing==2.0.1 -fastjsonschema==2.18.1 +fastjsonschema==2.19.1 filelock==3.13.1 flake8==6.1.0 -fonttools==4.44.0 +fonttools==4.47.0 fqdn==1.5.1 -greenlet==3.0.1 -identify==2.5.31 -idna==3.4 +greenlet==3.0.3 +identify==2.5.33 +idna==3.6 imagesize==1.4.1 -importlib-metadata==6.8.0 +importlib-metadata==7.0.1 iniconfig==2.0.0 -ipykernel==6.26.0 +ipykernel==6.28.0 ipympl==0.9.3 -ipython==8.17.2 +ipython==8.19.0 ipython-genutils==0.2.0 ipywidgets==8.1.1 isoduration==20.11.0 -isort==5.12.0 +isort==5.13.2 jedi==0.19.1 jinja2==3.1.2 json5==0.9.14 jsonpointer==2.4 -jsonschema==4.19.2 -jsonschema-specifications==2023.7.1 +jsonschema==4.20.0 +jsonschema-specifications==2023.12.1 jupyter-cache==1.0.0 jupyter-client==8.6.0 -jupyter-core==5.5.0 +jupyter-core==5.7.0 jupyter-events==0.9.0 -jupyter-lsp==2.2.0 -jupyter-server==2.10.0 -jupyter-server-terminals==0.4.4 -jupyterlab==4.0.8 +jupyter-lsp==2.2.1 +jupyter-server==2.12.2 +jupyter-server-terminals==0.5.1 +jupyterlab==4.0.10 jupyterlab-code-formatter==2.2.1 -jupyterlab-lsp==5.0.0 +jupyterlab-lsp==5.0.1 jupyterlab-myst==2.1.0 -jupyterlab-pygments==0.2.2 -jupyterlab-server==2.25.1 +jupyterlab-pygments==0.3.0 +jupyterlab-server==2.25.2 jupyterlab-widgets==3.0.9 kiwisolver==1.4.5 livereload==2.6.3 markdown-it-py==2.2.0 markupsafe==2.1.3 -matplotlib==3.8.1 +matplotlib==3.8.2 matplotlib-inline==0.1.6 mccabe==0.7.0 mdit-py-plugins==0.3.5 @@ -87,49 +87,49 @@ mypy-extensions==1.0.0 myst-nb==1.0.0 myst-parser==1.0.0 nbclient==0.6.8 -nbconvert==7.11.0 +nbconvert==7.14.0 nbformat==5.9.2 nbmake==1.4.6 nest-asyncio==1.5.8 nodeenv==1.8.0 notebook-shim==0.2.3 -numpy==1.26.1 +numpy==1.26.3 overrides==7.4.0 packaging==23.2 pandocfilters==1.5.0 parso==0.8.3 -pathspec==0.11.2 -pexpect==4.8.0 -pillow==10.1.0 -platformdirs==3.11.0 +pathspec==0.12.1 +pexpect==4.9.0 +pillow==10.2.0 +platformdirs==4.1.0 pluggy==1.3.0 -pre-commit==3.5.0 -prometheus-client==0.18.0 -prompt-toolkit==3.0.40 -psutil==5.9.6 +pre-commit==3.6.0 +prometheus-client==0.19.0 +prompt-toolkit==3.0.43 +psutil==5.9.7 ptyprocess==0.7.0 pure-eval==0.2.2 pycodestyle==2.11.1 pycparser==2.21 -pydata-sphinx-theme==0.14.3 +pydata-sphinx-theme==0.15.1 pyflakes==3.1.0 -pygments==2.16.1 +pygments==2.17.2 pyparsing==3.1.1 pyproject-api==1.6.1 -pytest==7.4.3 +pytest==7.4.4 python-dateutil==2.8.2 python-json-logger==2.0.7 python-lsp-jsonrpc==1.1.2 python-lsp-server==1.9.0 pytoolconfig==1.2.6 pyyaml==6.0.1 -pyzmq==25.1.1 -referencing==0.30.2 +pyzmq==25.1.2 +referencing==0.32.1 requests==2.31.0 rfc3339-validator==0.1.4 rfc3986-validator==0.1.1 rope==1.11.0 -rpds-py==0.12.0 +rpds-py==0.16.2 send2trash==1.8.2 six==1.16.0 sniffio==1.3.0 @@ -137,7 +137,7 @@ snowballstemmer==2.2.0 soupsieve==2.5 sphinx==5.3.0 sphinx-autobuild==2021.3.14 -sphinx-book-theme==1.0.1 +sphinx-book-theme==1.1.0 sphinx-comments==0.0.3 sphinx-copybutton==0.5.2 sphinx-design==0.5.0 @@ -149,25 +149,25 @@ sphinxcontrib-htmlhelp==2.0.4 sphinxcontrib-jsmath==1.0.1 sphinxcontrib-qthelp==1.0.6 sphinxcontrib-serializinghtml==1.1.9 -sqlalchemy==2.0.23 +sqlalchemy==2.0.25 stack-data==0.6.3 tabulate==0.9.0 terminado==0.18.0 tinycss2==1.2.1 -tornado==6.3.3 -tox==4.11.3 -traitlets==5.13.0 -types-python-dateutil==2.8.19.14 -typing-extensions==4.8.0 -ujson==5.8.0 +tornado==6.4 +tox==4.11.4 +traitlets==5.14.1 +types-python-dateutil==2.8.19.20240106 +typing-extensions==4.9.0 +ujson==5.9.0 uri-template==1.3.0 -urllib3==2.0.7 -virtualenv==20.24.6 -wcwidth==0.2.9 +urllib3==2.1.0 +virtualenv==20.25.0 +wcwidth==0.2.13 webcolors==1.13 webencodings==0.5.1 -websocket-client==1.6.4 -wheel==0.41.3 +websocket-client==1.7.0 +wheel==0.42.0 widgetsnbextension==4.0.9 zipp==3.17.0 diff --git a/.constraints/py3.8.txt b/.constraints/py3.8.txt index 7b11082..62942fc 100644 --- a/.constraints/py3.8.txt +++ b/.constraints/py3.8.txt @@ -6,81 +6,81 @@ # accessible-pygments==0.0.4 alabaster==0.7.13 -anyio==4.0.0 +anyio==4.2.0 argon2-cffi==23.1.0 argon2-cffi-bindings==21.2.0 arrow==1.3.0 asttokens==2.4.1 async-lru==2.0.4 -attrs==23.1.0 -babel==2.13.1 +attrs==23.2.0 +babel==2.14.0 backcall==0.2.0 beautifulsoup4==4.12.2 -black==23.11.0 +black==23.12.1 bleach==6.1.0 cachetools==5.3.2 -certifi==2023.7.22 +certifi==2023.11.17 cffi==1.16.0 cfgv==3.4.0 chardet==5.2.0 charset-normalizer==3.3.2 click==8.1.7 colorama==0.4.6 -comm==0.2.0 +comm==0.2.1 contourpy==1.1.1 cycler==0.12.1 debugpy==1.8.0 decorator==5.1.1 defusedxml==0.7.1 -distlib==0.3.7 +distlib==0.3.8 docstring-to-markdown==0.13 docutils==0.19 -exceptiongroup==1.1.3 +exceptiongroup==1.2.0 executing==2.0.1 -fastjsonschema==2.18.1 +fastjsonschema==2.19.1 filelock==3.13.1 flake8==6.1.0 -fonttools==4.44.0 +fonttools==4.47.0 fqdn==1.5.1 -greenlet==3.0.1 -identify==2.5.31 -idna==3.4 +greenlet==3.0.3 +identify==2.5.33 +idna==3.6 imagesize==1.4.1 -importlib-metadata==6.8.0 +importlib-metadata==7.0.1 importlib-resources==6.1.1 iniconfig==2.0.0 -ipykernel==6.26.0 +ipykernel==6.28.0 ipympl==0.9.3 ipython==8.12.3 ipython-genutils==0.2.0 ipywidgets==8.1.1 isoduration==20.11.0 -isort==5.12.0 +isort==5.13.2 jedi==0.19.1 jinja2==3.1.2 json5==0.9.14 jsonpointer==2.4 -jsonschema==4.19.2 -jsonschema-specifications==2023.7.1 +jsonschema==4.20.0 +jsonschema-specifications==2023.12.1 jupyter-cache==0.6.1 jupyter-client==8.6.0 -jupyter-core==5.5.0 +jupyter-core==5.7.0 jupyter-events==0.9.0 -jupyter-lsp==2.2.0 -jupyter-server==2.10.0 -jupyter-server-terminals==0.4.4 -jupyterlab==4.0.8 +jupyter-lsp==2.2.1 +jupyter-server==2.12.2 +jupyter-server-terminals==0.5.1 +jupyterlab==4.0.10 jupyterlab-code-formatter==2.2.1 -jupyterlab-lsp==5.0.0 +jupyterlab-lsp==5.0.1 jupyterlab-myst==2.1.0 -jupyterlab-pygments==0.2.2 -jupyterlab-server==2.25.1 +jupyterlab-pygments==0.3.0 +jupyterlab-server==2.25.2 jupyterlab-widgets==3.0.9 kiwisolver==1.4.5 livereload==2.6.3 markdown-it-py==2.2.0 markupsafe==2.1.3 -matplotlib==3.7.3 +matplotlib==3.7.4 matplotlib-inline==0.1.6 mccabe==0.7.0 mdit-py-plugins==0.3.5 @@ -90,7 +90,7 @@ mypy-extensions==1.0.0 myst-nb==0.17.2 myst-parser==0.18.1 nbclient==0.6.8 -nbconvert==7.11.0 +nbconvert==7.14.0 nbformat==5.9.2 nbmake==1.4.6 nest-asyncio==1.5.8 @@ -101,27 +101,27 @@ overrides==7.4.0 packaging==23.2 pandocfilters==1.5.0 parso==0.8.3 -pathspec==0.11.2 -pexpect==4.8.0 +pathspec==0.12.1 +pexpect==4.9.0 pickleshare==0.7.5 -pillow==10.1.0 +pillow==10.2.0 pkgutil-resolve-name==1.3.10 -platformdirs==3.11.0 +platformdirs==4.1.0 pluggy==1.3.0 pre-commit==3.5.0 -prometheus-client==0.18.0 -prompt-toolkit==3.0.40 -psutil==5.9.6 +prometheus-client==0.19.0 +prompt-toolkit==3.0.43 +psutil==5.9.7 ptyprocess==0.7.0 pure-eval==0.2.2 pycodestyle==2.11.1 pycparser==2.21 -pydata-sphinx-theme==0.14.3 +pydata-sphinx-theme==0.14.4 pyflakes==3.1.0 -pygments==2.16.1 +pygments==2.17.2 pyparsing==3.1.1 pyproject-api==1.6.1 -pytest==7.4.3 +pytest==7.4.4 python-dateutil==2.8.2 python-json-logger==2.0.7 python-lsp-jsonrpc==1.1.2 @@ -129,13 +129,13 @@ python-lsp-server==1.9.0 pytoolconfig==1.2.6 pytz==2023.3.post1 pyyaml==6.0.1 -pyzmq==25.1.1 -referencing==0.30.2 +pyzmq==25.1.2 +referencing==0.32.1 requests==2.31.0 rfc3339-validator==0.1.4 rfc3986-validator==0.1.1 rope==1.11.0 -rpds-py==0.12.0 +rpds-py==0.16.2 send2trash==1.8.2 six==1.16.0 sniffio==1.3.0 @@ -155,26 +155,26 @@ sphinxcontrib-htmlhelp==2.0.1 sphinxcontrib-jsmath==1.0.1 sphinxcontrib-qthelp==1.0.3 sphinxcontrib-serializinghtml==1.1.5 -sqlalchemy==2.0.23 +sqlalchemy==2.0.25 stack-data==0.6.3 tabulate==0.9.0 terminado==0.18.0 tinycss2==1.2.1 tomli==2.0.1 -tornado==6.3.3 -tox==4.11.3 -traitlets==5.13.0 -types-python-dateutil==2.8.19.14 -typing-extensions==4.8.0 -ujson==5.8.0 +tornado==6.4 +tox==4.11.4 +traitlets==5.14.1 +types-python-dateutil==2.8.19.20240106 +typing-extensions==4.9.0 +ujson==5.9.0 uri-template==1.3.0 -urllib3==2.0.7 -virtualenv==20.24.6 -wcwidth==0.2.9 +urllib3==2.1.0 +virtualenv==20.25.0 +wcwidth==0.2.13 webcolors==1.13 webencodings==0.5.1 -websocket-client==1.6.4 -wheel==0.41.3 +websocket-client==1.7.0 +wheel==0.42.0 widgetsnbextension==4.0.9 zipp==3.17.0 diff --git a/.constraints/py3.9.txt b/.constraints/py3.9.txt index 612fad6..4d79c6e 100644 --- a/.constraints/py3.9.txt +++ b/.constraints/py3.9.txt @@ -6,80 +6,80 @@ # accessible-pygments==0.0.4 alabaster==0.7.13 -anyio==4.0.0 +anyio==4.2.0 argon2-cffi==23.1.0 argon2-cffi-bindings==21.2.0 arrow==1.3.0 asttokens==2.4.1 async-lru==2.0.4 -attrs==23.1.0 -babel==2.13.1 +attrs==23.2.0 +babel==2.14.0 beautifulsoup4==4.12.2 -black==23.11.0 +black==23.12.1 bleach==6.1.0 cachetools==5.3.2 -certifi==2023.7.22 +certifi==2023.11.17 cffi==1.16.0 cfgv==3.4.0 chardet==5.2.0 charset-normalizer==3.3.2 click==8.1.7 colorama==0.4.6 -comm==0.2.0 +comm==0.2.1 contourpy==1.2.0 cycler==0.12.1 debugpy==1.8.0 decorator==5.1.1 defusedxml==0.7.1 -distlib==0.3.7 +distlib==0.3.8 docstring-to-markdown==0.13 docutils==0.19 -exceptiongroup==1.1.3 +exceptiongroup==1.2.0 executing==2.0.1 -fastjsonschema==2.18.1 +fastjsonschema==2.19.1 filelock==3.13.1 flake8==6.1.0 -fonttools==4.44.0 +fonttools==4.47.0 fqdn==1.5.1 -greenlet==3.0.1 -identify==2.5.31 -idna==3.4 +greenlet==3.0.3 +identify==2.5.33 +idna==3.6 imagesize==1.4.1 -importlib-metadata==6.8.0 +importlib-metadata==7.0.1 importlib-resources==6.1.1 iniconfig==2.0.0 -ipykernel==6.26.0 +ipykernel==6.28.0 ipympl==0.9.3 -ipython==8.17.2 +ipython==8.18.1 ipython-genutils==0.2.0 ipywidgets==8.1.1 isoduration==20.11.0 -isort==5.12.0 +isort==5.13.2 jedi==0.19.1 jinja2==3.1.2 json5==0.9.14 jsonpointer==2.4 -jsonschema==4.19.2 -jsonschema-specifications==2023.7.1 +jsonschema==4.20.0 +jsonschema-specifications==2023.12.1 jupyter-cache==1.0.0 jupyter-client==8.6.0 -jupyter-core==5.5.0 +jupyter-core==5.7.0 jupyter-events==0.9.0 -jupyter-lsp==2.2.0 -jupyter-server==2.10.0 -jupyter-server-terminals==0.4.4 -jupyterlab==4.0.8 +jupyter-lsp==2.2.1 +jupyter-server==2.12.2 +jupyter-server-terminals==0.5.1 +jupyterlab==4.0.10 jupyterlab-code-formatter==2.2.1 -jupyterlab-lsp==5.0.0 +jupyterlab-lsp==5.0.1 jupyterlab-myst==2.1.0 -jupyterlab-pygments==0.2.2 -jupyterlab-server==2.25.1 +jupyterlab-pygments==0.3.0 +jupyterlab-server==2.25.2 jupyterlab-widgets==3.0.9 kiwisolver==1.4.5 livereload==2.6.3 markdown-it-py==2.2.0 markupsafe==2.1.3 -matplotlib==3.8.1 +matplotlib==3.8.2 matplotlib-inline==0.1.6 mccabe==0.7.0 mdit-py-plugins==0.3.5 @@ -89,49 +89,49 @@ mypy-extensions==1.0.0 myst-nb==1.0.0 myst-parser==1.0.0 nbclient==0.6.8 -nbconvert==7.11.0 +nbconvert==7.14.0 nbformat==5.9.2 nbmake==1.4.6 nest-asyncio==1.5.8 nodeenv==1.8.0 notebook-shim==0.2.3 -numpy==1.26.1 +numpy==1.26.3 overrides==7.4.0 packaging==23.2 pandocfilters==1.5.0 parso==0.8.3 -pathspec==0.11.2 -pexpect==4.8.0 -pillow==10.1.0 -platformdirs==3.11.0 +pathspec==0.12.1 +pexpect==4.9.0 +pillow==10.2.0 +platformdirs==4.1.0 pluggy==1.3.0 -pre-commit==3.5.0 -prometheus-client==0.18.0 -prompt-toolkit==3.0.40 -psutil==5.9.6 +pre-commit==3.6.0 +prometheus-client==0.19.0 +prompt-toolkit==3.0.43 +psutil==5.9.7 ptyprocess==0.7.0 pure-eval==0.2.2 pycodestyle==2.11.1 pycparser==2.21 -pydata-sphinx-theme==0.14.3 +pydata-sphinx-theme==0.15.1 pyflakes==3.1.0 -pygments==2.16.1 +pygments==2.17.2 pyparsing==3.1.1 pyproject-api==1.6.1 -pytest==7.4.3 +pytest==7.4.4 python-dateutil==2.8.2 python-json-logger==2.0.7 python-lsp-jsonrpc==1.1.2 python-lsp-server==1.9.0 pytoolconfig==1.2.6 pyyaml==6.0.1 -pyzmq==25.1.1 -referencing==0.30.2 +pyzmq==25.1.2 +referencing==0.32.1 requests==2.31.0 rfc3339-validator==0.1.4 rfc3986-validator==0.1.1 rope==1.11.0 -rpds-py==0.12.0 +rpds-py==0.16.2 send2trash==1.8.2 six==1.16.0 sniffio==1.3.0 @@ -139,7 +139,7 @@ snowballstemmer==2.2.0 soupsieve==2.5 sphinx==5.3.0 sphinx-autobuild==2021.3.14 -sphinx-book-theme==1.0.1 +sphinx-book-theme==1.1.0 sphinx-comments==0.0.3 sphinx-copybutton==0.5.2 sphinx-design==0.5.0 @@ -151,26 +151,26 @@ sphinxcontrib-htmlhelp==2.0.4 sphinxcontrib-jsmath==1.0.1 sphinxcontrib-qthelp==1.0.6 sphinxcontrib-serializinghtml==1.1.9 -sqlalchemy==2.0.23 +sqlalchemy==2.0.25 stack-data==0.6.3 tabulate==0.9.0 terminado==0.18.0 tinycss2==1.2.1 tomli==2.0.1 -tornado==6.3.3 -tox==4.11.3 -traitlets==5.13.0 -types-python-dateutil==2.8.19.14 -typing-extensions==4.8.0 -ujson==5.8.0 +tornado==6.4 +tox==4.11.4 +traitlets==5.14.1 +types-python-dateutil==2.8.19.20240106 +typing-extensions==4.9.0 +ujson==5.9.0 uri-template==1.3.0 -urllib3==2.0.7 -virtualenv==20.24.6 -wcwidth==0.2.9 +urllib3==2.1.0 +virtualenv==20.25.0 +wcwidth==0.2.13 webcolors==1.13 webencodings==0.5.1 -websocket-client==1.6.4 -wheel==0.41.3 +websocket-client==1.7.0 +wheel==0.42.0 widgetsnbextension==4.0.9 zipp==3.17.0 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 230142f..f54f1a4 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -22,7 +22,7 @@ repos: - id: trailing-whitespace - repo: https://github.com/ComPWA/repo-maintenance - rev: 0.1.2 + rev: 0.1.11 hooks: - id: check-dev-files args: @@ -38,7 +38,7 @@ repos: - id: colab-toc-visible - repo: https://github.com/nbQA-dev/nbQA - rev: 1.7.0 + rev: 1.7.1 hooks: - id: nbqa-flake8 - id: nbqa-isort @@ -46,7 +46,7 @@ repos: args: [--py38-plus] - repo: https://github.com/psf/black-pre-commit-mirror - rev: 23.11.0 + rev: 23.12.1 hooks: - id: black-jupyter args: [--line-length=85] @@ -85,7 +85,7 @@ repos: metadata.vscode - repo: https://github.com/pre-commit/mirrors-prettier - rev: v3.0.3 + rev: v4.0.0-alpha.8 hooks: - id: prettier From f51b3e07c06d93c000205ae28c585ff8f929deb2 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Sun, 7 Jan 2024 03:17:11 +0000 Subject: [PATCH 02/24] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- .pre-commit-config.yaml | 23 ++++++++++++----------- .vscode/settings.json | 2 ++ environment.yml | 8 ++++---- pyproject.toml | 4 ++++ 4 files changed, 22 insertions(+), 15 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index f54f1a4..91772aa 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -2,6 +2,7 @@ ci: autoupdate_commit_msg: "MAINT: update pre-commit config file" autoupdate_schedule: quarterly skip: + - prettier - taplo repos: @@ -10,17 +11,6 @@ repos: - id: check-hooks-apply - id: check-useless-excludes - - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.5.0 - hooks: - - id: check-case-conflict - - id: check-json - - id: check-toml - - id: check-yaml - - id: end-of-file-fixer - - id: mixed-line-ending - - id: trailing-whitespace - - repo: https://github.com/ComPWA/repo-maintenance rev: 0.1.11 hooks: @@ -45,6 +35,17 @@ repos: - id: nbqa-pyupgrade args: [--py38-plus] + - repo: https://github.com/pre-commit/pre-commit-hooks + rev: v4.5.0 + hooks: + - id: check-case-conflict + - id: check-json + - id: check-toml + - id: check-yaml + - id: end-of-file-fixer + - id: mixed-line-ending + - id: trailing-whitespace + - repo: https://github.com/psf/black-pre-commit-mirror rev: 23.12.1 hooks: diff --git a/.vscode/settings.json b/.vscode/settings.json index 86d5f07..c037b7f 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -23,10 +23,12 @@ "editor.defaultFormatter": "esbenp.prettier-vscode" }, "black-formatter.importStrategy": "useBundled", + "diffEditor.experimental.showMoves": true, "editor.formatOnSave": true, "github-actions.workflows.pinned.workflows": [".github/workflows/ci.yml"], "isort.args": ["--profile", "black"], "livePreview.defaultPreviewPath": "docs/_build/html", + "multiDiffEditor.experimental.enabled": true, "notebook.gotoSymbols.showAllSymbols": true, "rewrap.wrappingColumn": 88 } diff --git a/environment.yml b/environment.yml index a294d2d..1f84d85 100644 --- a/environment.yml +++ b/environment.yml @@ -1,8 +1,8 @@ name: strong2020-salamanca dependencies: - - python==3.10.* + - python==3.8.* - pip - pip: - - | - -c .constraints/py3.10.txt - -e .[dev] + - -c .constraints/py3.8.txt -e .[dev] +variables: + PRETTIER_LEGACY_CLI: "1" diff --git a/pyproject.toml b/pyproject.toml index 0a24f6c..36b4a37 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -55,11 +55,15 @@ format = [ "isort", ] jupyter = [ + "isort", "jupyterlab", "jupyterlab-code-formatter", + "jupyterlab-git", "jupyterlab-lsp", "jupyterlab-myst", + "python-lsp-ruff", "python-lsp-server[flake8,rope]", + "python-lsp-server[rope]", ] sty = [ "pre-commit", From 74ec662bcfb130eb1461fddc78290845f1f6cfcd Mon Sep 17 00:00:00 2001 From: GitHub Date: Sun, 7 Jan 2024 03:19:22 +0000 Subject: [PATCH 03/24] MAINT: update pip constraints and pre-commit --- .constraints/py3.10.txt | 10 ++++++++++ .constraints/py3.11.txt | 10 ++++++++++ .constraints/py3.12.txt | 10 ++++++++++ .constraints/py3.8.txt | 10 ++++++++++ .constraints/py3.9.txt | 10 ++++++++++ 5 files changed, 50 insertions(+) diff --git a/.constraints/py3.10.txt b/.constraints/py3.10.txt index d9af1e7..3f33399 100644 --- a/.constraints/py3.10.txt +++ b/.constraints/py3.10.txt @@ -18,6 +18,7 @@ beautifulsoup4==4.12.2 black==23.12.1 bleach==6.1.0 cachetools==5.3.2 +cattrs==23.2.3 certifi==2023.11.17 cffi==1.16.0 cfgv==3.4.0 @@ -41,6 +42,8 @@ filelock==3.13.1 flake8==6.1.0 fonttools==4.47.0 fqdn==1.5.1 +gitdb==4.0.11 +gitpython==3.1.40 greenlet==3.0.3 identify==2.5.33 idna==3.6 @@ -66,9 +69,11 @@ jupyter-core==5.7.0 jupyter-events==0.9.0 jupyter-lsp==2.2.1 jupyter-server==2.12.2 +jupyter-server-mathjax==0.2.6 jupyter-server-terminals==0.5.1 jupyterlab==4.0.10 jupyterlab-code-formatter==2.2.1 +jupyterlab-git==0.50.0 jupyterlab-lsp==5.0.1 jupyterlab-myst==2.1.0 jupyterlab-pygments==0.3.0 @@ -76,6 +81,7 @@ jupyterlab-server==2.25.2 jupyterlab-widgets==3.0.9 kiwisolver==1.4.5 livereload==2.6.3 +lsprotocol==2023.0.0 markdown-it-py==2.2.0 markupsafe==2.1.3 matplotlib==3.8.2 @@ -89,6 +95,7 @@ myst-nb==1.0.0 myst-parser==1.0.0 nbclient==0.6.8 nbconvert==7.14.0 +nbdime==4.0.1 nbformat==5.9.2 nbmake==1.4.6 nest-asyncio==1.5.8 @@ -121,6 +128,7 @@ pytest==7.4.4 python-dateutil==2.8.2 python-json-logger==2.0.7 python-lsp-jsonrpc==1.1.2 +python-lsp-ruff==2.0.1 python-lsp-server==1.9.0 pytoolconfig==1.2.6 pyyaml==6.0.1 @@ -131,8 +139,10 @@ rfc3339-validator==0.1.4 rfc3986-validator==0.1.1 rope==1.11.0 rpds-py==0.16.2 +ruff==0.1.11 send2trash==1.8.2 six==1.16.0 +smmap==5.0.1 sniffio==1.3.0 snowballstemmer==2.2.0 soupsieve==2.5 diff --git a/.constraints/py3.11.txt b/.constraints/py3.11.txt index cd82187..9491ac9 100644 --- a/.constraints/py3.11.txt +++ b/.constraints/py3.11.txt @@ -18,6 +18,7 @@ beautifulsoup4==4.12.2 black==23.12.1 bleach==6.1.0 cachetools==5.3.2 +cattrs==23.2.3 certifi==2023.11.17 cffi==1.16.0 cfgv==3.4.0 @@ -40,6 +41,8 @@ filelock==3.13.1 flake8==6.1.0 fonttools==4.47.0 fqdn==1.5.1 +gitdb==4.0.11 +gitpython==3.1.40 greenlet==3.0.3 identify==2.5.33 idna==3.6 @@ -65,9 +68,11 @@ jupyter-core==5.7.0 jupyter-events==0.9.0 jupyter-lsp==2.2.1 jupyter-server==2.12.2 +jupyter-server-mathjax==0.2.6 jupyter-server-terminals==0.5.1 jupyterlab==4.0.10 jupyterlab-code-formatter==2.2.1 +jupyterlab-git==0.50.0 jupyterlab-lsp==5.0.1 jupyterlab-myst==2.1.0 jupyterlab-pygments==0.3.0 @@ -75,6 +80,7 @@ jupyterlab-server==2.25.2 jupyterlab-widgets==3.0.9 kiwisolver==1.4.5 livereload==2.6.3 +lsprotocol==2023.0.0 markdown-it-py==2.2.0 markupsafe==2.1.3 matplotlib==3.8.2 @@ -88,6 +94,7 @@ myst-nb==1.0.0 myst-parser==1.0.0 nbclient==0.6.8 nbconvert==7.14.0 +nbdime==4.0.1 nbformat==5.9.2 nbmake==1.4.6 nest-asyncio==1.5.8 @@ -120,6 +127,7 @@ pytest==7.4.4 python-dateutil==2.8.2 python-json-logger==2.0.7 python-lsp-jsonrpc==1.1.2 +python-lsp-ruff==2.0.1 python-lsp-server==1.9.0 pytoolconfig==1.2.6 pyyaml==6.0.1 @@ -130,8 +138,10 @@ rfc3339-validator==0.1.4 rfc3986-validator==0.1.1 rope==1.11.0 rpds-py==0.16.2 +ruff==0.1.11 send2trash==1.8.2 six==1.16.0 +smmap==5.0.1 sniffio==1.3.0 snowballstemmer==2.2.0 soupsieve==2.5 diff --git a/.constraints/py3.12.txt b/.constraints/py3.12.txt index 686abfa..657c992 100644 --- a/.constraints/py3.12.txt +++ b/.constraints/py3.12.txt @@ -18,6 +18,7 @@ beautifulsoup4==4.12.2 black==23.12.1 bleach==6.1.0 cachetools==5.3.2 +cattrs==23.2.3 certifi==2023.11.17 cffi==1.16.0 cfgv==3.4.0 @@ -40,6 +41,8 @@ filelock==3.13.1 flake8==6.1.0 fonttools==4.47.0 fqdn==1.5.1 +gitdb==4.0.11 +gitpython==3.1.40 greenlet==3.0.3 identify==2.5.33 idna==3.6 @@ -65,9 +68,11 @@ jupyter-core==5.7.0 jupyter-events==0.9.0 jupyter-lsp==2.2.1 jupyter-server==2.12.2 +jupyter-server-mathjax==0.2.6 jupyter-server-terminals==0.5.1 jupyterlab==4.0.10 jupyterlab-code-formatter==2.2.1 +jupyterlab-git==0.50.0 jupyterlab-lsp==5.0.1 jupyterlab-myst==2.1.0 jupyterlab-pygments==0.3.0 @@ -75,6 +80,7 @@ jupyterlab-server==2.25.2 jupyterlab-widgets==3.0.9 kiwisolver==1.4.5 livereload==2.6.3 +lsprotocol==2023.0.0 markdown-it-py==2.2.0 markupsafe==2.1.3 matplotlib==3.8.2 @@ -88,6 +94,7 @@ myst-nb==1.0.0 myst-parser==1.0.0 nbclient==0.6.8 nbconvert==7.14.0 +nbdime==4.0.1 nbformat==5.9.2 nbmake==1.4.6 nest-asyncio==1.5.8 @@ -120,6 +127,7 @@ pytest==7.4.4 python-dateutil==2.8.2 python-json-logger==2.0.7 python-lsp-jsonrpc==1.1.2 +python-lsp-ruff==2.0.1 python-lsp-server==1.9.0 pytoolconfig==1.2.6 pyyaml==6.0.1 @@ -130,8 +138,10 @@ rfc3339-validator==0.1.4 rfc3986-validator==0.1.1 rope==1.11.0 rpds-py==0.16.2 +ruff==0.1.11 send2trash==1.8.2 six==1.16.0 +smmap==5.0.1 sniffio==1.3.0 snowballstemmer==2.2.0 soupsieve==2.5 diff --git a/.constraints/py3.8.txt b/.constraints/py3.8.txt index 62942fc..20c3536 100644 --- a/.constraints/py3.8.txt +++ b/.constraints/py3.8.txt @@ -19,6 +19,7 @@ beautifulsoup4==4.12.2 black==23.12.1 bleach==6.1.0 cachetools==5.3.2 +cattrs==23.2.3 certifi==2023.11.17 cffi==1.16.0 cfgv==3.4.0 @@ -42,6 +43,8 @@ filelock==3.13.1 flake8==6.1.0 fonttools==4.47.0 fqdn==1.5.1 +gitdb==4.0.11 +gitpython==3.1.40 greenlet==3.0.3 identify==2.5.33 idna==3.6 @@ -68,9 +71,11 @@ jupyter-core==5.7.0 jupyter-events==0.9.0 jupyter-lsp==2.2.1 jupyter-server==2.12.2 +jupyter-server-mathjax==0.2.6 jupyter-server-terminals==0.5.1 jupyterlab==4.0.10 jupyterlab-code-formatter==2.2.1 +jupyterlab-git==0.50.0 jupyterlab-lsp==5.0.1 jupyterlab-myst==2.1.0 jupyterlab-pygments==0.3.0 @@ -78,6 +83,7 @@ jupyterlab-server==2.25.2 jupyterlab-widgets==3.0.9 kiwisolver==1.4.5 livereload==2.6.3 +lsprotocol==2023.0.0 markdown-it-py==2.2.0 markupsafe==2.1.3 matplotlib==3.7.4 @@ -91,6 +97,7 @@ myst-nb==0.17.2 myst-parser==0.18.1 nbclient==0.6.8 nbconvert==7.14.0 +nbdime==4.0.1 nbformat==5.9.2 nbmake==1.4.6 nest-asyncio==1.5.8 @@ -125,6 +132,7 @@ pytest==7.4.4 python-dateutil==2.8.2 python-json-logger==2.0.7 python-lsp-jsonrpc==1.1.2 +python-lsp-ruff==2.0.1 python-lsp-server==1.9.0 pytoolconfig==1.2.6 pytz==2023.3.post1 @@ -136,8 +144,10 @@ rfc3339-validator==0.1.4 rfc3986-validator==0.1.1 rope==1.11.0 rpds-py==0.16.2 +ruff==0.1.11 send2trash==1.8.2 six==1.16.0 +smmap==5.0.1 sniffio==1.3.0 snowballstemmer==2.2.0 soupsieve==2.5 diff --git a/.constraints/py3.9.txt b/.constraints/py3.9.txt index 4d79c6e..5eb7faa 100644 --- a/.constraints/py3.9.txt +++ b/.constraints/py3.9.txt @@ -18,6 +18,7 @@ beautifulsoup4==4.12.2 black==23.12.1 bleach==6.1.0 cachetools==5.3.2 +cattrs==23.2.3 certifi==2023.11.17 cffi==1.16.0 cfgv==3.4.0 @@ -41,6 +42,8 @@ filelock==3.13.1 flake8==6.1.0 fonttools==4.47.0 fqdn==1.5.1 +gitdb==4.0.11 +gitpython==3.1.40 greenlet==3.0.3 identify==2.5.33 idna==3.6 @@ -67,9 +70,11 @@ jupyter-core==5.7.0 jupyter-events==0.9.0 jupyter-lsp==2.2.1 jupyter-server==2.12.2 +jupyter-server-mathjax==0.2.6 jupyter-server-terminals==0.5.1 jupyterlab==4.0.10 jupyterlab-code-formatter==2.2.1 +jupyterlab-git==0.50.0 jupyterlab-lsp==5.0.1 jupyterlab-myst==2.1.0 jupyterlab-pygments==0.3.0 @@ -77,6 +82,7 @@ jupyterlab-server==2.25.2 jupyterlab-widgets==3.0.9 kiwisolver==1.4.5 livereload==2.6.3 +lsprotocol==2023.0.0 markdown-it-py==2.2.0 markupsafe==2.1.3 matplotlib==3.8.2 @@ -90,6 +96,7 @@ myst-nb==1.0.0 myst-parser==1.0.0 nbclient==0.6.8 nbconvert==7.14.0 +nbdime==4.0.1 nbformat==5.9.2 nbmake==1.4.6 nest-asyncio==1.5.8 @@ -122,6 +129,7 @@ pytest==7.4.4 python-dateutil==2.8.2 python-json-logger==2.0.7 python-lsp-jsonrpc==1.1.2 +python-lsp-ruff==2.0.1 python-lsp-server==1.9.0 pytoolconfig==1.2.6 pyyaml==6.0.1 @@ -132,8 +140,10 @@ rfc3339-validator==0.1.4 rfc3986-validator==0.1.1 rope==1.11.0 rpds-py==0.16.2 +ruff==0.1.11 send2trash==1.8.2 six==1.16.0 +smmap==5.0.1 sniffio==1.3.0 snowballstemmer==2.2.0 soupsieve==2.5 From 2c0e6e02478b82f6ca10e96c47c4bb396a86c736 Mon Sep 17 00:00:00 2001 From: GitHub Date: Tue, 9 Jan 2024 17:09:29 +0000 Subject: [PATCH 04/24] MAINT: update pip constraints and pre-commit --- .constraints/py3.10.txt | 6 +++--- .constraints/py3.11.txt | 6 +++--- .constraints/py3.12.txt | 6 +++--- .constraints/py3.8.txt | 2 +- .constraints/py3.9.txt | 4 ++-- .pre-commit-config.yaml | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.constraints/py3.10.txt b/.constraints/py3.10.txt index 3f33399..19afe77 100644 --- a/.constraints/py3.10.txt +++ b/.constraints/py3.10.txt @@ -5,7 +5,7 @@ # pip-compile --extra=dev --no-annotate --output-file=.constraints/py3.10.txt --strip-extras --unsafe-package=pip --unsafe-package=setuptools --unsafe-package=strong2020-salamanca # accessible-pygments==0.0.4 -alabaster==0.7.13 +alabaster==0.7.15 anyio==4.2.0 argon2-cffi==23.1.0 argon2-cffi-bindings==21.2.0 @@ -52,7 +52,7 @@ importlib-metadata==7.0.1 iniconfig==2.0.0 ipykernel==6.28.0 ipympl==0.9.3 -ipython==8.19.0 +ipython==8.20.0 ipython-genutils==0.2.0 ipywidgets==8.1.1 isoduration==20.11.0 @@ -65,7 +65,7 @@ jsonschema==4.20.0 jsonschema-specifications==2023.12.1 jupyter-cache==1.0.0 jupyter-client==8.6.0 -jupyter-core==5.7.0 +jupyter-core==5.7.1 jupyter-events==0.9.0 jupyter-lsp==2.2.1 jupyter-server==2.12.2 diff --git a/.constraints/py3.11.txt b/.constraints/py3.11.txt index 9491ac9..b16c434 100644 --- a/.constraints/py3.11.txt +++ b/.constraints/py3.11.txt @@ -5,7 +5,7 @@ # pip-compile --extra=dev --no-annotate --output-file=.constraints/py3.11.txt --strip-extras --unsafe-package=pip --unsafe-package=setuptools --unsafe-package=strong2020-salamanca # accessible-pygments==0.0.4 -alabaster==0.7.13 +alabaster==0.7.15 anyio==4.2.0 argon2-cffi==23.1.0 argon2-cffi-bindings==21.2.0 @@ -51,7 +51,7 @@ importlib-metadata==7.0.1 iniconfig==2.0.0 ipykernel==6.28.0 ipympl==0.9.3 -ipython==8.19.0 +ipython==8.20.0 ipython-genutils==0.2.0 ipywidgets==8.1.1 isoduration==20.11.0 @@ -64,7 +64,7 @@ jsonschema==4.20.0 jsonschema-specifications==2023.12.1 jupyter-cache==1.0.0 jupyter-client==8.6.0 -jupyter-core==5.7.0 +jupyter-core==5.7.1 jupyter-events==0.9.0 jupyter-lsp==2.2.1 jupyter-server==2.12.2 diff --git a/.constraints/py3.12.txt b/.constraints/py3.12.txt index 657c992..19c0562 100644 --- a/.constraints/py3.12.txt +++ b/.constraints/py3.12.txt @@ -5,7 +5,7 @@ # pip-compile --extra=dev --no-annotate --output-file=.constraints/py3.12.txt --strip-extras --unsafe-package=pip --unsafe-package=setuptools --unsafe-package=strong2020-salamanca # accessible-pygments==0.0.4 -alabaster==0.7.13 +alabaster==0.7.15 anyio==4.2.0 argon2-cffi==23.1.0 argon2-cffi-bindings==21.2.0 @@ -51,7 +51,7 @@ importlib-metadata==7.0.1 iniconfig==2.0.0 ipykernel==6.28.0 ipympl==0.9.3 -ipython==8.19.0 +ipython==8.20.0 ipython-genutils==0.2.0 ipywidgets==8.1.1 isoduration==20.11.0 @@ -64,7 +64,7 @@ jsonschema==4.20.0 jsonschema-specifications==2023.12.1 jupyter-cache==1.0.0 jupyter-client==8.6.0 -jupyter-core==5.7.0 +jupyter-core==5.7.1 jupyter-events==0.9.0 jupyter-lsp==2.2.1 jupyter-server==2.12.2 diff --git a/.constraints/py3.8.txt b/.constraints/py3.8.txt index 20c3536..a677554 100644 --- a/.constraints/py3.8.txt +++ b/.constraints/py3.8.txt @@ -67,7 +67,7 @@ jsonschema==4.20.0 jsonschema-specifications==2023.12.1 jupyter-cache==0.6.1 jupyter-client==8.6.0 -jupyter-core==5.7.0 +jupyter-core==5.7.1 jupyter-events==0.9.0 jupyter-lsp==2.2.1 jupyter-server==2.12.2 diff --git a/.constraints/py3.9.txt b/.constraints/py3.9.txt index 5eb7faa..6952168 100644 --- a/.constraints/py3.9.txt +++ b/.constraints/py3.9.txt @@ -5,7 +5,7 @@ # pip-compile --extra=dev --no-annotate --output-file=.constraints/py3.9.txt --strip-extras --unsafe-package=pip --unsafe-package=setuptools --unsafe-package=strong2020-salamanca # accessible-pygments==0.0.4 -alabaster==0.7.13 +alabaster==0.7.15 anyio==4.2.0 argon2-cffi==23.1.0 argon2-cffi-bindings==21.2.0 @@ -66,7 +66,7 @@ jsonschema==4.20.0 jsonschema-specifications==2023.12.1 jupyter-cache==1.0.0 jupyter-client==8.6.0 -jupyter-core==5.7.0 +jupyter-core==5.7.1 jupyter-events==0.9.0 jupyter-lsp==2.2.1 jupyter-server==2.12.2 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 91772aa..3469e4e 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -12,7 +12,7 @@ repos: - id: check-useless-excludes - repo: https://github.com/ComPWA/repo-maintenance - rev: 0.1.11 + rev: 0.1.13a1 hooks: - id: check-dev-files args: From e52dcf5e3b290604498680a2965035545f8d209f Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 9 Jan 2024 17:10:32 +0000 Subject: [PATCH 05/24] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- .vscode/extensions.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.vscode/extensions.json b/.vscode/extensions.json index 73f61b5..e6e782a 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -4,7 +4,6 @@ "editorconfig.editorconfig", "esbenp.prettier-vscode", "executablebookproject.myst-highlight", - "garaioag.garaio-vscode-unwanted-recommendations", "github.vscode-github-actions", "github.vscode-pull-request-github", "mhutchie.git-graph", @@ -15,6 +14,7 @@ "ms-toolsai.vscode-jupyter-cell-tags", "ms-toolsai.vscode-jupyter-slideshow", "ms-vscode.live-server", + "Soulcode.vscode-unwanted-extensions", "stkb.rewrap", "tamasfe.even-better-toml", "tyriar.sort-lines", @@ -23,6 +23,7 @@ "unwantedRecommendations": [ "bungcip.better-toml", "davidanson.vscode-markdownlint", + "garaioag.garaio-vscode-unwanted-recommendations", "ms-python.mypy-type-checker", "travisillig.vscode-json-stable-stringify" ] From 2c287041f904060be74615eda3b88c55ca393f3f Mon Sep 17 00:00:00 2001 From: Remco de Boer <29308176+redeboer@users.noreply.github.com> Date: Tue, 9 Jan 2024 22:08:29 +0100 Subject: [PATCH 06/24] MAINT: upgrade to AmpForm v0.14.8 with `unevaluated` --- .gitignore | 1 + .vscode/settings.json | 2 +- docs/lecture17.ipynb | 179 +++++++++++++++++------------------------- 3 files changed, 76 insertions(+), 106 deletions(-) diff --git a/.gitignore b/.gitignore index 1bf9f1a..77f117f 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,7 @@ data/ .eggs/ .fuse_* dist/ +node_modules/ version.py # Temporary files diff --git a/.vscode/settings.json b/.vscode/settings.json index c037b7f..a7e7fdb 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -14,7 +14,7 @@ }, "[python]": { "editor.codeActionsOnSave": { - "source.organizeImports": true + "source.organizeImports": "explicit" }, "editor.defaultFormatter": "ms-python.black-formatter", "editor.rulers": [88] diff --git a/docs/lecture17.ipynb b/docs/lecture17.ipynb index 80daf3c..6049e75 100755 --- a/docs/lecture17.ipynb +++ b/docs/lecture17.ipynb @@ -17,7 +17,7 @@ }, "outputs": [], "source": [ - "%pip install -q ampform plotly sympy" + "%pip install -q ampform>=0.14.8 plotly sympy" ] }, { @@ -39,14 +39,13 @@ "from __future__ import annotations\n", "\n", "import warnings\n", - "from typing import Callable\n", + "from typing import Any, Callable\n", "\n", "import numpy as np\n", "import plotly.graph_objects as go\n", "import sympy as sp\n", "from ampform.io import aslatex\n", - "from ampform.sympy import UnevaluatedExpression, implement_doit_method\n", - "from ampform.sympy.math import create_expression\n", + "from ampform.sympy import unevaluated\n", "from IPython.display import Math\n", "from plotly.colors import DEFAULT_PLOTLY_COLORS\n", "from plotly.subplots import make_subplots\n", @@ -303,42 +302,29 @@ }, "outputs": [], "source": [ - "@implement_doit_method\n", - "class SignedSqrt(UnevaluatedExpression):\n", - " is_commutative = True\n", - " is_real = False\n", - "\n", - " def __new__(cls, z, **hints) -> SignedSqrt:\n", - " return create_expression(cls, z, **hints)\n", + "@unevaluated(real=False)\n", + "class SignedSqrt(sp.Expr):\n", + " z: Any\n", + " _latex_repr_ = R\"\\sqrt[+]{{{z}}}\"\n", "\n", " def evaluate(self) -> sp.Expr:\n", - " z = self.args[0]\n", + " z = self.z\n", " return sp.sqrt(abs(z)) * sp.exp(sp.I * PosArg(z) / 2)\n", "\n", - " def _latex(self, printer, *args) -> str:\n", - " z = printer._print(self.args[0])\n", - " return Rf\"\\sqrt[+]{{{z}}}\"\n", - "\n", - "\n", - "@implement_doit_method\n", - "class PosArg(UnevaluatedExpression):\n", - " is_commutative = True\n", "\n", - " def __new__(cls, z, **hints) -> SignedSqrt:\n", - " return create_expression(cls, z, **hints)\n", + "@unevaluated\n", + "class PosArg(sp.Expr):\n", + " z: Any\n", + " _latex_repr_ = R\"\\arg^+\\left({z}\\right)\"\n", "\n", " def evaluate(self) -> sp.Expr:\n", - " z = self.args[0]\n", + " z = self.z\n", " arg = sp.arg(z)\n", " return sp.Piecewise(\n", " (arg + 2 * sp.pi, sp.im(z) < 0),\n", " (arg, True),\n", " )\n", "\n", - " def _latex(self, printer, *args) -> str:\n", - " z = printer._print(self.args[0])\n", - " return Rf\"\\arg^+\\left({z}\\right)\"\n", - "\n", "\n", "z = sp.Symbol(\"z\", complex=True)\n", "Math(aslatex({e: e.evaluate() for e in [SignedSqrt(z), PosArg(z)]}))" @@ -387,13 +373,18 @@ }, "outputs": [], "source": [ - "@implement_doit_method\n", - "class G(UnevaluatedExpression):\n", - " is_commutative = True\n", - " is_real = False\n", - "\n", - " def __new__(cls, s, m, g0, sign=+1, **hints) -> Sigma:\n", - " return create_expression(cls, s, m, g0, sign, **hints)\n", + "@unevaluated(real=False)\n", + "class G(sp.Expr):\n", + " s: Any\n", + " m: Any\n", + " g0: Any\n", + " sign: int = +1\n", + "\n", + " def _latex_repr_(self, printer, *args) -> str:\n", + " s = printer._print(self.args[0])\n", + " sign = self.args[-1]\n", + " number = \"I\" if sign < 0 else \"II\"\n", + " return f\"G_{{{number}}}({s})\"\n", "\n", " def evaluate(self) -> sp.Expr:\n", " s, m, g0, sign = self.args\n", @@ -404,29 +395,17 @@ " (G(s, m, g0, sign=-1) + 2 * sp.I * sigma / (16 * sp.pi), True),\n", " )\n", "\n", - " def _latex(self, printer, *args) -> str:\n", - " s = printer._print(self.args[0])\n", - " sign = self.args[-1]\n", - " number = \"I\" if sign < 0 else \"II\"\n", - " return f\"G_{{{number}}}({s})\"\n", - "\n", - "\n", - "@implement_doit_method\n", - "class Sigma(UnevaluatedExpression):\n", - " is_commutative = True\n", - " is_real = False\n", "\n", - " def __new__(cls, s, m, **hints) -> Sigma:\n", - " return create_expression(cls, s, m, **hints)\n", + "@unevaluated(real=False)\n", + "class Sigma(sp.Expr):\n", + " s: Any\n", + " m: Any\n", + " _latex_repr_ = R\"\\sigma\\left({s}\\right)\"\n", "\n", " def evaluate(self) -> sp.Expr:\n", " s, m = self.args\n", " return SignedSqrt(1 - 4 * m**2 / s)\n", "\n", - " def _latex(self, printer, *args) -> str:\n", - " s = printer._print(self.args[0])\n", - " return Rf\"\\sigma\\left({s}\\right)\"\n", - "\n", "\n", "s, g0 = sp.symbols(\"s g0\", complex=True)\n", "m = sp.Symbol(\"m\", real=True, nonnegative=True)\n", @@ -532,51 +511,56 @@ }, "outputs": [], "source": [ - "@implement_doit_method\n", - "class S(UnevaluatedExpression):\n", - " is_commutative = True\n", - " is_real = False\n", - "\n", - " def __new__(cls, s, m, Mρ, GV, fπ, g0, sign=+1, **hints) -> Sigma:\n", - " return create_expression(cls, s, m, Mρ, GV, fπ, g0, sign, **hints)\n", - "\n", - " def evaluate(self) -> sp.Expr:\n", - " s, m, Mρ, GV, fπ, g0, sign = self.args\n", - " return 1 - 2 * sp.I * Sigma(s, m) / (16 * sp.pi) * T(*self.args)\n", - "\n", - " def _latex(self, printer, *args) -> str:\n", + "@unevaluated(real=False)\n", + "class S(sp.Expr):\n", + " s: Any\n", + " m: Any\n", + " Mρ: Any\n", + " GV: Any\n", + " fπ: Any\n", + " g0: Any\n", + " sign: int = +1\n", + "\n", + " def _latex_repr_(self, printer, *args) -> str:\n", " s = printer._print(self.args[0])\n", " sign = self.args[-1]\n", " number = \"I\" if sign < 0 else \"II\"\n", " return f\"S_{{{number}}}({s})\"\n", "\n", - "\n", - "@implement_doit_method\n", - "class T(UnevaluatedExpression):\n", - " is_commutative = True\n", - " is_real = False\n", - "\n", - " def __new__(cls, s, m, Mρ, GV, fπ, g0, sign=+1, **hints) -> Sigma:\n", - " return create_expression(cls, s, m, Mρ, GV, fπ, g0, sign, **hints)\n", - "\n", " def evaluate(self) -> sp.Expr:\n", " s, m, Mρ, GV, fπ, g0, sign = self.args\n", - " return 1 / (1 / V1(s, m, Mρ, GV, fπ) - G(s, m, g0, sign))\n", + " return 1 - 2 * sp.I * Sigma(s, m) / (16 * sp.pi) * T(*self.args)\n", + "\n", + "\n", + "@unevaluated(real=False)\n", + "class T(sp.Expr):\n", + " s: Any\n", + " m: Any\n", + " Mρ: Any\n", + " GV: Any\n", + " fπ: Any\n", + " g0: Any\n", + " sign: int = +1\n", "\n", - " def _latex(self, printer, *args) -> str:\n", + " def _latex_repr_(self, printer, *args) -> str:\n", " s = printer._print(self.args[0])\n", " sign = self.args[-1]\n", " number = \"I\" if sign < 0 else \"II\"\n", " return f\"T_{{{number}}}({s})\"\n", "\n", + " def evaluate(self) -> sp.Expr:\n", + " s, m, Mρ, GV, fπ, g0, sign = self.args\n", + " return 1 / (1 / V1(s, m, Mρ, GV, fπ) - G(s, m, g0, sign))\n", "\n", - "@implement_doit_method\n", - "class V1(UnevaluatedExpression):\n", - " is_commutative = True\n", - " is_real = False\n", "\n", - " def __new__(cls, s, m, Mρ, GV, fπ, **hints) -> Sigma:\n", - " return create_expression(cls, s, m, Mρ, GV, fπ, **hints)\n", + "@unevaluated(real=False)\n", + "class V1(sp.Expr):\n", + " s: Any\n", + " m: Any\n", + " Mρ: Any\n", + " GV: Any\n", + " fπ: Any\n", + " _latex_repr_ = R\"V_1\\left({s}\\right)\"\n", "\n", " def evaluate(self) -> sp.Expr:\n", " s, m, Mρ, GV, fπ = self.args\n", @@ -584,17 +568,11 @@ " 1 - GV**2 / fπ**2 * 2 * s / (s - Mρ**2)\n", " ) - GV**2 / fπ**4 * p2(s, m) * h(Mρ**2 / (2 * p2(s, m)))\n", "\n", - " def _latex(self, printer, *args) -> str:\n", - " s = printer._print(self.args[0])\n", - " return Rf\"V_1\\left({s}\\right)\"\n", - "\n", "\n", - "@implement_doit_method\n", - "class h(UnevaluatedExpression):\n", - " is_commutative = True\n", - "\n", - " def __new__(cls, a, **hints) -> Sigma:\n", - " return create_expression(cls, a, **hints)\n", + "@unevaluated\n", + "class h(sp.Expr):\n", + " a: Any\n", + " _latex_repr_ = R\"h\\left({a}\\right)\"\n", "\n", " def evaluate(self) -> sp.Expr:\n", " a = self.args[0]\n", @@ -604,26 +582,17 @@ " evaluate=False,\n", " ) + a * (2 + 3 * a + a**2) * sp.log(1 + 2 / a)\n", "\n", - " def _latex(self, printer, *args) -> str:\n", - " a = printer._print(self.args[0])\n", - " return Rf\"h\\left({a}\\right)\"\n", - "\n", - "\n", - "@implement_doit_method\n", - "class p2(UnevaluatedExpression):\n", - " is_commutative = True\n", "\n", - " def __new__(cls, s, m, **hints) -> Sigma:\n", - " return create_expression(cls, s, m, **hints)\n", + "@unevaluated\n", + "class p2(sp.Expr):\n", + " s: Any\n", + " m: Any\n", + " _latex_repr_ = R\"p^2\\left({s}\\right)\"\n", "\n", " def evaluate(self) -> sp.Expr:\n", " s, m = self.args\n", " return s / 4 - m**2\n", "\n", - " def _latex(self, printer, *args) -> str:\n", - " s = printer._print(self.args[0])\n", - " return Rf\"p^2\\left({s}\\right)\"\n", - "\n", "\n", "a, Mρ, GV, fπ = sp.symbols(\"a m_rho, G_V f_pi\")\n", "_exprs = [\n", From 8cb93320ef50d590c9ef6e3c09855773938f17fd Mon Sep 17 00:00:00 2001 From: GitHub Date: Tue, 9 Jan 2024 21:11:20 +0000 Subject: [PATCH 07/24] MAINT: update pip constraints and pre-commit --- .constraints/py3.10.txt | 4 ++-- .constraints/py3.11.txt | 4 ++-- .constraints/py3.12.txt | 4 ++-- .constraints/py3.8.txt | 4 ++-- .constraints/py3.9.txt | 4 ++-- .pre-commit-config.yaml | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.constraints/py3.10.txt b/.constraints/py3.10.txt index 19afe77..997d7fd 100644 --- a/.constraints/py3.10.txt +++ b/.constraints/py3.10.txt @@ -68,7 +68,7 @@ jupyter-client==8.6.0 jupyter-core==5.7.1 jupyter-events==0.9.0 jupyter-lsp==2.2.1 -jupyter-server==2.12.2 +jupyter-server==2.12.3 jupyter-server-mathjax==0.2.6 jupyter-server-terminals==0.5.1 jupyterlab==4.0.10 @@ -81,7 +81,7 @@ jupyterlab-server==2.25.2 jupyterlab-widgets==3.0.9 kiwisolver==1.4.5 livereload==2.6.3 -lsprotocol==2023.0.0 +lsprotocol==2023.0.1 markdown-it-py==2.2.0 markupsafe==2.1.3 matplotlib==3.8.2 diff --git a/.constraints/py3.11.txt b/.constraints/py3.11.txt index b16c434..9bf67c0 100644 --- a/.constraints/py3.11.txt +++ b/.constraints/py3.11.txt @@ -67,7 +67,7 @@ jupyter-client==8.6.0 jupyter-core==5.7.1 jupyter-events==0.9.0 jupyter-lsp==2.2.1 -jupyter-server==2.12.2 +jupyter-server==2.12.3 jupyter-server-mathjax==0.2.6 jupyter-server-terminals==0.5.1 jupyterlab==4.0.10 @@ -80,7 +80,7 @@ jupyterlab-server==2.25.2 jupyterlab-widgets==3.0.9 kiwisolver==1.4.5 livereload==2.6.3 -lsprotocol==2023.0.0 +lsprotocol==2023.0.1 markdown-it-py==2.2.0 markupsafe==2.1.3 matplotlib==3.8.2 diff --git a/.constraints/py3.12.txt b/.constraints/py3.12.txt index 19c0562..aaa166e 100644 --- a/.constraints/py3.12.txt +++ b/.constraints/py3.12.txt @@ -67,7 +67,7 @@ jupyter-client==8.6.0 jupyter-core==5.7.1 jupyter-events==0.9.0 jupyter-lsp==2.2.1 -jupyter-server==2.12.2 +jupyter-server==2.12.3 jupyter-server-mathjax==0.2.6 jupyter-server-terminals==0.5.1 jupyterlab==4.0.10 @@ -80,7 +80,7 @@ jupyterlab-server==2.25.2 jupyterlab-widgets==3.0.9 kiwisolver==1.4.5 livereload==2.6.3 -lsprotocol==2023.0.0 +lsprotocol==2023.0.1 markdown-it-py==2.2.0 markupsafe==2.1.3 matplotlib==3.8.2 diff --git a/.constraints/py3.8.txt b/.constraints/py3.8.txt index a677554..bc7e967 100644 --- a/.constraints/py3.8.txt +++ b/.constraints/py3.8.txt @@ -70,7 +70,7 @@ jupyter-client==8.6.0 jupyter-core==5.7.1 jupyter-events==0.9.0 jupyter-lsp==2.2.1 -jupyter-server==2.12.2 +jupyter-server==2.12.3 jupyter-server-mathjax==0.2.6 jupyter-server-terminals==0.5.1 jupyterlab==4.0.10 @@ -83,7 +83,7 @@ jupyterlab-server==2.25.2 jupyterlab-widgets==3.0.9 kiwisolver==1.4.5 livereload==2.6.3 -lsprotocol==2023.0.0 +lsprotocol==2023.0.1 markdown-it-py==2.2.0 markupsafe==2.1.3 matplotlib==3.7.4 diff --git a/.constraints/py3.9.txt b/.constraints/py3.9.txt index 6952168..f3f750e 100644 --- a/.constraints/py3.9.txt +++ b/.constraints/py3.9.txt @@ -69,7 +69,7 @@ jupyter-client==8.6.0 jupyter-core==5.7.1 jupyter-events==0.9.0 jupyter-lsp==2.2.1 -jupyter-server==2.12.2 +jupyter-server==2.12.3 jupyter-server-mathjax==0.2.6 jupyter-server-terminals==0.5.1 jupyterlab==4.0.10 @@ -82,7 +82,7 @@ jupyterlab-server==2.25.2 jupyterlab-widgets==3.0.9 kiwisolver==1.4.5 livereload==2.6.3 -lsprotocol==2023.0.0 +lsprotocol==2023.0.1 markdown-it-py==2.2.0 markupsafe==2.1.3 matplotlib==3.8.2 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 3469e4e..1411aae 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -12,7 +12,7 @@ repos: - id: check-useless-excludes - repo: https://github.com/ComPWA/repo-maintenance - rev: 0.1.13a1 + rev: 0.1.13a2 hooks: - id: check-dev-files args: From 2c16c0757f7eae9a0bab517f9e88a583f8d01f56 Mon Sep 17 00:00:00 2001 From: GitHub Date: Wed, 10 Jan 2024 21:03:23 +0000 Subject: [PATCH 08/24] MAINT: update pip constraints and pre-commit --- .constraints/py3.10.txt | 6 +++--- .constraints/py3.11.txt | 6 +++--- .constraints/py3.12.txt | 6 +++--- .constraints/py3.8.txt | 4 ++-- .constraints/py3.9.txt | 6 +++--- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.constraints/py3.10.txt b/.constraints/py3.10.txt index 997d7fd..580dc24 100644 --- a/.constraints/py3.10.txt +++ b/.constraints/py3.10.txt @@ -5,7 +5,7 @@ # pip-compile --extra=dev --no-annotate --output-file=.constraints/py3.10.txt --strip-extras --unsafe-package=pip --unsafe-package=setuptools --unsafe-package=strong2020-salamanca # accessible-pygments==0.0.4 -alabaster==0.7.15 +alabaster==0.7.16 anyio==4.2.0 argon2-cffi==23.1.0 argon2-cffi-bindings==21.2.0 @@ -43,7 +43,7 @@ flake8==6.1.0 fonttools==4.47.0 fqdn==1.5.1 gitdb==4.0.11 -gitpython==3.1.40 +gitpython==3.1.41 greenlet==3.0.3 identify==2.5.33 idna==3.6 @@ -130,7 +130,7 @@ python-json-logger==2.0.7 python-lsp-jsonrpc==1.1.2 python-lsp-ruff==2.0.1 python-lsp-server==1.9.0 -pytoolconfig==1.2.6 +pytoolconfig==1.3.0 pyyaml==6.0.1 pyzmq==25.1.2 referencing==0.32.1 diff --git a/.constraints/py3.11.txt b/.constraints/py3.11.txt index 9bf67c0..e094bcb 100644 --- a/.constraints/py3.11.txt +++ b/.constraints/py3.11.txt @@ -5,7 +5,7 @@ # pip-compile --extra=dev --no-annotate --output-file=.constraints/py3.11.txt --strip-extras --unsafe-package=pip --unsafe-package=setuptools --unsafe-package=strong2020-salamanca # accessible-pygments==0.0.4 -alabaster==0.7.15 +alabaster==0.7.16 anyio==4.2.0 argon2-cffi==23.1.0 argon2-cffi-bindings==21.2.0 @@ -42,7 +42,7 @@ flake8==6.1.0 fonttools==4.47.0 fqdn==1.5.1 gitdb==4.0.11 -gitpython==3.1.40 +gitpython==3.1.41 greenlet==3.0.3 identify==2.5.33 idna==3.6 @@ -129,7 +129,7 @@ python-json-logger==2.0.7 python-lsp-jsonrpc==1.1.2 python-lsp-ruff==2.0.1 python-lsp-server==1.9.0 -pytoolconfig==1.2.6 +pytoolconfig==1.3.0 pyyaml==6.0.1 pyzmq==25.1.2 referencing==0.32.1 diff --git a/.constraints/py3.12.txt b/.constraints/py3.12.txt index aaa166e..fbadd9d 100644 --- a/.constraints/py3.12.txt +++ b/.constraints/py3.12.txt @@ -5,7 +5,7 @@ # pip-compile --extra=dev --no-annotate --output-file=.constraints/py3.12.txt --strip-extras --unsafe-package=pip --unsafe-package=setuptools --unsafe-package=strong2020-salamanca # accessible-pygments==0.0.4 -alabaster==0.7.15 +alabaster==0.7.16 anyio==4.2.0 argon2-cffi==23.1.0 argon2-cffi-bindings==21.2.0 @@ -42,7 +42,7 @@ flake8==6.1.0 fonttools==4.47.0 fqdn==1.5.1 gitdb==4.0.11 -gitpython==3.1.40 +gitpython==3.1.41 greenlet==3.0.3 identify==2.5.33 idna==3.6 @@ -129,7 +129,7 @@ python-json-logger==2.0.7 python-lsp-jsonrpc==1.1.2 python-lsp-ruff==2.0.1 python-lsp-server==1.9.0 -pytoolconfig==1.2.6 +pytoolconfig==1.3.0 pyyaml==6.0.1 pyzmq==25.1.2 referencing==0.32.1 diff --git a/.constraints/py3.8.txt b/.constraints/py3.8.txt index bc7e967..bf7b081 100644 --- a/.constraints/py3.8.txt +++ b/.constraints/py3.8.txt @@ -44,7 +44,7 @@ flake8==6.1.0 fonttools==4.47.0 fqdn==1.5.1 gitdb==4.0.11 -gitpython==3.1.40 +gitpython==3.1.41 greenlet==3.0.3 identify==2.5.33 idna==3.6 @@ -134,7 +134,7 @@ python-json-logger==2.0.7 python-lsp-jsonrpc==1.1.2 python-lsp-ruff==2.0.1 python-lsp-server==1.9.0 -pytoolconfig==1.2.6 +pytoolconfig==1.3.0 pytz==2023.3.post1 pyyaml==6.0.1 pyzmq==25.1.2 diff --git a/.constraints/py3.9.txt b/.constraints/py3.9.txt index f3f750e..98e10e8 100644 --- a/.constraints/py3.9.txt +++ b/.constraints/py3.9.txt @@ -5,7 +5,7 @@ # pip-compile --extra=dev --no-annotate --output-file=.constraints/py3.9.txt --strip-extras --unsafe-package=pip --unsafe-package=setuptools --unsafe-package=strong2020-salamanca # accessible-pygments==0.0.4 -alabaster==0.7.15 +alabaster==0.7.16 anyio==4.2.0 argon2-cffi==23.1.0 argon2-cffi-bindings==21.2.0 @@ -43,7 +43,7 @@ flake8==6.1.0 fonttools==4.47.0 fqdn==1.5.1 gitdb==4.0.11 -gitpython==3.1.40 +gitpython==3.1.41 greenlet==3.0.3 identify==2.5.33 idna==3.6 @@ -131,7 +131,7 @@ python-json-logger==2.0.7 python-lsp-jsonrpc==1.1.2 python-lsp-ruff==2.0.1 python-lsp-server==1.9.0 -pytoolconfig==1.2.6 +pytoolconfig==1.3.0 pyyaml==6.0.1 pyzmq==25.1.2 referencing==0.32.1 From b764e8b7d0279410e39814968b09d0f6c172c9c2 Mon Sep 17 00:00:00 2001 From: Remco de Boer <29308176+redeboer@users.noreply.github.com> Date: Thu, 11 Jan 2024 12:42:44 +0100 Subject: [PATCH 09/24] DX: rename constraints upgrade PR title --- .pre-commit-config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 1411aae..4bf4d78 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,5 +1,5 @@ ci: - autoupdate_commit_msg: "MAINT: update pre-commit config file" + autoupdate_commit_msg: "MAINT: autoupdate pre-commit hooks" autoupdate_schedule: quarterly skip: - prettier @@ -12,7 +12,7 @@ repos: - id: check-useless-excludes - repo: https://github.com/ComPWA/repo-maintenance - rev: 0.1.13a2 + rev: 0.1.13a3 hooks: - id: check-dev-files args: From 3e2b81cf5ae6d2021a83332f57bf70b773371d20 Mon Sep 17 00:00:00 2001 From: GitHub Date: Thu, 11 Jan 2024 11:44:42 +0000 Subject: [PATCH 10/24] MAINT: update pip constraints and pre-commit --- .constraints/py3.10.txt | 4 ++-- .constraints/py3.11.txt | 4 ++-- .constraints/py3.12.txt | 4 ++-- .constraints/py3.8.txt | 4 ++-- .constraints/py3.9.txt | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.constraints/py3.10.txt b/.constraints/py3.10.txt index 580dc24..23417c2 100644 --- a/.constraints/py3.10.txt +++ b/.constraints/py3.10.txt @@ -40,7 +40,7 @@ executing==2.0.1 fastjsonschema==2.19.1 filelock==3.13.1 flake8==6.1.0 -fonttools==4.47.0 +fonttools==4.47.2 fqdn==1.5.1 gitdb==4.0.11 gitpython==3.1.41 @@ -58,7 +58,7 @@ ipywidgets==8.1.1 isoduration==20.11.0 isort==5.13.2 jedi==0.19.1 -jinja2==3.1.2 +jinja2==3.1.3 json5==0.9.14 jsonpointer==2.4 jsonschema==4.20.0 diff --git a/.constraints/py3.11.txt b/.constraints/py3.11.txt index e094bcb..7f8bbb5 100644 --- a/.constraints/py3.11.txt +++ b/.constraints/py3.11.txt @@ -39,7 +39,7 @@ executing==2.0.1 fastjsonschema==2.19.1 filelock==3.13.1 flake8==6.1.0 -fonttools==4.47.0 +fonttools==4.47.2 fqdn==1.5.1 gitdb==4.0.11 gitpython==3.1.41 @@ -57,7 +57,7 @@ ipywidgets==8.1.1 isoduration==20.11.0 isort==5.13.2 jedi==0.19.1 -jinja2==3.1.2 +jinja2==3.1.3 json5==0.9.14 jsonpointer==2.4 jsonschema==4.20.0 diff --git a/.constraints/py3.12.txt b/.constraints/py3.12.txt index fbadd9d..856e61c 100644 --- a/.constraints/py3.12.txt +++ b/.constraints/py3.12.txt @@ -39,7 +39,7 @@ executing==2.0.1 fastjsonschema==2.19.1 filelock==3.13.1 flake8==6.1.0 -fonttools==4.47.0 +fonttools==4.47.2 fqdn==1.5.1 gitdb==4.0.11 gitpython==3.1.41 @@ -57,7 +57,7 @@ ipywidgets==8.1.1 isoduration==20.11.0 isort==5.13.2 jedi==0.19.1 -jinja2==3.1.2 +jinja2==3.1.3 json5==0.9.14 jsonpointer==2.4 jsonschema==4.20.0 diff --git a/.constraints/py3.8.txt b/.constraints/py3.8.txt index bf7b081..d1a85fc 100644 --- a/.constraints/py3.8.txt +++ b/.constraints/py3.8.txt @@ -41,7 +41,7 @@ executing==2.0.1 fastjsonschema==2.19.1 filelock==3.13.1 flake8==6.1.0 -fonttools==4.47.0 +fonttools==4.47.2 fqdn==1.5.1 gitdb==4.0.11 gitpython==3.1.41 @@ -60,7 +60,7 @@ ipywidgets==8.1.1 isoduration==20.11.0 isort==5.13.2 jedi==0.19.1 -jinja2==3.1.2 +jinja2==3.1.3 json5==0.9.14 jsonpointer==2.4 jsonschema==4.20.0 diff --git a/.constraints/py3.9.txt b/.constraints/py3.9.txt index 98e10e8..6a862ad 100644 --- a/.constraints/py3.9.txt +++ b/.constraints/py3.9.txt @@ -40,7 +40,7 @@ executing==2.0.1 fastjsonschema==2.19.1 filelock==3.13.1 flake8==6.1.0 -fonttools==4.47.0 +fonttools==4.47.2 fqdn==1.5.1 gitdb==4.0.11 gitpython==3.1.41 @@ -59,7 +59,7 @@ ipywidgets==8.1.1 isoduration==20.11.0 isort==5.13.2 jedi==0.19.1 -jinja2==3.1.2 +jinja2==3.1.3 json5==0.9.14 jsonpointer==2.4 jsonschema==4.20.0 From 4a9147728a901673b102d4d4ef26585f538c1607 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 11 Jan 2024 13:55:12 +0100 Subject: [PATCH 11/24] MAINT: update pre-commit config file (#33) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * MAINT: update pre-commit config file updates: - [github.com/ComPWA/repo-maintenance: 0.1.2 → 0.1.11](https://github.com/ComPWA/repo-maintenance/compare/0.1.2...0.1.11) - [github.com/nbQA-dev/nbQA: 1.7.0 → 1.7.1](https://github.com/nbQA-dev/nbQA/compare/1.7.0...1.7.1) - [github.com/psf/black-pre-commit-mirror: 23.11.0 → 23.12.1](https://github.com/psf/black-pre-commit-mirror/compare/23.11.0...23.12.1) - [github.com/pre-commit/mirrors-prettier: v3.0.3 → v4.0.0-alpha.8](https://github.com/pre-commit/mirrors-prettier/compare/v3.0.3...v4.0.0-alpha.8) * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * MAINT: update pip constraints and pre-commit * MAINT: update pip constraints and pre-commit * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * MAINT: autoupdate pre-commit hooks * MAINT: add `node_modules` to `.gitignore` * DX: rename constraints upgrade PR title * DX: rename constraints upgrade PR title --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: GitHub Co-authored-by: Remco de Boer <29308176+redeboer@users.noreply.github.com> --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 77f117f..fd936a0 100644 --- a/.gitignore +++ b/.gitignore @@ -26,6 +26,7 @@ __pycache__/ _build/ htmlcov/ jupyter_execute/ +node_modules/ prof/ # Virtual environments From e343591ba746f0f060629abc4da7cf6872f6868a Mon Sep 17 00:00:00 2001 From: GitHub Date: Thu, 11 Jan 2024 13:00:17 +0000 Subject: [PATCH 12/24] MAINT: update pip constraints and pre-commit --- .constraints/py3.10.txt | 4 ++-- .constraints/py3.11.txt | 4 ++-- .constraints/py3.12.txt | 4 ++-- .constraints/py3.8.txt | 4 ++-- .constraints/py3.9.txt | 4 ++-- .pre-commit-config.yaml | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.constraints/py3.10.txt b/.constraints/py3.10.txt index 23417c2..f37164f 100644 --- a/.constraints/py3.10.txt +++ b/.constraints/py3.10.txt @@ -68,7 +68,7 @@ jupyter-client==8.6.0 jupyter-core==5.7.1 jupyter-events==0.9.0 jupyter-lsp==2.2.1 -jupyter-server==2.12.3 +jupyter-server==2.12.4 jupyter-server-mathjax==0.2.6 jupyter-server-terminals==0.5.1 jupyterlab==4.0.10 @@ -94,7 +94,7 @@ mypy-extensions==1.0.0 myst-nb==1.0.0 myst-parser==1.0.0 nbclient==0.6.8 -nbconvert==7.14.0 +nbconvert==7.14.1 nbdime==4.0.1 nbformat==5.9.2 nbmake==1.4.6 diff --git a/.constraints/py3.11.txt b/.constraints/py3.11.txt index 7f8bbb5..11324b2 100644 --- a/.constraints/py3.11.txt +++ b/.constraints/py3.11.txt @@ -67,7 +67,7 @@ jupyter-client==8.6.0 jupyter-core==5.7.1 jupyter-events==0.9.0 jupyter-lsp==2.2.1 -jupyter-server==2.12.3 +jupyter-server==2.12.4 jupyter-server-mathjax==0.2.6 jupyter-server-terminals==0.5.1 jupyterlab==4.0.10 @@ -93,7 +93,7 @@ mypy-extensions==1.0.0 myst-nb==1.0.0 myst-parser==1.0.0 nbclient==0.6.8 -nbconvert==7.14.0 +nbconvert==7.14.1 nbdime==4.0.1 nbformat==5.9.2 nbmake==1.4.6 diff --git a/.constraints/py3.12.txt b/.constraints/py3.12.txt index 856e61c..cb42e7a 100644 --- a/.constraints/py3.12.txt +++ b/.constraints/py3.12.txt @@ -67,7 +67,7 @@ jupyter-client==8.6.0 jupyter-core==5.7.1 jupyter-events==0.9.0 jupyter-lsp==2.2.1 -jupyter-server==2.12.3 +jupyter-server==2.12.4 jupyter-server-mathjax==0.2.6 jupyter-server-terminals==0.5.1 jupyterlab==4.0.10 @@ -93,7 +93,7 @@ mypy-extensions==1.0.0 myst-nb==1.0.0 myst-parser==1.0.0 nbclient==0.6.8 -nbconvert==7.14.0 +nbconvert==7.14.1 nbdime==4.0.1 nbformat==5.9.2 nbmake==1.4.6 diff --git a/.constraints/py3.8.txt b/.constraints/py3.8.txt index d1a85fc..2e8ed7f 100644 --- a/.constraints/py3.8.txt +++ b/.constraints/py3.8.txt @@ -70,7 +70,7 @@ jupyter-client==8.6.0 jupyter-core==5.7.1 jupyter-events==0.9.0 jupyter-lsp==2.2.1 -jupyter-server==2.12.3 +jupyter-server==2.12.4 jupyter-server-mathjax==0.2.6 jupyter-server-terminals==0.5.1 jupyterlab==4.0.10 @@ -96,7 +96,7 @@ mypy-extensions==1.0.0 myst-nb==0.17.2 myst-parser==0.18.1 nbclient==0.6.8 -nbconvert==7.14.0 +nbconvert==7.14.1 nbdime==4.0.1 nbformat==5.9.2 nbmake==1.4.6 diff --git a/.constraints/py3.9.txt b/.constraints/py3.9.txt index 6a862ad..7c5eab5 100644 --- a/.constraints/py3.9.txt +++ b/.constraints/py3.9.txt @@ -69,7 +69,7 @@ jupyter-client==8.6.0 jupyter-core==5.7.1 jupyter-events==0.9.0 jupyter-lsp==2.2.1 -jupyter-server==2.12.3 +jupyter-server==2.12.4 jupyter-server-mathjax==0.2.6 jupyter-server-terminals==0.5.1 jupyterlab==4.0.10 @@ -95,7 +95,7 @@ mypy-extensions==1.0.0 myst-nb==1.0.0 myst-parser==1.0.0 nbclient==0.6.8 -nbconvert==7.14.0 +nbconvert==7.14.1 nbdime==4.0.1 nbformat==5.9.2 nbmake==1.4.6 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 4bf4d78..4df9d7b 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -12,7 +12,7 @@ repos: - id: check-useless-excludes - repo: https://github.com/ComPWA/repo-maintenance - rev: 0.1.13a3 + rev: 0.1.13a4 hooks: - id: check-dev-files args: From f6a58171ecc910bfb32153e8aa68764cd8c7fdb1 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 11 Jan 2024 13:00:34 +0000 Subject: [PATCH 13/24] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 4df9d7b..397e45b 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,5 +1,5 @@ ci: - autoupdate_commit_msg: "MAINT: autoupdate pre-commit hooks" + autoupdate_commit_msg: "MAINT: update pip constraints and pre-commit" autoupdate_schedule: quarterly skip: - prettier From 21010a723d8484775c1807edbc43a469ff1b56bb Mon Sep 17 00:00:00 2001 From: Remco de Boer <29308176+redeboer@users.noreply.github.com> Date: Thu, 11 Jan 2024 15:35:55 +0100 Subject: [PATCH 14/24] DX: define `docnblive` job for `tox` --- pyproject.toml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pyproject.toml b/pyproject.toml index 36b4a37..97d7ac4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -141,6 +141,22 @@ legacy_tox_ini = """ EXECUTE_NB = yes FORCE_COLOR = yes + [testenv:docnblive] + allowlist_externals = + sphinx-autobuild + commands = + sphinx-autobuild \ + --open-browser \ + --re-ignore docs/_build/.* \ + --watch docs \ + docs/ docs/_build/html + description = + Set up a server to directly preview changes to the HTML pages + passenv = * + setenv = + EXECUTE_NB = yes + FORCE_COLOR = yes + [testenv:docnb-force] allowlist_externals = sphinx-build From aad36a32cfa510da499aa0374fb80e1a3763e4ce Mon Sep 17 00:00:00 2001 From: Remco de Boer <29308176+redeboer@users.noreply.github.com> Date: Thu, 11 Jan 2024 15:36:53 +0100 Subject: [PATCH 15/24] FIX: configm download in Google Drive links --- docs/lecture02.ipynb | 2 +- docs/lecture06-gammap.ipynb | 6 +++--- docs/lecture06-nbarp.ipynb | 6 +++--- docs/lecture09.ipynb | 4 ++-- docs/lecture12a-gammap-solution.ipynb | 4 ++-- docs/lecture12b-kinematics.ipynb | 2 +- docs/lecture12c-angles.ipynb | 2 +- docs/lecture12e-longitudinal.ipynb | 2 +- docs/lecture24.ipynb | 4 ++-- 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/docs/lecture02.ipynb b/docs/lecture02.ipynb index 1c62bf8..dc7228c 100644 --- a/docs/lecture02.ipynb +++ b/docs/lecture02.ipynb @@ -561,7 +561,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.10.12" + "version": "3.10.13" } }, "nbformat": 4, diff --git a/docs/lecture06-gammap.ipynb b/docs/lecture06-gammap.ipynb index 5fd7dc8..718e449 100644 --- a/docs/lecture06-gammap.ipynb +++ b/docs/lecture06-gammap.ipynb @@ -72,7 +72,7 @@ "outputs": [], "source": [ "output_path = gdown.cached_download(\n", - " url=\"https://drive.google.com/uc?id=1qiYjPbR5nx3_Sw7MXuUKhNAUpkXPoxYh\",\n", + " url=\"https://drive.google.com/uc?confirm=9iBg&id=1qiYjPbR5nx3_Sw7MXuUKhNAUpkXPoxYh\",\n", " path=\"data/lecture6-gammap-data.csv\",\n", " md5=\"38cf5bf915318df756a21a82ad9e4afa\",\n", " quiet=True,\n", @@ -356,7 +356,7 @@ "outputs": [], "source": [ "path_mc = gdown.cached_download(\n", - " url=\"https://drive.google.com/uc?id=11J0xaQLRMxzgQLXEhXZb_u4mnxp8RVPO\",\n", + " url=\"https://drive.google.com/uc?confirm=9iBg&id=11J0xaQLRMxzgQLXEhXZb_u4mnxp8RVPO\",\n", " path=\"data/lecture6-gammap-mc.csv\",\n", " md5=\"04152c69c802b13a55a3ffb3d07012d1\",\n", " quiet=True,\n", @@ -1111,7 +1111,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.10.12" + "version": "3.10.13" } }, "nbformat": 4, diff --git a/docs/lecture06-nbarp.ipynb b/docs/lecture06-nbarp.ipynb index dfacc6e..0468ab0 100644 --- a/docs/lecture06-nbarp.ipynb +++ b/docs/lecture06-nbarp.ipynb @@ -64,7 +64,7 @@ "import gdown\n", "\n", "output_path = gdown.cached_download(\n", - " url=\"https://drive.google.com/uc?id=17J4rrO-NHL8whkd7hjELhJbCoanoaqam\",\n", + " url=\"https://drive.google.com/uc?confirm=9iBg&id=17J4rrO-NHL8whkd7hjELhJbCoanoaqam\",\n", " path=\"data/lecture6-nbarp-data.csv\",\n", " md5=\"5ff45076c9d921aa0c9c803b8d2d8958\",\n", " quiet=True,\n", @@ -406,7 +406,7 @@ "outputs": [], "source": [ "path_mc = gdown.cached_download(\n", - " url=\"https://drive.google.com/uc?id=1SarwF44sWSGbpn4PmBH3GLKIJJmN2lbS\",\n", + " url=\"https://drive.google.com/uc?confirm=9iBg&id=1SarwF44sWSGbpn4PmBH3GLKIJJmN2lbS\",\n", " path=\"data/lecture6-nbarp-mc.csv\",\n", " md5=\"1221892fdcd056261ccb178748086679\",\n", " quiet=True,\n", @@ -653,7 +653,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.10.12" + "version": "3.10.13" } }, "nbformat": 4, diff --git a/docs/lecture09.ipynb b/docs/lecture09.ipynb index be9806e..202dff8 100644 --- a/docs/lecture09.ipynb +++ b/docs/lecture09.ipynb @@ -2720,7 +2720,7 @@ "outputs": [], "source": [ "output_path = gdown.cached_download(\n", - " url=\"https://drive.google.com/uc?id=1NUW8gsGoctzgRfeS3xTkLa10ySRIkMBV\",\n", + " url=\"https://drive.google.com/uc?confirm=9iBg&id=1NUW8gsGoctzgRfeS3xTkLa10ySRIkMBV\",\n", " path=\"data/Sigma.dat\",\n", " md5=\"2b899234bb857efdd7129fc8c1d1aff3\",\n", " quiet=True,\n", @@ -3006,7 +3006,7 @@ "outputs": [], "source": [ "output_path = gdown.cached_download(\n", - " url=\"https://drive.google.com/uc?id=1p3kLa9XZAZXiLIszq7SxMmoiNZ_qLYXf\",\n", + " url=\"https://drive.google.com/uc?confirm=9iBg&id=1p3kLa9XZAZXiLIszq7SxMmoiNZ_qLYXf\",\n", " path=\"data/ExtendedLLexample.txt\",\n", " md5=\"fcf1a7ff3bdeece6154d1fb1ca03ef97\",\n", " quiet=True,\n", diff --git a/docs/lecture12a-gammap-solution.ipynb b/docs/lecture12a-gammap-solution.ipynb index e0f70ed..68192e6 100755 --- a/docs/lecture12a-gammap-solution.ipynb +++ b/docs/lecture12a-gammap-solution.ipynb @@ -72,7 +72,7 @@ "outputs": [], "source": [ "output_path = gdown.cached_download(\n", - " url=\"https://drive.google.com/uc?id=1qiYjPbR5nx3_Sw7MXuUKhNAUpkXPoxYh\",\n", + " url=\"https://drive.google.com/uc?confirm=9iBg&id=1qiYjPbR5nx3_Sw7MXuUKhNAUpkXPoxYh\",\n", " path=\"data/lecture6-gammap-data.csv\",\n", " md5=\"38cf5bf915318df756a21a82ad9e4afa\",\n", " quiet=True,\n", @@ -420,7 +420,7 @@ "outputs": [], "source": [ "path_mc = gdown.cached_download(\n", - " url=\"https://drive.google.com/uc?id=11J0xaQLRMxzgQLXEhXZb_u4mnxp8RVPO\",\n", + " url=\"https://drive.google.com/uc?confirm=9iBg&id=11J0xaQLRMxzgQLXEhXZb_u4mnxp8RVPO\",\n", " path=\"data/lecture6-gammap-mc.csv\",\n", " md5=\"04152c69c802b13a55a3ffb3d07012d1\",\n", " quiet=True,\n", diff --git a/docs/lecture12b-kinematics.ipynb b/docs/lecture12b-kinematics.ipynb index 8d03eb2..649bb78 100644 --- a/docs/lecture12b-kinematics.ipynb +++ b/docs/lecture12b-kinematics.ipynb @@ -63,7 +63,7 @@ "outputs": [], "source": [ "output_path = gdown.cached_download(\n", - " url=\"https://drive.google.com/uc?id=17J4rrO-NHL8whkd7hjELhJbCoanoaqam\",\n", + " url=\"https://drive.google.com/uc?confirm=9iBg&id=17J4rrO-NHL8whkd7hjELhJbCoanoaqam\",\n", " path=\"data/antineutron_3pi.dat\",\n", " md5=\"5ff45076c9d921aa0c9c803b8d2d8958\",\n", " quiet=True,\n", diff --git a/docs/lecture12c-angles.ipynb b/docs/lecture12c-angles.ipynb index f718734..edcfbc2 100644 --- a/docs/lecture12c-angles.ipynb +++ b/docs/lecture12c-angles.ipynb @@ -61,7 +61,7 @@ "outputs": [], "source": [ "output_path = gdown.cached_download(\n", - " url=\"https://drive.google.com/uc?id=1qiYjPbR5nx3_Sw7MXuUKhNAUpkXPoxYh\",\n", + " url=\"https://drive.google.com/uc?confirm=9iBg&id=1qiYjPbR5nx3_Sw7MXuUKhNAUpkXPoxYh\",\n", " path=\"data/gammapi_2pions_inclusive.dat\",\n", " md5=\"38cf5bf915318df756a21a82ad9e4afa\",\n", " quiet=True,\n", diff --git a/docs/lecture12e-longitudinal.ipynb b/docs/lecture12e-longitudinal.ipynb index 99a2d36..a99b6d6 100644 --- a/docs/lecture12e-longitudinal.ipynb +++ b/docs/lecture12e-longitudinal.ipynb @@ -64,7 +64,7 @@ "import gdown\n", "\n", "output_path = gdown.cached_download(\n", - " url=\"https://drive.google.com/uc?id=1VkG1gYY4qnfqNz3MEUkOKDwcAW4EF4uR\",\n", + " url=\"https://drive.google.com/uc?confirm=9iBg&id=1VkG1gYY4qnfqNz3MEUkOKDwcAW4EF4uR\",\n", " path=\"data/gammapi_2pions_exclusivityCuts.dat\",\n", " md5=\"6aa2ab1388aa7fc1ce0568e3e972e491\",\n", " quiet=True,\n", diff --git a/docs/lecture24.ipynb b/docs/lecture24.ipynb index ce67cb4..2b652d8 100644 --- a/docs/lecture24.ipynb +++ b/docs/lecture24.ipynb @@ -136,7 +136,7 @@ "\n", "sfile = \"lecture24_utilities.ipynb\"\n", "if not os.path.exists(sfile):\n", - " url = \"https://drive.google.com/uc?id=1E899ebABgwcgfA7d-tXRud4dB7aGWIje\"\n", + " url = \"https://drive.google.com/uc?confirm=9iBg&id=1E899ebABgwcgfA7d-tXRud4dB7aGWIje\"\n", " gdown.download(url, sfile, quiet=False)\n", "\n", "import import_ipynb # noqa: F401\n", @@ -231,7 +231,7 @@ "outputs": [], "source": [ "exfile = gdown.cached_download(\n", - " url=\"https://drive.google.com/uc?id=15YnOFy_AE7hNBOQF4w3BRnRi2M3gYulY\",\n", + " url=\"https://drive.google.com/uc?confirm=9iBg&id=15YnOFy_AE7hNBOQF4w3BRnRi2M3gYulY\",\n", " path=\"data/lecture24-exampledata.txt\",\n", " md5=\"e78b4dc457f52b8738e03dcdef9220d8\",\n", " quiet=True,\n", From 234777b758dddba695d2b8e9e1be5574051bb789 Mon Sep 17 00:00:00 2001 From: Remco de Boer <29308176+redeboer@users.noreply.github.com> Date: Thu, 11 Jan 2024 15:37:56 +0100 Subject: [PATCH 16/24] FIX: use correct syntax for pip package version --- docs/lecture17.ipynb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/lecture17.ipynb b/docs/lecture17.ipynb index 6049e75..ebad9b3 100755 --- a/docs/lecture17.ipynb +++ b/docs/lecture17.ipynb @@ -17,7 +17,7 @@ }, "outputs": [], "source": [ - "%pip install -q ampform>=0.14.8 plotly sympy" + "%pip install -q \"ampform>=0.14.8\" plotly sympy" ] }, { From a1ea551ac48e3461ed2b86bbc43c8f3a36f63bac Mon Sep 17 00:00:00 2001 From: Remco de Boer <29308176+redeboer@users.noreply.github.com> Date: Thu, 11 Jan 2024 15:47:01 +0100 Subject: [PATCH 17/24] FIX: add `export=download` to Google Drive links --- docs/lecture06-gammap.ipynb | 4 ++-- docs/lecture06-nbarp.ipynb | 4 ++-- docs/lecture09.ipynb | 4 ++-- docs/lecture12a-gammap-solution.ipynb | 4 ++-- docs/lecture12b-kinematics.ipynb | 2 +- docs/lecture12c-angles.ipynb | 2 +- docs/lecture12e-longitudinal.ipynb | 2 +- docs/lecture24.ipynb | 4 ++-- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/docs/lecture06-gammap.ipynb b/docs/lecture06-gammap.ipynb index 718e449..29518bd 100644 --- a/docs/lecture06-gammap.ipynb +++ b/docs/lecture06-gammap.ipynb @@ -72,7 +72,7 @@ "outputs": [], "source": [ "output_path = gdown.cached_download(\n", - " url=\"https://drive.google.com/uc?confirm=9iBg&id=1qiYjPbR5nx3_Sw7MXuUKhNAUpkXPoxYh\",\n", + " url=\"https://drive.google.com/uc?export=download&confirm=9iBg&id=1qiYjPbR5nx3_Sw7MXuUKhNAUpkXPoxYh\",\n", " path=\"data/lecture6-gammap-data.csv\",\n", " md5=\"38cf5bf915318df756a21a82ad9e4afa\",\n", " quiet=True,\n", @@ -356,7 +356,7 @@ "outputs": [], "source": [ "path_mc = gdown.cached_download(\n", - " url=\"https://drive.google.com/uc?confirm=9iBg&id=11J0xaQLRMxzgQLXEhXZb_u4mnxp8RVPO\",\n", + " url=\"https://drive.google.com/uc?export=download&confirm=9iBg&id=11J0xaQLRMxzgQLXEhXZb_u4mnxp8RVPO\",\n", " path=\"data/lecture6-gammap-mc.csv\",\n", " md5=\"04152c69c802b13a55a3ffb3d07012d1\",\n", " quiet=True,\n", diff --git a/docs/lecture06-nbarp.ipynb b/docs/lecture06-nbarp.ipynb index 0468ab0..7fefd42 100644 --- a/docs/lecture06-nbarp.ipynb +++ b/docs/lecture06-nbarp.ipynb @@ -64,7 +64,7 @@ "import gdown\n", "\n", "output_path = gdown.cached_download(\n", - " url=\"https://drive.google.com/uc?confirm=9iBg&id=17J4rrO-NHL8whkd7hjELhJbCoanoaqam\",\n", + " url=\"https://drive.google.com/uc?export=download&confirm=9iBg&id=17J4rrO-NHL8whkd7hjELhJbCoanoaqam\",\n", " path=\"data/lecture6-nbarp-data.csv\",\n", " md5=\"5ff45076c9d921aa0c9c803b8d2d8958\",\n", " quiet=True,\n", @@ -406,7 +406,7 @@ "outputs": [], "source": [ "path_mc = gdown.cached_download(\n", - " url=\"https://drive.google.com/uc?confirm=9iBg&id=1SarwF44sWSGbpn4PmBH3GLKIJJmN2lbS\",\n", + " url=\"https://drive.google.com/uc?export=download&confirm=9iBg&id=1SarwF44sWSGbpn4PmBH3GLKIJJmN2lbS\",\n", " path=\"data/lecture6-nbarp-mc.csv\",\n", " md5=\"1221892fdcd056261ccb178748086679\",\n", " quiet=True,\n", diff --git a/docs/lecture09.ipynb b/docs/lecture09.ipynb index 202dff8..0103f51 100644 --- a/docs/lecture09.ipynb +++ b/docs/lecture09.ipynb @@ -2720,7 +2720,7 @@ "outputs": [], "source": [ "output_path = gdown.cached_download(\n", - " url=\"https://drive.google.com/uc?confirm=9iBg&id=1NUW8gsGoctzgRfeS3xTkLa10ySRIkMBV\",\n", + " url=\"https://drive.google.com/uc?export=download&confirm=9iBg&id=1NUW8gsGoctzgRfeS3xTkLa10ySRIkMBV\",\n", " path=\"data/Sigma.dat\",\n", " md5=\"2b899234bb857efdd7129fc8c1d1aff3\",\n", " quiet=True,\n", @@ -3006,7 +3006,7 @@ "outputs": [], "source": [ "output_path = gdown.cached_download(\n", - " url=\"https://drive.google.com/uc?confirm=9iBg&id=1p3kLa9XZAZXiLIszq7SxMmoiNZ_qLYXf\",\n", + " url=\"https://drive.google.com/uc?export=download&confirm=9iBg&id=1p3kLa9XZAZXiLIszq7SxMmoiNZ_qLYXf\",\n", " path=\"data/ExtendedLLexample.txt\",\n", " md5=\"fcf1a7ff3bdeece6154d1fb1ca03ef97\",\n", " quiet=True,\n", diff --git a/docs/lecture12a-gammap-solution.ipynb b/docs/lecture12a-gammap-solution.ipynb index 68192e6..ff99105 100755 --- a/docs/lecture12a-gammap-solution.ipynb +++ b/docs/lecture12a-gammap-solution.ipynb @@ -72,7 +72,7 @@ "outputs": [], "source": [ "output_path = gdown.cached_download(\n", - " url=\"https://drive.google.com/uc?confirm=9iBg&id=1qiYjPbR5nx3_Sw7MXuUKhNAUpkXPoxYh\",\n", + " url=\"https://drive.google.com/uc?export=download&confirm=9iBg&id=1qiYjPbR5nx3_Sw7MXuUKhNAUpkXPoxYh\",\n", " path=\"data/lecture6-gammap-data.csv\",\n", " md5=\"38cf5bf915318df756a21a82ad9e4afa\",\n", " quiet=True,\n", @@ -420,7 +420,7 @@ "outputs": [], "source": [ "path_mc = gdown.cached_download(\n", - " url=\"https://drive.google.com/uc?confirm=9iBg&id=11J0xaQLRMxzgQLXEhXZb_u4mnxp8RVPO\",\n", + " url=\"https://drive.google.com/uc?export=download&confirm=9iBg&id=11J0xaQLRMxzgQLXEhXZb_u4mnxp8RVPO\",\n", " path=\"data/lecture6-gammap-mc.csv\",\n", " md5=\"04152c69c802b13a55a3ffb3d07012d1\",\n", " quiet=True,\n", diff --git a/docs/lecture12b-kinematics.ipynb b/docs/lecture12b-kinematics.ipynb index 649bb78..af8171a 100644 --- a/docs/lecture12b-kinematics.ipynb +++ b/docs/lecture12b-kinematics.ipynb @@ -63,7 +63,7 @@ "outputs": [], "source": [ "output_path = gdown.cached_download(\n", - " url=\"https://drive.google.com/uc?confirm=9iBg&id=17J4rrO-NHL8whkd7hjELhJbCoanoaqam\",\n", + " url=\"https://drive.google.com/uc?export=download&confirm=9iBg&id=17J4rrO-NHL8whkd7hjELhJbCoanoaqam\",\n", " path=\"data/antineutron_3pi.dat\",\n", " md5=\"5ff45076c9d921aa0c9c803b8d2d8958\",\n", " quiet=True,\n", diff --git a/docs/lecture12c-angles.ipynb b/docs/lecture12c-angles.ipynb index edcfbc2..238a0f9 100644 --- a/docs/lecture12c-angles.ipynb +++ b/docs/lecture12c-angles.ipynb @@ -61,7 +61,7 @@ "outputs": [], "source": [ "output_path = gdown.cached_download(\n", - " url=\"https://drive.google.com/uc?confirm=9iBg&id=1qiYjPbR5nx3_Sw7MXuUKhNAUpkXPoxYh\",\n", + " url=\"https://drive.google.com/uc?export=download&confirm=9iBg&id=1qiYjPbR5nx3_Sw7MXuUKhNAUpkXPoxYh\",\n", " path=\"data/gammapi_2pions_inclusive.dat\",\n", " md5=\"38cf5bf915318df756a21a82ad9e4afa\",\n", " quiet=True,\n", diff --git a/docs/lecture12e-longitudinal.ipynb b/docs/lecture12e-longitudinal.ipynb index a99b6d6..7851898 100644 --- a/docs/lecture12e-longitudinal.ipynb +++ b/docs/lecture12e-longitudinal.ipynb @@ -64,7 +64,7 @@ "import gdown\n", "\n", "output_path = gdown.cached_download(\n", - " url=\"https://drive.google.com/uc?confirm=9iBg&id=1VkG1gYY4qnfqNz3MEUkOKDwcAW4EF4uR\",\n", + " url=\"https://drive.google.com/uc?export=download&confirm=9iBg&id=1VkG1gYY4qnfqNz3MEUkOKDwcAW4EF4uR\",\n", " path=\"data/gammapi_2pions_exclusivityCuts.dat\",\n", " md5=\"6aa2ab1388aa7fc1ce0568e3e972e491\",\n", " quiet=True,\n", diff --git a/docs/lecture24.ipynb b/docs/lecture24.ipynb index 2b652d8..2c967ce 100644 --- a/docs/lecture24.ipynb +++ b/docs/lecture24.ipynb @@ -136,7 +136,7 @@ "\n", "sfile = \"lecture24_utilities.ipynb\"\n", "if not os.path.exists(sfile):\n", - " url = \"https://drive.google.com/uc?confirm=9iBg&id=1E899ebABgwcgfA7d-tXRud4dB7aGWIje\"\n", + " url = \"https://drive.google.com/uc?export=download&confirm=9iBg&id=1E899ebABgwcgfA7d-tXRud4dB7aGWIje\"\n", " gdown.download(url, sfile, quiet=False)\n", "\n", "import import_ipynb # noqa: F401\n", @@ -231,7 +231,7 @@ "outputs": [], "source": [ "exfile = gdown.cached_download(\n", - " url=\"https://drive.google.com/uc?confirm=9iBg&id=15YnOFy_AE7hNBOQF4w3BRnRi2M3gYulY\",\n", + " url=\"https://drive.google.com/uc?export=download&confirm=9iBg&id=15YnOFy_AE7hNBOQF4w3BRnRi2M3gYulY\",\n", " path=\"data/lecture24-exampledata.txt\",\n", " md5=\"e78b4dc457f52b8738e03dcdef9220d8\",\n", " quiet=True,\n", From 265c3a959aaa5d32fd9ee3add905e169dd9e09fb Mon Sep 17 00:00:00 2001 From: Remco de Boer <29308176+redeboer@users.noreply.github.com> Date: Thu, 11 Jan 2024 16:05:04 +0100 Subject: [PATCH 18/24] Revert "FIX: add `export=download` to Google Drive links" This reverts commit a1ea551ac48e3461ed2b86bbc43c8f3a36f63bac. --- docs/lecture06-gammap.ipynb | 4 ++-- docs/lecture06-nbarp.ipynb | 4 ++-- docs/lecture09.ipynb | 4 ++-- docs/lecture12a-gammap-solution.ipynb | 4 ++-- docs/lecture12b-kinematics.ipynb | 2 +- docs/lecture12c-angles.ipynb | 2 +- docs/lecture12e-longitudinal.ipynb | 2 +- docs/lecture24.ipynb | 4 ++-- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/docs/lecture06-gammap.ipynb b/docs/lecture06-gammap.ipynb index 29518bd..718e449 100644 --- a/docs/lecture06-gammap.ipynb +++ b/docs/lecture06-gammap.ipynb @@ -72,7 +72,7 @@ "outputs": [], "source": [ "output_path = gdown.cached_download(\n", - " url=\"https://drive.google.com/uc?export=download&confirm=9iBg&id=1qiYjPbR5nx3_Sw7MXuUKhNAUpkXPoxYh\",\n", + " url=\"https://drive.google.com/uc?confirm=9iBg&id=1qiYjPbR5nx3_Sw7MXuUKhNAUpkXPoxYh\",\n", " path=\"data/lecture6-gammap-data.csv\",\n", " md5=\"38cf5bf915318df756a21a82ad9e4afa\",\n", " quiet=True,\n", @@ -356,7 +356,7 @@ "outputs": [], "source": [ "path_mc = gdown.cached_download(\n", - " url=\"https://drive.google.com/uc?export=download&confirm=9iBg&id=11J0xaQLRMxzgQLXEhXZb_u4mnxp8RVPO\",\n", + " url=\"https://drive.google.com/uc?confirm=9iBg&id=11J0xaQLRMxzgQLXEhXZb_u4mnxp8RVPO\",\n", " path=\"data/lecture6-gammap-mc.csv\",\n", " md5=\"04152c69c802b13a55a3ffb3d07012d1\",\n", " quiet=True,\n", diff --git a/docs/lecture06-nbarp.ipynb b/docs/lecture06-nbarp.ipynb index 7fefd42..0468ab0 100644 --- a/docs/lecture06-nbarp.ipynb +++ b/docs/lecture06-nbarp.ipynb @@ -64,7 +64,7 @@ "import gdown\n", "\n", "output_path = gdown.cached_download(\n", - " url=\"https://drive.google.com/uc?export=download&confirm=9iBg&id=17J4rrO-NHL8whkd7hjELhJbCoanoaqam\",\n", + " url=\"https://drive.google.com/uc?confirm=9iBg&id=17J4rrO-NHL8whkd7hjELhJbCoanoaqam\",\n", " path=\"data/lecture6-nbarp-data.csv\",\n", " md5=\"5ff45076c9d921aa0c9c803b8d2d8958\",\n", " quiet=True,\n", @@ -406,7 +406,7 @@ "outputs": [], "source": [ "path_mc = gdown.cached_download(\n", - " url=\"https://drive.google.com/uc?export=download&confirm=9iBg&id=1SarwF44sWSGbpn4PmBH3GLKIJJmN2lbS\",\n", + " url=\"https://drive.google.com/uc?confirm=9iBg&id=1SarwF44sWSGbpn4PmBH3GLKIJJmN2lbS\",\n", " path=\"data/lecture6-nbarp-mc.csv\",\n", " md5=\"1221892fdcd056261ccb178748086679\",\n", " quiet=True,\n", diff --git a/docs/lecture09.ipynb b/docs/lecture09.ipynb index 0103f51..202dff8 100644 --- a/docs/lecture09.ipynb +++ b/docs/lecture09.ipynb @@ -2720,7 +2720,7 @@ "outputs": [], "source": [ "output_path = gdown.cached_download(\n", - " url=\"https://drive.google.com/uc?export=download&confirm=9iBg&id=1NUW8gsGoctzgRfeS3xTkLa10ySRIkMBV\",\n", + " url=\"https://drive.google.com/uc?confirm=9iBg&id=1NUW8gsGoctzgRfeS3xTkLa10ySRIkMBV\",\n", " path=\"data/Sigma.dat\",\n", " md5=\"2b899234bb857efdd7129fc8c1d1aff3\",\n", " quiet=True,\n", @@ -3006,7 +3006,7 @@ "outputs": [], "source": [ "output_path = gdown.cached_download(\n", - " url=\"https://drive.google.com/uc?export=download&confirm=9iBg&id=1p3kLa9XZAZXiLIszq7SxMmoiNZ_qLYXf\",\n", + " url=\"https://drive.google.com/uc?confirm=9iBg&id=1p3kLa9XZAZXiLIszq7SxMmoiNZ_qLYXf\",\n", " path=\"data/ExtendedLLexample.txt\",\n", " md5=\"fcf1a7ff3bdeece6154d1fb1ca03ef97\",\n", " quiet=True,\n", diff --git a/docs/lecture12a-gammap-solution.ipynb b/docs/lecture12a-gammap-solution.ipynb index ff99105..68192e6 100755 --- a/docs/lecture12a-gammap-solution.ipynb +++ b/docs/lecture12a-gammap-solution.ipynb @@ -72,7 +72,7 @@ "outputs": [], "source": [ "output_path = gdown.cached_download(\n", - " url=\"https://drive.google.com/uc?export=download&confirm=9iBg&id=1qiYjPbR5nx3_Sw7MXuUKhNAUpkXPoxYh\",\n", + " url=\"https://drive.google.com/uc?confirm=9iBg&id=1qiYjPbR5nx3_Sw7MXuUKhNAUpkXPoxYh\",\n", " path=\"data/lecture6-gammap-data.csv\",\n", " md5=\"38cf5bf915318df756a21a82ad9e4afa\",\n", " quiet=True,\n", @@ -420,7 +420,7 @@ "outputs": [], "source": [ "path_mc = gdown.cached_download(\n", - " url=\"https://drive.google.com/uc?export=download&confirm=9iBg&id=11J0xaQLRMxzgQLXEhXZb_u4mnxp8RVPO\",\n", + " url=\"https://drive.google.com/uc?confirm=9iBg&id=11J0xaQLRMxzgQLXEhXZb_u4mnxp8RVPO\",\n", " path=\"data/lecture6-gammap-mc.csv\",\n", " md5=\"04152c69c802b13a55a3ffb3d07012d1\",\n", " quiet=True,\n", diff --git a/docs/lecture12b-kinematics.ipynb b/docs/lecture12b-kinematics.ipynb index af8171a..649bb78 100644 --- a/docs/lecture12b-kinematics.ipynb +++ b/docs/lecture12b-kinematics.ipynb @@ -63,7 +63,7 @@ "outputs": [], "source": [ "output_path = gdown.cached_download(\n", - " url=\"https://drive.google.com/uc?export=download&confirm=9iBg&id=17J4rrO-NHL8whkd7hjELhJbCoanoaqam\",\n", + " url=\"https://drive.google.com/uc?confirm=9iBg&id=17J4rrO-NHL8whkd7hjELhJbCoanoaqam\",\n", " path=\"data/antineutron_3pi.dat\",\n", " md5=\"5ff45076c9d921aa0c9c803b8d2d8958\",\n", " quiet=True,\n", diff --git a/docs/lecture12c-angles.ipynb b/docs/lecture12c-angles.ipynb index 238a0f9..edcfbc2 100644 --- a/docs/lecture12c-angles.ipynb +++ b/docs/lecture12c-angles.ipynb @@ -61,7 +61,7 @@ "outputs": [], "source": [ "output_path = gdown.cached_download(\n", - " url=\"https://drive.google.com/uc?export=download&confirm=9iBg&id=1qiYjPbR5nx3_Sw7MXuUKhNAUpkXPoxYh\",\n", + " url=\"https://drive.google.com/uc?confirm=9iBg&id=1qiYjPbR5nx3_Sw7MXuUKhNAUpkXPoxYh\",\n", " path=\"data/gammapi_2pions_inclusive.dat\",\n", " md5=\"38cf5bf915318df756a21a82ad9e4afa\",\n", " quiet=True,\n", diff --git a/docs/lecture12e-longitudinal.ipynb b/docs/lecture12e-longitudinal.ipynb index 7851898..a99b6d6 100644 --- a/docs/lecture12e-longitudinal.ipynb +++ b/docs/lecture12e-longitudinal.ipynb @@ -64,7 +64,7 @@ "import gdown\n", "\n", "output_path = gdown.cached_download(\n", - " url=\"https://drive.google.com/uc?export=download&confirm=9iBg&id=1VkG1gYY4qnfqNz3MEUkOKDwcAW4EF4uR\",\n", + " url=\"https://drive.google.com/uc?confirm=9iBg&id=1VkG1gYY4qnfqNz3MEUkOKDwcAW4EF4uR\",\n", " path=\"data/gammapi_2pions_exclusivityCuts.dat\",\n", " md5=\"6aa2ab1388aa7fc1ce0568e3e972e491\",\n", " quiet=True,\n", diff --git a/docs/lecture24.ipynb b/docs/lecture24.ipynb index 2c967ce..2b652d8 100644 --- a/docs/lecture24.ipynb +++ b/docs/lecture24.ipynb @@ -136,7 +136,7 @@ "\n", "sfile = \"lecture24_utilities.ipynb\"\n", "if not os.path.exists(sfile):\n", - " url = \"https://drive.google.com/uc?export=download&confirm=9iBg&id=1E899ebABgwcgfA7d-tXRud4dB7aGWIje\"\n", + " url = \"https://drive.google.com/uc?confirm=9iBg&id=1E899ebABgwcgfA7d-tXRud4dB7aGWIje\"\n", " gdown.download(url, sfile, quiet=False)\n", "\n", "import import_ipynb # noqa: F401\n", @@ -231,7 +231,7 @@ "outputs": [], "source": [ "exfile = gdown.cached_download(\n", - " url=\"https://drive.google.com/uc?export=download&confirm=9iBg&id=15YnOFy_AE7hNBOQF4w3BRnRi2M3gYulY\",\n", + " url=\"https://drive.google.com/uc?confirm=9iBg&id=15YnOFy_AE7hNBOQF4w3BRnRi2M3gYulY\",\n", " path=\"data/lecture24-exampledata.txt\",\n", " md5=\"e78b4dc457f52b8738e03dcdef9220d8\",\n", " quiet=True,\n", From 2962b3fc8279676abaed185a48d013e587cc013d Mon Sep 17 00:00:00 2001 From: Remco de Boer <29308176+redeboer@users.noreply.github.com> Date: Thu, 11 Jan 2024 16:05:20 +0100 Subject: [PATCH 19/24] Revert "FIX: configm download in Google Drive links" This reverts commit aad36a32cfa510da499aa0374fb80e1a3763e4ce. --- docs/lecture02.ipynb | 2 +- docs/lecture06-gammap.ipynb | 6 +++--- docs/lecture06-nbarp.ipynb | 6 +++--- docs/lecture09.ipynb | 4 ++-- docs/lecture12a-gammap-solution.ipynb | 4 ++-- docs/lecture12b-kinematics.ipynb | 2 +- docs/lecture12c-angles.ipynb | 2 +- docs/lecture12e-longitudinal.ipynb | 2 +- docs/lecture24.ipynb | 4 ++-- 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/docs/lecture02.ipynb b/docs/lecture02.ipynb index dc7228c..1c62bf8 100644 --- a/docs/lecture02.ipynb +++ b/docs/lecture02.ipynb @@ -561,7 +561,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.10.13" + "version": "3.10.12" } }, "nbformat": 4, diff --git a/docs/lecture06-gammap.ipynb b/docs/lecture06-gammap.ipynb index 718e449..5fd7dc8 100644 --- a/docs/lecture06-gammap.ipynb +++ b/docs/lecture06-gammap.ipynb @@ -72,7 +72,7 @@ "outputs": [], "source": [ "output_path = gdown.cached_download(\n", - " url=\"https://drive.google.com/uc?confirm=9iBg&id=1qiYjPbR5nx3_Sw7MXuUKhNAUpkXPoxYh\",\n", + " url=\"https://drive.google.com/uc?id=1qiYjPbR5nx3_Sw7MXuUKhNAUpkXPoxYh\",\n", " path=\"data/lecture6-gammap-data.csv\",\n", " md5=\"38cf5bf915318df756a21a82ad9e4afa\",\n", " quiet=True,\n", @@ -356,7 +356,7 @@ "outputs": [], "source": [ "path_mc = gdown.cached_download(\n", - " url=\"https://drive.google.com/uc?confirm=9iBg&id=11J0xaQLRMxzgQLXEhXZb_u4mnxp8RVPO\",\n", + " url=\"https://drive.google.com/uc?id=11J0xaQLRMxzgQLXEhXZb_u4mnxp8RVPO\",\n", " path=\"data/lecture6-gammap-mc.csv\",\n", " md5=\"04152c69c802b13a55a3ffb3d07012d1\",\n", " quiet=True,\n", @@ -1111,7 +1111,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.10.13" + "version": "3.10.12" } }, "nbformat": 4, diff --git a/docs/lecture06-nbarp.ipynb b/docs/lecture06-nbarp.ipynb index 0468ab0..dfacc6e 100644 --- a/docs/lecture06-nbarp.ipynb +++ b/docs/lecture06-nbarp.ipynb @@ -64,7 +64,7 @@ "import gdown\n", "\n", "output_path = gdown.cached_download(\n", - " url=\"https://drive.google.com/uc?confirm=9iBg&id=17J4rrO-NHL8whkd7hjELhJbCoanoaqam\",\n", + " url=\"https://drive.google.com/uc?id=17J4rrO-NHL8whkd7hjELhJbCoanoaqam\",\n", " path=\"data/lecture6-nbarp-data.csv\",\n", " md5=\"5ff45076c9d921aa0c9c803b8d2d8958\",\n", " quiet=True,\n", @@ -406,7 +406,7 @@ "outputs": [], "source": [ "path_mc = gdown.cached_download(\n", - " url=\"https://drive.google.com/uc?confirm=9iBg&id=1SarwF44sWSGbpn4PmBH3GLKIJJmN2lbS\",\n", + " url=\"https://drive.google.com/uc?id=1SarwF44sWSGbpn4PmBH3GLKIJJmN2lbS\",\n", " path=\"data/lecture6-nbarp-mc.csv\",\n", " md5=\"1221892fdcd056261ccb178748086679\",\n", " quiet=True,\n", @@ -653,7 +653,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.10.13" + "version": "3.10.12" } }, "nbformat": 4, diff --git a/docs/lecture09.ipynb b/docs/lecture09.ipynb index 202dff8..be9806e 100644 --- a/docs/lecture09.ipynb +++ b/docs/lecture09.ipynb @@ -2720,7 +2720,7 @@ "outputs": [], "source": [ "output_path = gdown.cached_download(\n", - " url=\"https://drive.google.com/uc?confirm=9iBg&id=1NUW8gsGoctzgRfeS3xTkLa10ySRIkMBV\",\n", + " url=\"https://drive.google.com/uc?id=1NUW8gsGoctzgRfeS3xTkLa10ySRIkMBV\",\n", " path=\"data/Sigma.dat\",\n", " md5=\"2b899234bb857efdd7129fc8c1d1aff3\",\n", " quiet=True,\n", @@ -3006,7 +3006,7 @@ "outputs": [], "source": [ "output_path = gdown.cached_download(\n", - " url=\"https://drive.google.com/uc?confirm=9iBg&id=1p3kLa9XZAZXiLIszq7SxMmoiNZ_qLYXf\",\n", + " url=\"https://drive.google.com/uc?id=1p3kLa9XZAZXiLIszq7SxMmoiNZ_qLYXf\",\n", " path=\"data/ExtendedLLexample.txt\",\n", " md5=\"fcf1a7ff3bdeece6154d1fb1ca03ef97\",\n", " quiet=True,\n", diff --git a/docs/lecture12a-gammap-solution.ipynb b/docs/lecture12a-gammap-solution.ipynb index 68192e6..e0f70ed 100755 --- a/docs/lecture12a-gammap-solution.ipynb +++ b/docs/lecture12a-gammap-solution.ipynb @@ -72,7 +72,7 @@ "outputs": [], "source": [ "output_path = gdown.cached_download(\n", - " url=\"https://drive.google.com/uc?confirm=9iBg&id=1qiYjPbR5nx3_Sw7MXuUKhNAUpkXPoxYh\",\n", + " url=\"https://drive.google.com/uc?id=1qiYjPbR5nx3_Sw7MXuUKhNAUpkXPoxYh\",\n", " path=\"data/lecture6-gammap-data.csv\",\n", " md5=\"38cf5bf915318df756a21a82ad9e4afa\",\n", " quiet=True,\n", @@ -420,7 +420,7 @@ "outputs": [], "source": [ "path_mc = gdown.cached_download(\n", - " url=\"https://drive.google.com/uc?confirm=9iBg&id=11J0xaQLRMxzgQLXEhXZb_u4mnxp8RVPO\",\n", + " url=\"https://drive.google.com/uc?id=11J0xaQLRMxzgQLXEhXZb_u4mnxp8RVPO\",\n", " path=\"data/lecture6-gammap-mc.csv\",\n", " md5=\"04152c69c802b13a55a3ffb3d07012d1\",\n", " quiet=True,\n", diff --git a/docs/lecture12b-kinematics.ipynb b/docs/lecture12b-kinematics.ipynb index 649bb78..8d03eb2 100644 --- a/docs/lecture12b-kinematics.ipynb +++ b/docs/lecture12b-kinematics.ipynb @@ -63,7 +63,7 @@ "outputs": [], "source": [ "output_path = gdown.cached_download(\n", - " url=\"https://drive.google.com/uc?confirm=9iBg&id=17J4rrO-NHL8whkd7hjELhJbCoanoaqam\",\n", + " url=\"https://drive.google.com/uc?id=17J4rrO-NHL8whkd7hjELhJbCoanoaqam\",\n", " path=\"data/antineutron_3pi.dat\",\n", " md5=\"5ff45076c9d921aa0c9c803b8d2d8958\",\n", " quiet=True,\n", diff --git a/docs/lecture12c-angles.ipynb b/docs/lecture12c-angles.ipynb index edcfbc2..f718734 100644 --- a/docs/lecture12c-angles.ipynb +++ b/docs/lecture12c-angles.ipynb @@ -61,7 +61,7 @@ "outputs": [], "source": [ "output_path = gdown.cached_download(\n", - " url=\"https://drive.google.com/uc?confirm=9iBg&id=1qiYjPbR5nx3_Sw7MXuUKhNAUpkXPoxYh\",\n", + " url=\"https://drive.google.com/uc?id=1qiYjPbR5nx3_Sw7MXuUKhNAUpkXPoxYh\",\n", " path=\"data/gammapi_2pions_inclusive.dat\",\n", " md5=\"38cf5bf915318df756a21a82ad9e4afa\",\n", " quiet=True,\n", diff --git a/docs/lecture12e-longitudinal.ipynb b/docs/lecture12e-longitudinal.ipynb index a99b6d6..99a2d36 100644 --- a/docs/lecture12e-longitudinal.ipynb +++ b/docs/lecture12e-longitudinal.ipynb @@ -64,7 +64,7 @@ "import gdown\n", "\n", "output_path = gdown.cached_download(\n", - " url=\"https://drive.google.com/uc?confirm=9iBg&id=1VkG1gYY4qnfqNz3MEUkOKDwcAW4EF4uR\",\n", + " url=\"https://drive.google.com/uc?id=1VkG1gYY4qnfqNz3MEUkOKDwcAW4EF4uR\",\n", " path=\"data/gammapi_2pions_exclusivityCuts.dat\",\n", " md5=\"6aa2ab1388aa7fc1ce0568e3e972e491\",\n", " quiet=True,\n", diff --git a/docs/lecture24.ipynb b/docs/lecture24.ipynb index 2b652d8..ce67cb4 100644 --- a/docs/lecture24.ipynb +++ b/docs/lecture24.ipynb @@ -136,7 +136,7 @@ "\n", "sfile = \"lecture24_utilities.ipynb\"\n", "if not os.path.exists(sfile):\n", - " url = \"https://drive.google.com/uc?confirm=9iBg&id=1E899ebABgwcgfA7d-tXRud4dB7aGWIje\"\n", + " url = \"https://drive.google.com/uc?id=1E899ebABgwcgfA7d-tXRud4dB7aGWIje\"\n", " gdown.download(url, sfile, quiet=False)\n", "\n", "import import_ipynb # noqa: F401\n", @@ -231,7 +231,7 @@ "outputs": [], "source": [ "exfile = gdown.cached_download(\n", - " url=\"https://drive.google.com/uc?confirm=9iBg&id=15YnOFy_AE7hNBOQF4w3BRnRi2M3gYulY\",\n", + " url=\"https://drive.google.com/uc?id=15YnOFy_AE7hNBOQF4w3BRnRi2M3gYulY\",\n", " path=\"data/lecture24-exampledata.txt\",\n", " md5=\"e78b4dc457f52b8738e03dcdef9220d8\",\n", " quiet=True,\n", From e9e487bf2108d9243274ccf7f434c59568729d1a Mon Sep 17 00:00:00 2001 From: Remco de Boer <29308176+redeboer@users.noreply.github.com> Date: Thu, 11 Jan 2024 16:18:48 +0100 Subject: [PATCH 20/24] FIX: pin `gdown` to v4.6.3 --- docs/lecture02.ipynb | 2 +- docs/lecture06-gammap.ipynb | 2 +- docs/lecture06-nbarp.ipynb | 2 +- docs/lecture09.ipynb | 2 +- docs/lecture12a-gammap-solution.ipynb | 2 +- docs/lecture12b-kinematics.ipynb | 2 +- docs/lecture12c-angles.ipynb | 2 +- docs/lecture12d-phasespace.ipynb | 2 +- docs/lecture12e-longitudinal.ipynb | 2 +- docs/lecture18.ipynb | 2 +- docs/lecture24.ipynb | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/docs/lecture02.ipynb b/docs/lecture02.ipynb index 1c62bf8..f5dbbbf 100644 --- a/docs/lecture02.ipynb +++ b/docs/lecture02.ipynb @@ -27,7 +27,7 @@ }, "outputs": [], "source": [ - "%pip install -q gdown matplotlib numpy particle" + "%pip install -q gdown==4.6.3 matplotlib numpy particle" ] }, { diff --git a/docs/lecture06-gammap.ipynb b/docs/lecture06-gammap.ipynb index 5fd7dc8..b3bec25 100644 --- a/docs/lecture06-gammap.ipynb +++ b/docs/lecture06-gammap.ipynb @@ -31,7 +31,7 @@ }, "outputs": [], "source": [ - "%pip install -q gdown matplotlib numpy pandas pylorentz scipy" + "%pip install -q gdown==4.6.3 matplotlib numpy pandas pylorentz scipy" ] }, { diff --git a/docs/lecture06-nbarp.ipynb b/docs/lecture06-nbarp.ipynb index dfacc6e..b9416a6 100644 --- a/docs/lecture06-nbarp.ipynb +++ b/docs/lecture06-nbarp.ipynb @@ -31,7 +31,7 @@ }, "outputs": [], "source": [ - "%pip install -q gdown matplotlib numpy pandas scipy" + "%pip install -q gdown==4.6.3 matplotlib numpy pandas scipy" ] }, { diff --git a/docs/lecture09.ipynb b/docs/lecture09.ipynb index be9806e..f474900 100644 --- a/docs/lecture09.ipynb +++ b/docs/lecture09.ipynb @@ -17,7 +17,7 @@ }, "outputs": [], "source": [ - "%pip install -q gdown lmfit matplotlib numpy scipy" + "%pip install -q gdown==4.6.3 lmfit matplotlib numpy scipy" ] }, { diff --git a/docs/lecture12a-gammap-solution.ipynb b/docs/lecture12a-gammap-solution.ipynb index e0f70ed..6a0b5c2 100755 --- a/docs/lecture12a-gammap-solution.ipynb +++ b/docs/lecture12a-gammap-solution.ipynb @@ -31,7 +31,7 @@ }, "outputs": [], "source": [ - "%pip install -q gdown matplotlib numpy pandas pylorentz scipy" + "%pip install -q gdown==4.6.3 matplotlib numpy pandas pylorentz scipy" ] }, { diff --git a/docs/lecture12b-kinematics.ipynb b/docs/lecture12b-kinematics.ipynb index 8d03eb2..dc0d0da 100644 --- a/docs/lecture12b-kinematics.ipynb +++ b/docs/lecture12b-kinematics.ipynb @@ -26,7 +26,7 @@ }, "outputs": [], "source": [ - "%pip install -q gdown matplotlib numpy pandas pylorentz scipy" + "%pip install -q gdown==4.6.3 matplotlib numpy pandas pylorentz scipy" ] }, { diff --git a/docs/lecture12c-angles.ipynb b/docs/lecture12c-angles.ipynb index f718734..dbd10a3 100644 --- a/docs/lecture12c-angles.ipynb +++ b/docs/lecture12c-angles.ipynb @@ -19,7 +19,7 @@ }, "outputs": [], "source": [ - "%pip install -q gdown matplotlib numpy pandas pylorentz" + "%pip install -q gdown==4.6.3 matplotlib numpy pandas pylorentz" ] }, { diff --git a/docs/lecture12d-phasespace.ipynb b/docs/lecture12d-phasespace.ipynb index 24d0ed4..555ed12 100644 --- a/docs/lecture12d-phasespace.ipynb +++ b/docs/lecture12d-phasespace.ipynb @@ -31,7 +31,7 @@ }, "outputs": [], "source": [ - "%pip install -q gdown matplotlib numpy phasespace pylorentz" + "%pip install -q gdown==4.6.3 matplotlib numpy phasespace pylorentz" ] }, { diff --git a/docs/lecture12e-longitudinal.ipynb b/docs/lecture12e-longitudinal.ipynb index 99a2d36..02465d6 100644 --- a/docs/lecture12e-longitudinal.ipynb +++ b/docs/lecture12e-longitudinal.ipynb @@ -25,7 +25,7 @@ }, "outputs": [], "source": [ - "%pip install -q gdown matplotlib numpy pandas pylorentz" + "%pip install -q gdown==4.6.3 matplotlib numpy pandas pylorentz" ] }, { diff --git a/docs/lecture18.ipynb b/docs/lecture18.ipynb index 0ffba78..a93c1a1 100755 --- a/docs/lecture18.ipynb +++ b/docs/lecture18.ipynb @@ -24,7 +24,7 @@ }, "outputs": [], "source": [ - "%pip install -q gdown matplotlib numpy" + "%pip install -q gdown==4.6.3 matplotlib numpy" ] }, { diff --git a/docs/lecture24.ipynb b/docs/lecture24.ipynb index ce67cb4..b8df624 100644 --- a/docs/lecture24.ipynb +++ b/docs/lecture24.ipynb @@ -24,7 +24,7 @@ }, "outputs": [], "source": [ - "%pip install -q gdown iminuit import-ipynb sweights\n", + "%pip install -q gdown==4.6.3 iminuit import-ipynb sweights\n", "from IPython.display import display" ] }, From c0cef32ceef8bcce03fafc5a32b2fe4f528ba801 Mon Sep 17 00:00:00 2001 From: Remco de Boer <29308176+redeboer@users.noreply.github.com> Date: Thu, 11 Jan 2024 16:19:16 +0100 Subject: [PATCH 21/24] DX: switch back to Python 3.10 --- .pre-commit-config.yaml | 1 + environment.yml | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 397e45b..69995ed 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -16,6 +16,7 @@ repos: hooks: - id: check-dev-files args: + - --dev-python-version=3.10 - --ignore-author - --no-github-actions - --no-gitpod diff --git a/environment.yml b/environment.yml index 1f84d85..bb570c7 100644 --- a/environment.yml +++ b/environment.yml @@ -1,8 +1,8 @@ name: strong2020-salamanca dependencies: - - python==3.8.* + - python==3.10.* - pip - pip: - - -c .constraints/py3.8.txt -e .[dev] + - -c .constraints/py3.10.txt -e .[dev] variables: PRETTIER_LEGACY_CLI: "1" From f3cfe5f53106192318bb2966bf7b3d6036388239 Mon Sep 17 00:00:00 2001 From: GitHub Date: Thu, 11 Jan 2024 18:14:54 +0000 Subject: [PATCH 22/24] MAINT: update pip constraints and pre-commit --- .constraints/py3.10.txt | 2 +- .constraints/py3.11.txt | 2 +- .constraints/py3.12.txt | 2 +- .constraints/py3.8.txt | 2 +- .constraints/py3.9.txt | 2 +- .pre-commit-config.yaml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.constraints/py3.10.txt b/.constraints/py3.10.txt index f37164f..3406bbd 100644 --- a/.constraints/py3.10.txt +++ b/.constraints/py3.10.txt @@ -130,7 +130,7 @@ python-json-logger==2.0.7 python-lsp-jsonrpc==1.1.2 python-lsp-ruff==2.0.1 python-lsp-server==1.9.0 -pytoolconfig==1.3.0 +pytoolconfig==1.3.1 pyyaml==6.0.1 pyzmq==25.1.2 referencing==0.32.1 diff --git a/.constraints/py3.11.txt b/.constraints/py3.11.txt index 11324b2..0073a55 100644 --- a/.constraints/py3.11.txt +++ b/.constraints/py3.11.txt @@ -129,7 +129,7 @@ python-json-logger==2.0.7 python-lsp-jsonrpc==1.1.2 python-lsp-ruff==2.0.1 python-lsp-server==1.9.0 -pytoolconfig==1.3.0 +pytoolconfig==1.3.1 pyyaml==6.0.1 pyzmq==25.1.2 referencing==0.32.1 diff --git a/.constraints/py3.12.txt b/.constraints/py3.12.txt index cb42e7a..62e1a7c 100644 --- a/.constraints/py3.12.txt +++ b/.constraints/py3.12.txt @@ -129,7 +129,7 @@ python-json-logger==2.0.7 python-lsp-jsonrpc==1.1.2 python-lsp-ruff==2.0.1 python-lsp-server==1.9.0 -pytoolconfig==1.3.0 +pytoolconfig==1.3.1 pyyaml==6.0.1 pyzmq==25.1.2 referencing==0.32.1 diff --git a/.constraints/py3.8.txt b/.constraints/py3.8.txt index 2e8ed7f..6b838ff 100644 --- a/.constraints/py3.8.txt +++ b/.constraints/py3.8.txt @@ -134,7 +134,7 @@ python-json-logger==2.0.7 python-lsp-jsonrpc==1.1.2 python-lsp-ruff==2.0.1 python-lsp-server==1.9.0 -pytoolconfig==1.3.0 +pytoolconfig==1.3.1 pytz==2023.3.post1 pyyaml==6.0.1 pyzmq==25.1.2 diff --git a/.constraints/py3.9.txt b/.constraints/py3.9.txt index 7c5eab5..494d2cc 100644 --- a/.constraints/py3.9.txt +++ b/.constraints/py3.9.txt @@ -131,7 +131,7 @@ python-json-logger==2.0.7 python-lsp-jsonrpc==1.1.2 python-lsp-ruff==2.0.1 python-lsp-server==1.9.0 -pytoolconfig==1.3.0 +pytoolconfig==1.3.1 pyyaml==6.0.1 pyzmq==25.1.2 referencing==0.32.1 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 69995ed..9dc845c 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -12,7 +12,7 @@ repos: - id: check-useless-excludes - repo: https://github.com/ComPWA/repo-maintenance - rev: 0.1.13a4 + rev: 0.1.13a6 hooks: - id: check-dev-files args: From de8c8e7efd45a2650dab91fb36ed1a13451ff183 Mon Sep 17 00:00:00 2001 From: Remco de Boer <29308176+redeboer@users.noreply.github.com> Date: Fri, 12 Jan 2024 18:28:10 +0100 Subject: [PATCH 23/24] MAINT: autoupdate pre-commit hooks and apply --- .github/workflows/requirements.yml | 1 - .pre-commit-config.yaml | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/requirements.yml b/.github/workflows/requirements.yml index b8f8c9e..864f3f6 100644 --- a/.github/workflows/requirements.yml +++ b/.github/workflows/requirements.yml @@ -12,7 +12,6 @@ on: paths: - .constraints/py3.*.txt - .pre-commit-config.yaml - - setup.cfg schedule: - cron: "0 3 7 */3 *" workflow_dispatch: diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 9dc845c..6e0f6c0 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -11,8 +11,8 @@ repos: - id: check-hooks-apply - id: check-useless-excludes - - repo: https://github.com/ComPWA/repo-maintenance - rev: 0.1.13a6 + - repo: https://github.com/ComPWA/policy + rev: 0.2.0 hooks: - id: check-dev-files args: From 13ed9c34529d613408b180bf2631bbc7a2422990 Mon Sep 17 00:00:00 2001 From: GitHub Date: Fri, 12 Jan 2024 17:34:51 +0000 Subject: [PATCH 24/24] MAINT: update pip constraints and pre-commit --- .constraints/py3.10.txt | 6 +++--- .constraints/py3.11.txt | 6 +++--- .constraints/py3.12.txt | 6 +++--- .constraints/py3.8.txt | 6 +++--- .constraints/py3.9.txt | 6 +++--- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.constraints/py3.10.txt b/.constraints/py3.10.txt index 3406bbd..3f0d81c 100644 --- a/.constraints/py3.10.txt +++ b/.constraints/py3.10.txt @@ -128,7 +128,7 @@ pytest==7.4.4 python-dateutil==2.8.2 python-json-logger==2.0.7 python-lsp-jsonrpc==1.1.2 -python-lsp-ruff==2.0.1 +python-lsp-ruff==2.0.2 python-lsp-server==1.9.0 pytoolconfig==1.3.1 pyyaml==6.0.1 @@ -139,7 +139,7 @@ rfc3339-validator==0.1.4 rfc3986-validator==0.1.1 rope==1.11.0 rpds-py==0.16.2 -ruff==0.1.11 +ruff==0.1.13 send2trash==1.8.2 six==1.16.0 smmap==5.0.1 @@ -167,7 +167,7 @@ terminado==0.18.0 tinycss2==1.2.1 tomli==2.0.1 tornado==6.4 -tox==4.11.4 +tox==4.12.0 traitlets==5.14.1 types-python-dateutil==2.8.19.20240106 typing-extensions==4.9.0 diff --git a/.constraints/py3.11.txt b/.constraints/py3.11.txt index 0073a55..f16a0ce 100644 --- a/.constraints/py3.11.txt +++ b/.constraints/py3.11.txt @@ -127,7 +127,7 @@ pytest==7.4.4 python-dateutil==2.8.2 python-json-logger==2.0.7 python-lsp-jsonrpc==1.1.2 -python-lsp-ruff==2.0.1 +python-lsp-ruff==2.0.2 python-lsp-server==1.9.0 pytoolconfig==1.3.1 pyyaml==6.0.1 @@ -138,7 +138,7 @@ rfc3339-validator==0.1.4 rfc3986-validator==0.1.1 rope==1.11.0 rpds-py==0.16.2 -ruff==0.1.11 +ruff==0.1.13 send2trash==1.8.2 six==1.16.0 smmap==5.0.1 @@ -165,7 +165,7 @@ tabulate==0.9.0 terminado==0.18.0 tinycss2==1.2.1 tornado==6.4 -tox==4.11.4 +tox==4.12.0 traitlets==5.14.1 types-python-dateutil==2.8.19.20240106 typing-extensions==4.9.0 diff --git a/.constraints/py3.12.txt b/.constraints/py3.12.txt index 62e1a7c..7e477c6 100644 --- a/.constraints/py3.12.txt +++ b/.constraints/py3.12.txt @@ -127,7 +127,7 @@ pytest==7.4.4 python-dateutil==2.8.2 python-json-logger==2.0.7 python-lsp-jsonrpc==1.1.2 -python-lsp-ruff==2.0.1 +python-lsp-ruff==2.0.2 python-lsp-server==1.9.0 pytoolconfig==1.3.1 pyyaml==6.0.1 @@ -138,7 +138,7 @@ rfc3339-validator==0.1.4 rfc3986-validator==0.1.1 rope==1.11.0 rpds-py==0.16.2 -ruff==0.1.11 +ruff==0.1.13 send2trash==1.8.2 six==1.16.0 smmap==5.0.1 @@ -165,7 +165,7 @@ tabulate==0.9.0 terminado==0.18.0 tinycss2==1.2.1 tornado==6.4 -tox==4.11.4 +tox==4.12.0 traitlets==5.14.1 types-python-dateutil==2.8.19.20240106 typing-extensions==4.9.0 diff --git a/.constraints/py3.8.txt b/.constraints/py3.8.txt index 6b838ff..7f7ae1b 100644 --- a/.constraints/py3.8.txt +++ b/.constraints/py3.8.txt @@ -132,7 +132,7 @@ pytest==7.4.4 python-dateutil==2.8.2 python-json-logger==2.0.7 python-lsp-jsonrpc==1.1.2 -python-lsp-ruff==2.0.1 +python-lsp-ruff==2.0.2 python-lsp-server==1.9.0 pytoolconfig==1.3.1 pytz==2023.3.post1 @@ -144,7 +144,7 @@ rfc3339-validator==0.1.4 rfc3986-validator==0.1.1 rope==1.11.0 rpds-py==0.16.2 -ruff==0.1.11 +ruff==0.1.13 send2trash==1.8.2 six==1.16.0 smmap==5.0.1 @@ -172,7 +172,7 @@ terminado==0.18.0 tinycss2==1.2.1 tomli==2.0.1 tornado==6.4 -tox==4.11.4 +tox==4.12.0 traitlets==5.14.1 types-python-dateutil==2.8.19.20240106 typing-extensions==4.9.0 diff --git a/.constraints/py3.9.txt b/.constraints/py3.9.txt index 494d2cc..0174ba1 100644 --- a/.constraints/py3.9.txt +++ b/.constraints/py3.9.txt @@ -129,7 +129,7 @@ pytest==7.4.4 python-dateutil==2.8.2 python-json-logger==2.0.7 python-lsp-jsonrpc==1.1.2 -python-lsp-ruff==2.0.1 +python-lsp-ruff==2.0.2 python-lsp-server==1.9.0 pytoolconfig==1.3.1 pyyaml==6.0.1 @@ -140,7 +140,7 @@ rfc3339-validator==0.1.4 rfc3986-validator==0.1.1 rope==1.11.0 rpds-py==0.16.2 -ruff==0.1.11 +ruff==0.1.13 send2trash==1.8.2 six==1.16.0 smmap==5.0.1 @@ -168,7 +168,7 @@ terminado==0.18.0 tinycss2==1.2.1 tomli==2.0.1 tornado==6.4 -tox==4.11.4 +tox==4.12.0 traitlets==5.14.1 types-python-dateutil==2.8.19.20240106 typing-extensions==4.9.0