From d28c7e35b589810909e3664afc1bad49723277f5 Mon Sep 17 00:00:00 2001 From: Myk Taylor Date: Fri, 12 Jan 2024 21:59:25 -0800 Subject: [PATCH 1/2] Revert "unpin sphinx for the readthedocs CI build" This reverts commit e07b1189cb8fef743e0a51f6f6da7496558c2d97. --- .readthedocs.requirements.txt | 1 + .readthedocs.yml | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 .readthedocs.requirements.txt diff --git a/.readthedocs.requirements.txt b/.readthedocs.requirements.txt new file mode 100644 index 0000000000..1f028de414 --- /dev/null +++ b/.readthedocs.requirements.txt @@ -0,0 +1 @@ +sphinx==4.4.0 diff --git a/.readthedocs.yml b/.readthedocs.yml index 78bd2e80ac..e66d3da1b1 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -5,7 +5,7 @@ version: 2 build: - os: ubuntu-22.04 + os: ubuntu-20.04 tools: python: "3" @@ -16,3 +16,7 @@ sphinx: configuration: conf.py formats: all + +python: + install: + - requirements: .readthedocs.requirements.txt From e90de0deaa860b55c3347589dd23eca0f0793315 Mon Sep 17 00:00:00 2001 From: Myk Taylor Date: Fri, 12 Jan 2024 22:00:01 -0800 Subject: [PATCH 2/2] re-add files for future readthedocs version pins --- .readthedocs.requirements.txt | 1 - .readthedocs.yml | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.readthedocs.requirements.txt b/.readthedocs.requirements.txt index 1f028de414..e69de29bb2 100644 --- a/.readthedocs.requirements.txt +++ b/.readthedocs.requirements.txt @@ -1 +0,0 @@ -sphinx==4.4.0 diff --git a/.readthedocs.yml b/.readthedocs.yml index e66d3da1b1..bf71c46b78 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -5,7 +5,7 @@ version: 2 build: - os: ubuntu-20.04 + os: ubuntu-22.04 tools: python: "3"