From 5074d962ffbffcc582bd1870d33fcb95ba5d013a Mon Sep 17 00:00:00 2001 From: Geoff Boeing Date: Mon, 30 Dec 2024 16:51:10 -0700 Subject: [PATCH 1/3] make rtd use requirements-docs.txt directly --- docs/.readthedocs.yaml | 4 ++-- docs/requirements-rtd.txt | 6 ------ environments/requirements/environments.json | 8 -------- 3 files changed, 2 insertions(+), 16 deletions(-) delete mode 100644 docs/requirements-rtd.txt diff --git a/docs/.readthedocs.yaml b/docs/.readthedocs.yaml index 0a10f343..7d5aaa00 100644 --- a/docs/.readthedocs.yaml +++ b/docs/.readthedocs.yaml @@ -9,8 +9,8 @@ formats: all python: install: - - requirements: docs/requirements-rtd.txt + - requirements: ./environments/requirements/requirements-docs.txt sphinx: - configuration: docs/source/conf.py + configuration: ./docs/source/conf.py fail_on_warning: true diff --git a/docs/requirements-rtd.txt b/docs/requirements-rtd.txt deleted file mode 100644 index d6a7e71a..00000000 --- a/docs/requirements-rtd.txt +++ /dev/null @@ -1,6 +0,0 @@ -# Do not edit this file. It is automatically generated by the script -# /environments/make-env-files.py using the environment definition files in -# /environments/requirements/ and the requirements in pyproject.toml. -furo -sphinx-autodoc-typehints -sphinx>=7 diff --git a/environments/requirements/environments.json b/environments/requirements/environments.json index 69b6b6cf..aca993ae 100644 --- a/environments/requirements/environments.json +++ b/environments/requirements/environments.json @@ -25,14 +25,6 @@ "./environments/requirements/requirements-tests.txt" ] }, - { - "output_path": "./docs/requirements-rtd.txt", - "needs_dependencies": false, - "pin_exact": false, - "extras": [ - "./environments/requirements/requirements-docs.txt" - ] - }, { "output_path": "./environments/requirements/requirements-all.txt", "needs_dependencies": true, From d39da35c7ae99a25e8ff2f66c4209489293b768c Mon Sep 17 00:00:00 2001 From: Geoff Boeing Date: Mon, 30 Dec 2024 16:56:51 -0700 Subject: [PATCH 2/3] unquoted strings --- docs/.readthedocs.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/.readthedocs.yaml b/docs/.readthedocs.yaml index 7d5aaa00..1ffe0f7d 100644 --- a/docs/.readthedocs.yaml +++ b/docs/.readthedocs.yaml @@ -1,9 +1,9 @@ version: 2 build: - os: "ubuntu-lts-latest" + os: ubuntu-lts-latest tools: - python: "3" + python: 3 formats: all From 9932379eba1f7a301394a5c6a6e1cb7c80cfe634 Mon Sep 17 00:00:00 2001 From: Geoff Boeing Date: Mon, 30 Dec 2024 16:58:48 -0700 Subject: [PATCH 3/3] quote python version --- docs/.readthedocs.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/.readthedocs.yaml b/docs/.readthedocs.yaml index 1ffe0f7d..1818faa1 100644 --- a/docs/.readthedocs.yaml +++ b/docs/.readthedocs.yaml @@ -3,7 +3,7 @@ version: 2 build: os: ubuntu-lts-latest tools: - python: 3 + python: '3' formats: all