From 5c0cf517d85596551d7ab61456dbca07c602c021 Mon Sep 17 00:00:00 2001 From: Calum Chamberlain Date: Sun, 22 Oct 2023 08:25:23 +1300 Subject: [PATCH 1/3] Update .readthedocs.yml build config --- .readthedocs.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.readthedocs.yml b/.readthedocs.yml index b02ec1eb9..a5566b08e 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -5,20 +5,22 @@ # Required version: 2 +# Set the build OS and any other tools needed +build: + os: ubuntu-22.04 + tools: + python: "3.10" + # Build documentation in the docs/ directory with Sphinx sphinx: configuration: eqcorrscan/doc/conf.py -# Build documentation with MkDocs -#mkdocs: -# configuration: mkdocs.yml - # Optionally build your docs in additional formats such as PDF and ePub formats: all # Optionally set the version of Python and requirements required to build your docs python: - version: 3.7 + version: "3.10" install: - requirements: eqcorrscan/doc/requirements.txt - requirements: requirements.txt From 02993a3098e3e8c6b731dc89e643170178f33865 Mon Sep 17 00:00:00 2001 From: Calum Chamberlain Date: Sun, 22 Oct 2023 08:28:46 +1300 Subject: [PATCH 2/3] Specify python version once --- .readthedocs.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.readthedocs.yml b/.readthedocs.yml index a5566b08e..63dcc2610 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -20,7 +20,6 @@ formats: all # Optionally set the version of Python and requirements required to build your docs python: - version: "3.10" install: - requirements: eqcorrscan/doc/requirements.txt - requirements: requirements.txt From bd4027d6c9b6f8e3bdf8134858c3cc619844a7bf Mon Sep 17 00:00:00 2001 From: Calum Chamberlain Date: Sun, 22 Oct 2023 08:32:51 +1300 Subject: [PATCH 3/3] Update requirements.txt (mock) --- eqcorrscan/doc/requirements.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/eqcorrscan/doc/requirements.txt b/eqcorrscan/doc/requirements.txt index 4719c27b1..498b7ac46 100644 --- a/eqcorrscan/doc/requirements.txt +++ b/eqcorrscan/doc/requirements.txt @@ -1,7 +1,9 @@ matplotlib +mock +# Note that mock is replaced by unittest.mock now, and we should update the test code to use this nbsphinx sphinx>=1.5.1 sphinx_bootstrap_theme # have to pin otherwise RTD fails # see https://github.com/readthedocs/readthedocs.org/issues/7492 -Pygments==2.7.4 \ No newline at end of file +Pygments==2.7.4