From 17875cdfedf3b48112eda72d113477878bb73b39 Mon Sep 17 00:00:00 2001 From: Pete Peterson Date: Fri, 17 Jun 2022 10:02:53 -0400 Subject: [PATCH 1/2] Change how readthedocs is configured --- .readthedocs.yaml | 16 ++++++++++++++++ src/requirements_docs.txt | 8 -------- 2 files changed, 16 insertions(+), 8 deletions(-) create mode 100644 .readthedocs.yaml delete mode 100644 src/requirements_docs.txt diff --git a/.readthedocs.yaml b/.readthedocs.yaml new file mode 100644 index 0000000..54a46cc --- /dev/null +++ b/.readthedocs.yaml @@ -0,0 +1,16 @@ +version: 2 + +build: + os: ubuntu-20.04 + tools: + python: "mambaforge-4.10" + +sphinx: + builder: html + configuration: docs/conf.py + fail_on_warning: true + +formats: all + +conda: + environment: src/environment.yml diff --git a/src/requirements_docs.txt b/src/requirements_docs.txt deleted file mode 100644 index 6e2069a..0000000 --- a/src/requirements_docs.txt +++ /dev/null @@ -1,8 +0,0 @@ -django==3.2 -django-celery-beat -django-celery-results -docutils<0.18 -git+https://code.ornl.gov/reflectometry/django-remote-submission.git -sphinx>=1.8 -sphinx_rtd_theme -versioningit -- GitLab From 56550512f74e33b8dd0a4ca907c9a07d4c9ac6a6 Mon Sep 17 00:00:00 2001 From: Pete Peterson Date: Fri, 17 Jun 2022 10:17:10 -0400 Subject: [PATCH 2/2] Add default channel --- src/environment.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/environment.yml b/src/environment.yml index 93a7fe8..9ab1c4b 100644 --- a/src/environment.yml +++ b/src/environment.yml @@ -1,6 +1,7 @@ name: webrefl channels: - conda-forge + - defaults dependencies: - python=3.8 - build -- GitLab