From 9d7f0aeca9248db5227c5a42e7f62262828c7f7b Mon Sep 17 00:00:00 2001 From: jakirkham Date: Wed, 19 Oct 2022 17:33:48 -0700 Subject: [PATCH 1/6] Move `readthedocs.yml` to `.readthedocs.yml` --- readthedocs.yml => .readthedocs.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename readthedocs.yml => .readthedocs.yml (100%) diff --git a/readthedocs.yml b/.readthedocs.yml similarity index 100% rename from readthedocs.yml rename to .readthedocs.yml From 293cd16f9eb37f3a33ab12a161490974c6b689ac Mon Sep 17 00:00:00 2001 From: jakirkham Date: Wed, 19 Oct 2022 17:33:48 -0700 Subject: [PATCH 2/6] Update RTD config to version 2 --- .readthedocs.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.readthedocs.yml b/.readthedocs.yml index e87e3eb4..a271a41b 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -1,2 +1,7 @@ +version: 2 + +sphinx: + configuration: docs/conf.py + conda: - file: environment_doc.yml + environment: environment_doc.yml From fb0113ee583ee4cda66fbdce77c975bfdbdafbb0 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Wed, 19 Oct 2022 17:33:49 -0700 Subject: [PATCH 3/6] Use Mambaforge on RTD --- .readthedocs.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.readthedocs.yml b/.readthedocs.yml index a271a41b..a629c8d4 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -1,5 +1,10 @@ version: 2 +build: + os: ubuntu-22.04 + tools: + python: "mambaforge-4.10" + sphinx: configuration: docs/conf.py From 5b8997574a025130eb1cadcb2fd74d1bda004b48 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Wed, 19 Oct 2022 17:33:50 -0700 Subject: [PATCH 4/6] Consolidate doc environment file w/others Make it easier to keep all of these environment files up-to-date together. --- .readthedocs.yml | 2 +- CONTRIBUTING.rst | 2 +- .../environment-doc.yml | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename environment_doc.yml => continuous_integration/environment-doc.yml (100%) diff --git a/.readthedocs.yml b/.readthedocs.yml index a629c8d4..b0a2a0d0 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -9,4 +9,4 @@ sphinx: configuration: docs/conf.py conda: - environment: environment_doc.yml + environment: continuous_integration/environment-doc.yml diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index e5511b11..3789f7d1 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -47,7 +47,7 @@ conda environment for building the dask-image documentation: .. code-block:: console - $ conda env create -f environment_doc.yml + $ conda env create -f continuous_integration/environment-doc.yml $ conda activate dask_image_doc_env This conda environment contains dask-image and its dependencies, sphinx, diff --git a/environment_doc.yml b/continuous_integration/environment-doc.yml similarity index 100% rename from environment_doc.yml rename to continuous_integration/environment-doc.yml From 5be131826c62b627671153690486e5848da6cf51 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Wed, 19 Oct 2022 17:33:50 -0700 Subject: [PATCH 5/6] Refresh doc environment using Python 3.8 --- continuous_integration/environment-doc.yml | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/continuous_integration/environment-doc.yml b/continuous_integration/environment-doc.yml index e8e73306..d79a64f8 100644 --- a/continuous_integration/environment-doc.yml +++ b/continuous_integration/environment-doc.yml @@ -4,14 +4,16 @@ channels: - conda-forge dependencies: - - pip==20.2.4 - - wheel==0.35.1 - - sphinx==3.2.1 - - jinja2<3.1 + - python=3.8.* + - pip==22.0.3 + - wheel==0.37.1 + - sphinx==5.3.0 + - jinja2==3.1.2 - dask==2.8.1 - - numpy==1.15.4 - - pims==0.4.1 - - slicerator==0.9.8 + - numpy==1.22.2 + - scipy==1.8.0 + - scikit-image==0.19.1 + - pims==0.5 + - slicerator==1.0.0 - pip: - - slicerator==0.9.8 - dask-sphinx-theme>=3.0.0 From 49fe2db32ddc9563ac1da86de7ef87e7768f2f19 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Wed, 19 Oct 2022 17:33:51 -0700 Subject: [PATCH 6/6] Refresh environment pins --- continuous_integration/environment-doc.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/continuous_integration/environment-doc.yml b/continuous_integration/environment-doc.yml index d79a64f8..72c4f6a5 100644 --- a/continuous_integration/environment-doc.yml +++ b/continuous_integration/environment-doc.yml @@ -5,15 +5,15 @@ channels: dependencies: - python=3.8.* - - pip==22.0.3 + - pip==22.3 - wheel==0.37.1 - sphinx==5.3.0 - jinja2==3.1.2 - dask==2.8.1 - - numpy==1.22.2 - - scipy==1.8.0 - - scikit-image==0.19.1 - - pims==0.5 - - slicerator==1.0.0 + - numpy==1.23.4 + - scipy==1.9.2 + - scikit-image==0.19.3 + - pims==0.6.1 + - slicerator==1.1.0 - pip: - dask-sphinx-theme>=3.0.0