From d56f86c3078646145a77a29e28ef1078a68fc9be Mon Sep 17 00:00:00 2001 From: Victor Lin <13424970+victorlin@users.noreply.github.com> Date: Fri, 8 Dec 2023 16:49:17 -0800 Subject: [PATCH 1/2] =?UTF-8?q?Rename=20environment.yml=20=E2=86=92=20cond?= =?UTF-8?q?a.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The new name is more self-descriptive. --- .github/workflows/ci.yaml | 2 +- DEV_DOCS.md | 4 ++-- docs/{environment.yml => conda.yml} | 0 readthedocs.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) rename docs/{environment.yml => conda.yml} (100%) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 758affa13..0127c9132 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -140,4 +140,4 @@ jobs: uses: nextstrain/.github/.github/workflows/docs-ci.yaml@master with: docs-directory: docs/ - environment-file: docs/environment.yml + environment-file: docs/conda.yml diff --git a/DEV_DOCS.md b/DEV_DOCS.md index 3ddc8974a..a1b3b5d6a 100644 --- a/DEV_DOCS.md +++ b/DEV_DOCS.md @@ -137,10 +137,10 @@ The Auspice technical reference guide is available at [docs.nextstrain.org/proje To preview the Auspice documentation locally, -1. Create and activate a Conda environment from `docs/environment.yml`. Example using Mamba: +1. Create and activate a Conda environment from `docs/conda.yml`. Example using Mamba: ```bash - mamba env create --file docs/environment.yml + mamba env create --file docs/conda.yml conda activate auspice-docs ``` diff --git a/docs/environment.yml b/docs/conda.yml similarity index 100% rename from docs/environment.yml rename to docs/conda.yml diff --git a/readthedocs.yml b/readthedocs.yml index 34ed69622..d2197e956 100644 --- a/readthedocs.yml +++ b/readthedocs.yml @@ -7,4 +7,4 @@ build: python: "mambaforge-22.9" conda: - environment: docs/environment.yml + environment: docs/conda.yml From 2a7a565968bcdff9c985b3d446b743a5f7104781 Mon Sep 17 00:00:00 2001 From: Victor Lin <13424970+victorlin@users.noreply.github.com> Date: Fri, 8 Dec 2023 16:50:16 -0800 Subject: [PATCH 2/2] docs: Use conda instead of mamba Nothing requires mamba here. --- DEV_DOCS.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DEV_DOCS.md b/DEV_DOCS.md index a1b3b5d6a..3601239d2 100644 --- a/DEV_DOCS.md +++ b/DEV_DOCS.md @@ -137,10 +137,10 @@ The Auspice technical reference guide is available at [docs.nextstrain.org/proje To preview the Auspice documentation locally, -1. Create and activate a Conda environment from `docs/conda.yml`. Example using Mamba: +1. Create and activate a Conda environment from `docs/conda.yml`. Example: ```bash - mamba env create --file docs/conda.yml + conda env create --file docs/conda.yml conda activate auspice-docs ```