From e1abafb56f8ad33daf06dffc5b069d76b9107b23 Mon Sep 17 00:00:00 2001 From: Charles Tapley Hoyt Date: Thu, 19 Dec 2024 15:52:37 +0100 Subject: [PATCH 01/10] Update .readthedocs.yml --- .readthedocs.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.readthedocs.yml b/.readthedocs.yml index a8659a37..d8cf801b 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -11,6 +11,9 @@ build: - graphviz tools: python: "3.12" + jobs: + pre_create_environment: + - export UV_PREVIEW="1" python: install: From 7fd988739355173871c680107846afab0d94a85d Mon Sep 17 00:00:00 2001 From: Charles Tapley Hoyt Date: Thu, 19 Dec 2024 15:56:42 +0100 Subject: [PATCH 02/10] Update .readthedocs.yml --- .readthedocs.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.readthedocs.yml b/.readthedocs.yml index d8cf801b..f6829aac 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -12,6 +12,7 @@ build: tools: python: "3.12" jobs: + # see https://docs.readthedocs.io/en/stable/build-customization.html#extend-the-build-process pre_create_environment: - export UV_PREVIEW="1" From fcf69aec5068a48b9fe275c5081185d24c4b77ad Mon Sep 17 00:00:00 2001 From: Charles Tapley Hoyt Date: Thu, 19 Dec 2024 16:10:22 +0100 Subject: [PATCH 03/10] Update .readthedocs.yml --- .readthedocs.yml | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/.readthedocs.yml b/.readthedocs.yml index f6829aac..fda438ed 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -6,23 +6,14 @@ version: 2 # Set the version of Python and other tools you might need build: - os: ubuntu-20.04 + os: ubuntu-22.04 apt_packages: - graphviz tools: python: "3.12" - jobs: - # see https://docs.readthedocs.io/en/stable/build-customization.html#extend-the-build-process - pre_create_environment: - - export UV_PREVIEW="1" - -python: - install: - - method: pip - path: . - extra_requirements: - - docs - - pandas - - flask - - fastapi - - rdflib + commands: + - asdf plugin add uv + - asdf install uv latest + - asdf global uv latest + - UV_PREVIEW=1 uv pip install .[docs,pandas,flask,fastapi,rdflib] + - UV_PREVIEW=1 uv run -m sphinx -T -b html -d docs/_build/doctrees -D language=en docs $READTHEDOCS_OUTPUT/html From 05be88ca4626b75eba3553ebf2582a66339ab946 Mon Sep 17 00:00:00 2001 From: Charles Tapley Hoyt Date: Thu, 19 Dec 2024 16:15:36 +0100 Subject: [PATCH 04/10] Update .readthedocs.yml --- .readthedocs.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.readthedocs.yml b/.readthedocs.yml index fda438ed..f109a548 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -11,9 +11,10 @@ build: - graphviz tools: python: "3.12" + # adapted from uv recipe at https://docs.readthedocs.io/en/stable/build-customization.html#install-dependencies-with-uv commands: - asdf plugin add uv - asdf install uv latest - asdf global uv latest - - UV_PREVIEW=1 uv pip install .[docs,pandas,flask,fastapi,rdflib] - - UV_PREVIEW=1 uv run -m sphinx -T -b html -d docs/_build/doctrees -D language=en docs $READTHEDOCS_OUTPUT/html + - VIRTUAL_ENV=$READTHEDOCS_VIRTUALENV_PATH UV_PREVIEW=1 uv pip install .[docs,pandas,flask,fastapi,rdflib] + - VIRTUAL_ENV=$READTHEDOCS_VIRTUALENV_PATH UV_PREVIEW=1 uv run -m sphinx -T -b html -d docs/_build/doctrees -D language=en docs $READTHEDOCS_OUTPUT/html From e531abd4bee8d0ef7465c25dae08d344e7c85973 Mon Sep 17 00:00:00 2001 From: Charles Tapley Hoyt Date: Thu, 19 Dec 2024 16:17:54 +0100 Subject: [PATCH 05/10] Update .readthedocs.yml --- .readthedocs.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.readthedocs.yml b/.readthedocs.yml index f109a548..e53c639b 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -16,5 +16,6 @@ build: - asdf plugin add uv - asdf install uv latest - asdf global uv latest - - VIRTUAL_ENV=$READTHEDOCS_VIRTUALENV_PATH UV_PREVIEW=1 uv pip install .[docs,pandas,flask,fastapi,rdflib] - - VIRTUAL_ENV=$READTHEDOCS_VIRTUALENV_PATH UV_PREVIEW=1 uv run -m sphinx -T -b html -d docs/_build/doctrees -D language=en docs $READTHEDOCS_OUTPUT/html + - uv venv + - UV_PREVIEW=1 uv pip install .[docs,pandas,flask,fastapi,rdflib] + - UV_PREVIEW=1 uv run -m sphinx -T -b html -d docs/_build/doctrees -D language=en docs $READTHEDOCS_OUTPUT/html From c212fcc93ea55666e9dea9789e415685f5d07e38 Mon Sep 17 00:00:00 2001 From: Charles Tapley Hoyt Date: Thu, 19 Dec 2024 16:20:18 +0100 Subject: [PATCH 06/10] Update .readthedocs.yml --- .readthedocs.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.readthedocs.yml b/.readthedocs.yml index e53c639b..ae11ea0a 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -16,6 +16,6 @@ build: - asdf plugin add uv - asdf install uv latest - asdf global uv latest - - uv venv - - UV_PREVIEW=1 uv pip install .[docs,pandas,flask,fastapi,rdflib] - - UV_PREVIEW=1 uv run -m sphinx -T -b html -d docs/_build/doctrees -D language=en docs $READTHEDOCS_OUTPUT/html + - uv venv $READTHEDOCS_VIRTUALENV_PATH + - VIRTUAL_ENV=$READTHEDOCS_VIRTUALENV_PATH UV_PREVIEW=1 uv pip install .[docs,pandas,flask,fastapi,rdflib] + - VIRTUAL_ENV=$READTHEDOCS_VIRTUALENV_PATH UV_PREVIEW=1 uv run -m sphinx -T -b html -d docs/_build/doctrees -D language=en docs $READTHEDOCS_OUTPUT/html From d900abcb121aaa6b0cb61837ad9dea6c9fc15c57 Mon Sep 17 00:00:00 2001 From: Charles Tapley Hoyt Date: Thu, 19 Dec 2024 16:23:58 +0100 Subject: [PATCH 07/10] Update .readthedocs.yml --- .readthedocs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.readthedocs.yml b/.readthedocs.yml index ae11ea0a..0d43b88d 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -18,4 +18,4 @@ build: - asdf global uv latest - uv venv $READTHEDOCS_VIRTUALENV_PATH - VIRTUAL_ENV=$READTHEDOCS_VIRTUALENV_PATH UV_PREVIEW=1 uv pip install .[docs,pandas,flask,fastapi,rdflib] - - VIRTUAL_ENV=$READTHEDOCS_VIRTUALENV_PATH UV_PREVIEW=1 uv run -m sphinx -T -b html -d docs/_build/doctrees -D language=en docs $READTHEDOCS_OUTPUT/html + - python -m sphinx -T -b html -d docs/_build/doctrees -D language=en docs $READTHEDOCS_OUTPUT/html From b3b194e8ae8ac52aff78b81e3a9bbb2bf82e2415 Mon Sep 17 00:00:00 2001 From: Charles Tapley Hoyt Date: Thu, 19 Dec 2024 16:24:56 +0100 Subject: [PATCH 08/10] Update .readthedocs.yml --- .readthedocs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.readthedocs.yml b/.readthedocs.yml index 0d43b88d..8ef3f688 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -18,4 +18,4 @@ build: - asdf global uv latest - uv venv $READTHEDOCS_VIRTUALENV_PATH - VIRTUAL_ENV=$READTHEDOCS_VIRTUALENV_PATH UV_PREVIEW=1 uv pip install .[docs,pandas,flask,fastapi,rdflib] - - python -m sphinx -T -b html -d docs/_build/doctrees -D language=en docs $READTHEDOCS_OUTPUT/html + - python -m sphinx -T -b html -d docs/_build/doctrees -D language=en docs/source $READTHEDOCS_OUTPUT/html From b0047712cfb26330eaa0a88585b93bce33ce78ef Mon Sep 17 00:00:00 2001 From: Charles Tapley Hoyt Date: Thu, 19 Dec 2024 16:25:56 +0100 Subject: [PATCH 09/10] Update .readthedocs.yml --- .readthedocs.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.readthedocs.yml b/.readthedocs.yml index 8ef3f688..f85430ba 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -11,7 +11,9 @@ build: - graphviz tools: python: "3.12" + # adapted from uv recipe at https://docs.readthedocs.io/en/stable/build-customization.html#install-dependencies-with-uv + # and comment at https://github.com/readthedocs/readthedocs.org/issues/11289#issuecomment-2103832834 commands: - asdf plugin add uv - asdf install uv latest From 29b195a13f4511ff1d0151f6eaab03e62ecdb422 Mon Sep 17 00:00:00 2001 From: Charles Tapley Hoyt Date: Thu, 19 Dec 2024 16:32:40 +0100 Subject: [PATCH 10/10] Update .cruft.json --- .cruft.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cruft.json b/.cruft.json index 3fa06c03..c2bc44b2 100644 --- a/.cruft.json +++ b/.cruft.json @@ -1,6 +1,6 @@ { "template": "https://github.com/cthoyt/cookiecutter-snekpack", - "commit": "11d08a77559cd6c2e69a243d491d99522c5a6454", + "commit": "e3a8928186124d29d96565e16894fae924b067f9", "checkout": null, "context": { "cookiecutter": {