From 9d29653ef94ccbcba34b1ef55ad14521a8c7b02e Mon Sep 17 00:00:00 2001 From: Anderson Banihirwe Date: Wed, 28 Apr 2021 21:17:59 -0600 Subject: [PATCH 1/3] Use conda --- .github/workflows/ci.yaml | 16 +++++++++------- .readthedocs.yaml | 13 +++++++------ ci/environment.yml | 1 + 3 files changed, 17 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 15be6542..12b6be2a 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -11,14 +11,16 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up Python 3.8 - uses: actions/setup-python@v2 + - uses: conda-incubator/setup-miniconda@v2 with: - python-version: 3.8 - - - name: Install dependencies - run: | - python -m pip install -r requirements.txt + channels: conda-forge,nodefaults + channel-priority: strict + mamba-version: '*' + activate-environment: pythia + auto-update-conda: false + python-version: 3.9 + environment-file: ci/environment.yml + use-only-tar-bz2: true - name: Build run: | diff --git a/.readthedocs.yaml b/.readthedocs.yaml index 402d9b9e..17ab997d 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -1,10 +1,11 @@ # Required version: 2 -sphinx: - configuration: content/conf.py +build: + image: latest + +conda: + environment: ci/environment.yml -python: - version: 3.8 - install: - - requirements: requirements.txt +sphinx: + fail_on_warning: false diff --git a/ci/environment.yml b/ci/environment.yml index 1e6ca045..f76e703c 100644 --- a/ci/environment.yml +++ b/ci/environment.yml @@ -1,6 +1,7 @@ name: pythia channels: - conda-forge + - nodefaults dependencies: - myst-nb==0.10.1 - sphinx-panels From 865ef089e06cd8b23ea216a3dfeb5094d9fdf023 Mon Sep 17 00:00:00 2001 From: Anderson Banihirwe Date: Wed, 28 Apr 2021 21:19:03 -0600 Subject: [PATCH 2/3] remove requirements.txt --- requirements.txt | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 requirements.txt diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index 4eb50845..00000000 --- a/requirements.txt +++ /dev/null @@ -1,6 +0,0 @@ -myst-nb==0.10.1 -sphinx-book-theme -sphinx-panels -matplotlib -pandas -pyyaml From d505b1e118afb74b1bc6228cc07d8a152ac5aad8 Mon Sep 17 00:00:00 2001 From: Anderson Banihirwe Date: Wed, 28 Apr 2021 21:34:14 -0600 Subject: [PATCH 3/3] Bump myst-nb version --- ci/environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/environment.yml b/ci/environment.yml index b6951aa5..054aa465 100644 --- a/ci/environment.yml +++ b/ci/environment.yml @@ -3,7 +3,7 @@ channels: - conda-forge - nodefaults dependencies: - - myst-nb==0.10.1 + - myst-nb==0.12.3 - sphinx-book-theme - sphinx-panels - matplotlib