From 24da090b596fb72a1e1d965640e83ae946cb070e Mon Sep 17 00:00:00 2001 From: Remco de Boer <29308176+redeboer@users.noreply.github.com> Date: Sun, 26 May 2024 09:01:11 +0200 Subject: [PATCH] FIX: install `pip` packages on RTD with new `uv` install syntax (#134) * DX: downgrade `sphinx-autobuild` * MAINT: update pip constraints and pre-commit --------- Co-authored-by: GitHub Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .constraints/py3.10.txt | 27 ++++++++++++--------------- .constraints/py3.11.txt | 27 ++++++++++++--------------- .constraints/py3.12.txt | 27 ++++++++++++--------------- .constraints/py3.8.txt | 17 ++++++++--------- .constraints/py3.9.txt | 27 ++++++++++++--------------- .pre-commit-config.yaml | 8 ++++---- .readthedocs.yml | 5 ++--- pyproject.toml | 1 + 8 files changed, 63 insertions(+), 76 deletions(-) diff --git a/.constraints/py3.10.txt b/.constraints/py3.10.txt index 45d91c23..0f16e540 100644 --- a/.constraints/py3.10.txt +++ b/.constraints/py3.10.txt @@ -3,7 +3,7 @@ absl-py==2.1.0 accessible-pygments==0.0.5 alabaster==0.7.16 -ampform==0.15.3 +ampform==0.15.4 anyio==4.3.0 argon2-cffi==23.1.0 argon2-cffi-bindings==21.2.0 @@ -43,7 +43,7 @@ executing==2.0.1 fastjsonschema==2.19.1 filelock==3.14.0 flatbuffers==24.3.25 -fonttools==4.51.0 +fonttools==4.52.1 fqdn==1.5.1 gast==0.5.4 gitdb==4.0.11 @@ -79,25 +79,26 @@ jsonpointer==2.4 jsonschema==4.22.0 jsonschema-specifications==2023.12.1 jupyter-cache==1.0.0 -jupyter-client==8.6.1 +jupyter-client==8.6.2 jupyter-core==5.7.2 jupyter-events==0.10.0 jupyter-lsp==2.2.5 jupyter-server==2.14.0 jupyter-server-mathjax==0.2.6 jupyter-server-terminals==0.5.3 -jupyterlab==4.2.0 +jupyterlab==4.2.1 jupyterlab-code-formatter==2.2.1 jupyterlab-git==0.50.1 jupyterlab-lsp==5.1.0 jupyterlab-myst==2.4.2 jupyterlab-pygments==0.3.0 -jupyterlab-server==2.27.1 +jupyterlab-server==2.27.2 jupyterlab-widgets==3.0.10 keras==3.3.3 kiwisolver==1.4.5 latexcodec==3.0.0 libclang==18.1.1 +livereload==2.6.3 llvmlite==0.42.0 lsprotocol==2023.0.1 markdown==3.6 @@ -166,14 +167,14 @@ pyyaml==6.0.1 pyzmq==26.0.3 qrules==0.10.2 referencing==0.35.1 -requests==2.32.1 +requests==2.32.2 rfc3339-validator==0.1.4 rfc3986-validator==0.1.1 rich==13.7.1 rope==1.13.0 rpds-py==0.18.1 -ruff==0.4.4 -scipy==1.13.0 +ruff==0.4.5 +scipy==1.13.1 send2trash==1.8.3 six==1.16.0 smmap==5.0.1 @@ -182,11 +183,11 @@ snowballstemmer==2.2.0 soupsieve==2.5 sphinx==7.3.7 sphinx-api-relink==0.0.9 -sphinx-autobuild==2024.4.16 +sphinx-autobuild==2024.2.4 sphinx-book-theme==1.1.2 sphinx-codeautolink==0.15.1 sphinx-copybutton==0.5.2 -sphinx-design==0.5.0 +sphinx-design==0.6.0 sphinx-pybtex-etal-style==0.0.2 sphinx-togglebutton==0.3.2 sphinxcontrib-applehelp==1.0.8 @@ -198,7 +199,6 @@ sphinxcontrib-qthelp==1.0.7 sphinxcontrib-serializinghtml==1.1.10 sqlalchemy==2.0.30 stack-data==0.6.3 -starlette==0.37.2 sympy==1.12 tabulate==0.9.0 tensorboard==2.16.2 @@ -216,18 +216,15 @@ tox==4.15.0 tqdm==4.66.4 traitlets==5.14.3 types-python-dateutil==2.9.0.20240316 -typing-extensions==4.11.0 +typing-extensions==4.12.0 ujson==5.10.0 uri-template==1.3.0 urllib3==2.2.1 -uvicorn==0.29.0 virtualenv==20.26.2 -watchfiles==0.21.0 wcwidth==0.2.13 webcolors==1.13 webencodings==0.5.1 websocket-client==1.8.0 -websockets==12.0 werkzeug==3.0.3 wheel==0.43.0 widgetsnbextension==4.0.10 diff --git a/.constraints/py3.11.txt b/.constraints/py3.11.txt index 856bdcbb..1dede6c5 100644 --- a/.constraints/py3.11.txt +++ b/.constraints/py3.11.txt @@ -3,7 +3,7 @@ absl-py==2.1.0 accessible-pygments==0.0.5 alabaster==0.7.16 -ampform==0.15.3 +ampform==0.15.4 anyio==4.3.0 argon2-cffi==23.1.0 argon2-cffi-bindings==21.2.0 @@ -42,7 +42,7 @@ executing==2.0.1 fastjsonschema==2.19.1 filelock==3.14.0 flatbuffers==24.3.25 -fonttools==4.51.0 +fonttools==4.52.1 fqdn==1.5.1 gast==0.5.4 gitdb==4.0.11 @@ -78,25 +78,26 @@ jsonpointer==2.4 jsonschema==4.22.0 jsonschema-specifications==2023.12.1 jupyter-cache==1.0.0 -jupyter-client==8.6.1 +jupyter-client==8.6.2 jupyter-core==5.7.2 jupyter-events==0.10.0 jupyter-lsp==2.2.5 jupyter-server==2.14.0 jupyter-server-mathjax==0.2.6 jupyter-server-terminals==0.5.3 -jupyterlab==4.2.0 +jupyterlab==4.2.1 jupyterlab-code-formatter==2.2.1 jupyterlab-git==0.50.1 jupyterlab-lsp==5.1.0 jupyterlab-myst==2.4.2 jupyterlab-pygments==0.3.0 -jupyterlab-server==2.27.1 +jupyterlab-server==2.27.2 jupyterlab-widgets==3.0.10 keras==3.3.3 kiwisolver==1.4.5 latexcodec==3.0.0 libclang==18.1.1 +livereload==2.6.3 llvmlite==0.42.0 lsprotocol==2023.0.1 markdown==3.6 @@ -165,14 +166,14 @@ pyyaml==6.0.1 pyzmq==26.0.3 qrules==0.10.2 referencing==0.35.1 -requests==2.32.1 +requests==2.32.2 rfc3339-validator==0.1.4 rfc3986-validator==0.1.1 rich==13.7.1 rope==1.13.0 rpds-py==0.18.1 -ruff==0.4.4 -scipy==1.13.0 +ruff==0.4.5 +scipy==1.13.1 send2trash==1.8.3 six==1.16.0 smmap==5.0.1 @@ -181,11 +182,11 @@ snowballstemmer==2.2.0 soupsieve==2.5 sphinx==7.3.7 sphinx-api-relink==0.0.9 -sphinx-autobuild==2024.4.16 +sphinx-autobuild==2024.2.4 sphinx-book-theme==1.1.2 sphinx-codeautolink==0.15.1 sphinx-copybutton==0.5.2 -sphinx-design==0.5.0 +sphinx-design==0.6.0 sphinx-pybtex-etal-style==0.0.2 sphinx-togglebutton==0.3.2 sphinxcontrib-applehelp==1.0.8 @@ -197,7 +198,6 @@ sphinxcontrib-qthelp==1.0.7 sphinxcontrib-serializinghtml==1.1.10 sqlalchemy==2.0.30 stack-data==0.6.3 -starlette==0.37.2 sympy==1.12 tabulate==0.9.0 tensorboard==2.16.2 @@ -214,18 +214,15 @@ tox==4.15.0 tqdm==4.66.4 traitlets==5.14.3 types-python-dateutil==2.9.0.20240316 -typing-extensions==4.11.0 +typing-extensions==4.12.0 ujson==5.10.0 uri-template==1.3.0 urllib3==2.2.1 -uvicorn==0.29.0 virtualenv==20.26.2 -watchfiles==0.21.0 wcwidth==0.2.13 webcolors==1.13 webencodings==0.5.1 websocket-client==1.8.0 -websockets==12.0 werkzeug==3.0.3 wheel==0.43.0 widgetsnbextension==4.0.10 diff --git a/.constraints/py3.12.txt b/.constraints/py3.12.txt index c5d58763..ad09be9b 100644 --- a/.constraints/py3.12.txt +++ b/.constraints/py3.12.txt @@ -3,7 +3,7 @@ absl-py==2.1.0 accessible-pygments==0.0.5 alabaster==0.7.16 -ampform==0.15.3 +ampform==0.15.4 anyio==4.3.0 argon2-cffi==23.1.0 argon2-cffi-bindings==21.2.0 @@ -42,7 +42,7 @@ executing==2.0.1 fastjsonschema==2.19.1 filelock==3.14.0 flatbuffers==24.3.25 -fonttools==4.51.0 +fonttools==4.52.1 fqdn==1.5.1 gast==0.5.4 gitdb==4.0.11 @@ -78,25 +78,26 @@ jsonpointer==2.4 jsonschema==4.22.0 jsonschema-specifications==2023.12.1 jupyter-cache==1.0.0 -jupyter-client==8.6.1 +jupyter-client==8.6.2 jupyter-core==5.7.2 jupyter-events==0.10.0 jupyter-lsp==2.2.5 jupyter-server==2.14.0 jupyter-server-mathjax==0.2.6 jupyter-server-terminals==0.5.3 -jupyterlab==4.2.0 +jupyterlab==4.2.1 jupyterlab-code-formatter==2.2.1 jupyterlab-git==0.50.1 jupyterlab-lsp==5.1.0 jupyterlab-myst==2.4.2 jupyterlab-pygments==0.3.0 -jupyterlab-server==2.27.1 +jupyterlab-server==2.27.2 jupyterlab-widgets==3.0.10 keras==3.3.3 kiwisolver==1.4.5 latexcodec==3.0.0 libclang==18.1.1 +livereload==2.6.3 llvmlite==0.42.0 lsprotocol==2023.0.1 markdown==3.6 @@ -165,14 +166,14 @@ pyyaml==6.0.1 pyzmq==26.0.3 qrules==0.10.2 referencing==0.35.1 -requests==2.32.1 +requests==2.32.2 rfc3339-validator==0.1.4 rfc3986-validator==0.1.1 rich==13.7.1 rope==1.13.0 rpds-py==0.18.1 -ruff==0.4.4 -scipy==1.13.0 +ruff==0.4.5 +scipy==1.13.1 send2trash==1.8.3 six==1.16.0 smmap==5.0.1 @@ -181,11 +182,11 @@ snowballstemmer==2.2.0 soupsieve==2.5 sphinx==7.3.7 sphinx-api-relink==0.0.9 -sphinx-autobuild==2024.4.16 +sphinx-autobuild==2024.2.4 sphinx-book-theme==1.1.2 sphinx-codeautolink==0.15.1 sphinx-copybutton==0.5.2 -sphinx-design==0.5.0 +sphinx-design==0.6.0 sphinx-pybtex-etal-style==0.0.2 sphinx-togglebutton==0.3.2 sphinxcontrib-applehelp==1.0.8 @@ -197,7 +198,6 @@ sphinxcontrib-qthelp==1.0.7 sphinxcontrib-serializinghtml==1.1.10 sqlalchemy==2.0.30 stack-data==0.6.3 -starlette==0.37.2 sympy==1.12 tabulate==0.9.0 tensorboard==2.16.2 @@ -213,18 +213,15 @@ tox==4.15.0 tqdm==4.66.4 traitlets==5.14.3 types-python-dateutil==2.9.0.20240316 -typing-extensions==4.11.0 +typing-extensions==4.12.0 ujson==5.10.0 uri-template==1.3.0 urllib3==2.2.1 -uvicorn==0.29.0 virtualenv==20.26.2 -watchfiles==0.21.0 wcwidth==0.2.13 webcolors==1.13 webencodings==0.5.1 websocket-client==1.8.0 -websockets==12.0 werkzeug==3.0.3 wheel==0.43.0 widgetsnbextension==4.0.10 diff --git a/.constraints/py3.8.txt b/.constraints/py3.8.txt index dc62b24a..9bd86339 100644 --- a/.constraints/py3.8.txt +++ b/.constraints/py3.8.txt @@ -3,7 +3,7 @@ absl-py==2.1.0 accessible-pygments==0.0.4 alabaster==0.7.13 -ampform==0.15.3 +ampform==0.15.4 anyio==4.3.0 argon2-cffi==23.1.0 argon2-cffi-bindings==21.2.0 @@ -44,7 +44,7 @@ executing==2.0.1 fastjsonschema==2.19.1 filelock==3.14.0 flatbuffers==24.3.25 -fonttools==4.51.0 +fonttools==4.52.1 fqdn==1.5.1 gast==0.4.0 gitdb==4.0.11 @@ -83,20 +83,20 @@ jsonpointer==2.4 jsonschema==4.22.0 jsonschema-specifications==2023.12.1 jupyter-cache==0.6.1 -jupyter-client==8.6.1 +jupyter-client==8.6.2 jupyter-core==5.7.2 jupyter-events==0.10.0 jupyter-lsp==2.2.5 jupyter-server==2.14.0 jupyter-server-mathjax==0.2.6 jupyter-server-terminals==0.5.3 -jupyterlab==4.2.0 +jupyterlab==4.2.1 jupyterlab-code-formatter==2.2.1 jupyterlab-git==0.50.1 jupyterlab-lsp==5.1.0 jupyterlab-myst==2.4.2 jupyterlab-pygments==0.3.0 -jupyterlab-server==2.27.1 +jupyterlab-server==2.27.2 jupyterlab-widgets==3.0.10 keras==2.11.0 kiwisolver==1.4.5 @@ -136,7 +136,6 @@ packaging==24.0 pandocfilters==1.5.1 parso==0.8.4 particle==0.24.0 -pathlib2==2.3.7.post1 pathspec==0.12.1 pexpect==4.9.0 phasespace==1.9.0 @@ -176,14 +175,14 @@ pyyaml==6.0.1 pyzmq==26.0.3 qrules==0.10.2 referencing==0.35.1 -requests==2.32.1 +requests==2.32.2 requests-oauthlib==2.0.0 rfc3339-validator==0.1.4 rfc3986-validator==0.1.1 rope==1.13.0 rpds-py==0.18.1 rsa==4.9 -ruff==0.4.4 +ruff==0.4.5 scipy==1.10.1 send2trash==1.8.3 six==1.16.0 @@ -228,7 +227,7 @@ tox==4.15.0 tqdm==4.66.4 traitlets==5.14.3 types-python-dateutil==2.9.0.20240316 -typing-extensions==4.11.0 +typing-extensions==4.12.0 ujson==5.10.0 uri-template==1.3.0 urllib3==2.2.1 diff --git a/.constraints/py3.9.txt b/.constraints/py3.9.txt index d41bd3d3..48632b37 100644 --- a/.constraints/py3.9.txt +++ b/.constraints/py3.9.txt @@ -3,7 +3,7 @@ absl-py==2.1.0 accessible-pygments==0.0.5 alabaster==0.7.16 -ampform==0.15.3 +ampform==0.15.4 anyio==4.3.0 argon2-cffi==23.1.0 argon2-cffi-bindings==21.2.0 @@ -43,7 +43,7 @@ executing==2.0.1 fastjsonschema==2.19.1 filelock==3.14.0 flatbuffers==24.3.25 -fonttools==4.51.0 +fonttools==4.52.1 fqdn==1.5.1 gast==0.5.4 gitdb==4.0.11 @@ -80,25 +80,26 @@ jsonpointer==2.4 jsonschema==4.22.0 jsonschema-specifications==2023.12.1 jupyter-cache==1.0.0 -jupyter-client==8.6.1 +jupyter-client==8.6.2 jupyter-core==5.7.2 jupyter-events==0.10.0 jupyter-lsp==2.2.5 jupyter-server==2.14.0 jupyter-server-mathjax==0.2.6 jupyter-server-terminals==0.5.3 -jupyterlab==4.2.0 +jupyterlab==4.2.1 jupyterlab-code-formatter==2.2.1 jupyterlab-git==0.50.1 jupyterlab-lsp==5.1.0 jupyterlab-myst==2.4.2 jupyterlab-pygments==0.3.0 -jupyterlab-server==2.27.1 +jupyterlab-server==2.27.2 jupyterlab-widgets==3.0.10 keras==3.3.3 kiwisolver==1.4.5 latexcodec==3.0.0 libclang==18.1.1 +livereload==2.6.3 llvmlite==0.42.0 lsprotocol==2023.0.1 markdown==3.6 @@ -167,14 +168,14 @@ pyyaml==6.0.1 pyzmq==26.0.3 qrules==0.10.2 referencing==0.35.1 -requests==2.32.1 +requests==2.32.2 rfc3339-validator==0.1.4 rfc3986-validator==0.1.1 rich==13.7.1 rope==1.13.0 rpds-py==0.18.1 -ruff==0.4.4 -scipy==1.13.0 +ruff==0.4.5 +scipy==1.13.1 send2trash==1.8.3 six==1.16.0 smmap==5.0.1 @@ -183,11 +184,11 @@ snowballstemmer==2.2.0 soupsieve==2.5 sphinx==7.3.7 sphinx-api-relink==0.0.9 -sphinx-autobuild==2024.4.16 +sphinx-autobuild==2024.2.4 sphinx-book-theme==1.1.2 sphinx-codeautolink==0.15.1 sphinx-copybutton==0.5.2 -sphinx-design==0.5.0 +sphinx-design==0.6.0 sphinx-pybtex-etal-style==0.0.2 sphinx-togglebutton==0.3.2 sphinxcontrib-applehelp==1.0.8 @@ -199,7 +200,6 @@ sphinxcontrib-qthelp==1.0.7 sphinxcontrib-serializinghtml==1.1.10 sqlalchemy==2.0.30 stack-data==0.6.3 -starlette==0.37.2 sympy==1.12 tabulate==0.9.0 tensorboard==2.16.2 @@ -217,18 +217,15 @@ tox==4.15.0 tqdm==4.66.4 traitlets==5.14.3 types-python-dateutil==2.9.0.20240316 -typing-extensions==4.11.0 +typing-extensions==4.12.0 ujson==5.10.0 uri-template==1.3.0 urllib3==2.2.1 -uvicorn==0.29.0 virtualenv==20.26.2 -watchfiles==0.21.0 wcwidth==0.2.13 webcolors==1.13 webencodings==0.5.1 websocket-client==1.8.0 -websockets==12.0 werkzeug==3.0.3 wheel==0.43.0 widgetsnbextension==4.0.10 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 054ed876..5ca05f57 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -41,7 +41,7 @@ repos: metadata.vscode - repo: https://github.com/ComPWA/policy - rev: 0.3.8 + rev: 0.3.9 hooks: - id: check-dev-files args: @@ -54,7 +54,7 @@ repos: - id: colab-toc-visible - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.4.4 + rev: v0.4.5 hooks: - id: ruff args: [--fix] @@ -95,7 +95,7 @@ repos: - --in-place - repo: https://github.com/streetsidesoftware/cspell-cli - rev: v8.8.1 + rev: v8.8.2 hooks: - id: cspell @@ -121,6 +121,6 @@ repos: - python - repo: https://github.com/ComPWA/mirrors-pyright - rev: v1.1.363 + rev: v1.1.364 hooks: - id: pyright diff --git a/.readthedocs.yml b/.readthedocs.yml index eebab3b2..4cf45a5c 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -16,6 +16,5 @@ build: - graphviz jobs: post_install: - - curl -LsSf https://astral.sh/uv/install.sh | sh - - |- - /home/docs/.cargo/bin/uv pip install --system -c .constraints/py3.9.txt -e .[doc] + - python -m pip install 'uv>=0.2.0' + - python -m uv pip install -c .constraints/py3.9.txt -e .[doc] diff --git a/pyproject.toml b/pyproject.toml index afaff4e9..c358026b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -45,6 +45,7 @@ dev = [ "ampform-dpd[jupyter]", "ampform-dpd[sty]", "ampform-dpd[test]", + "sphinx-autobuild!=2024.04.*", "sphinx-autobuild", "tox >=1.9", # for skip_install, use_develop ]