From f0293ca6074cbda7de5d8f199b4caf59512d346a Mon Sep 17 00:00:00 2001 From: test Date: Thu, 7 Dec 2023 11:10:21 -0500 Subject: [PATCH 1/2] Removing the default conda channel from the conda-forge option. --- .github/workflows/verify-ghas.yaml | 1 - cookiecutter.json | 2 +- {{cookiecutter.repo_name}}/.github/workflows/CI.yaml | 3 +-- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/verify-ghas.yaml b/.github/workflows/verify-ghas.yaml index 88f0032..e61fa8c 100644 --- a/.github/workflows/verify-ghas.yaml +++ b/.github/workflows/verify-ghas.yaml @@ -141,7 +141,6 @@ jobs: condarc: | channels: - conda-forge - - defaults - name: Install package diff --git a/cookiecutter.json b/cookiecutter.json index 5f4710e..0aeccf7 100644 --- a/cookiecutter.json +++ b/cookiecutter.json @@ -13,7 +13,7 @@ "Not Open Source" ], "dependency_source": [ - "Prefer conda-forge over the default anaconda channel with pip fallback", + "Prefer conda-forge with pip fallback", "Prefer default anaconda channel with pip fallback", "Dependencies from pip only (no conda)" ], diff --git a/{{cookiecutter.repo_name}}/.github/workflows/CI.yaml b/{{cookiecutter.repo_name}}/.github/workflows/CI.yaml index baf4a6c..c4f10ac 100644 --- a/{{cookiecutter.repo_name}}/.github/workflows/CI.yaml +++ b/{{cookiecutter.repo_name}}/.github/workflows/CI.yaml @@ -49,11 +49,10 @@ jobs: with: environment-file: devtools/conda-envs/test_env.yaml environment-name: test -{%- if cookiecutter.dependency_source == 'Prefer conda-forge over the default anaconda channel with pip fallback' %} +{%- if cookiecutter.dependency_source == 'Prefer conda-forge with pip fallback' %} condarc: | channels: - conda-forge - - defaults {%- elif cookiecutter.dependency_source == 'Prefer default anaconda channel with pip fallback' %} condarc: | channels: From 79df27c06809a159680a4c5c563170bf0d1da818 Mon Sep 17 00:00:00 2001 From: test Date: Thu, 7 Dec 2023 11:11:59 -0500 Subject: [PATCH 2/2] Updating the reference workflows. --- .github/reference-workflows/CI_1_1_1.yaml | 1 - .github/reference-workflows/CI_1_1_2.yaml | 1 - .github/reference-workflows/CI_2_1_1.yaml | 1 - .github/reference-workflows/CI_2_1_2.yaml | 1 - 4 files changed, 4 deletions(-) diff --git a/.github/reference-workflows/CI_1_1_1.yaml b/.github/reference-workflows/CI_1_1_1.yaml index 471ed8d..3db0eb6 100644 --- a/.github/reference-workflows/CI_1_1_1.yaml +++ b/.github/reference-workflows/CI_1_1_1.yaml @@ -42,7 +42,6 @@ jobs: condarc: | channels: - conda-forge - - defaults create-args: >- python=${{ matrix.python-version }} diff --git a/.github/reference-workflows/CI_1_1_2.yaml b/.github/reference-workflows/CI_1_1_2.yaml index 4be4e96..a78e8a3 100644 --- a/.github/reference-workflows/CI_1_1_2.yaml +++ b/.github/reference-workflows/CI_1_1_2.yaml @@ -42,7 +42,6 @@ jobs: condarc: | channels: - conda-forge - - defaults create-args: >- python=${{ matrix.python-version }} diff --git a/.github/reference-workflows/CI_2_1_1.yaml b/.github/reference-workflows/CI_2_1_1.yaml index 5825b87..943ea4f 100644 --- a/.github/reference-workflows/CI_2_1_1.yaml +++ b/.github/reference-workflows/CI_2_1_1.yaml @@ -42,7 +42,6 @@ jobs: condarc: | channels: - conda-forge - - defaults create-args: >- python=${{ matrix.python-version }} diff --git a/.github/reference-workflows/CI_2_1_2.yaml b/.github/reference-workflows/CI_2_1_2.yaml index ce41591..ba319d0 100644 --- a/.github/reference-workflows/CI_2_1_2.yaml +++ b/.github/reference-workflows/CI_2_1_2.yaml @@ -42,7 +42,6 @@ jobs: condarc: | channels: - conda-forge - - defaults create-args: >- python=${{ matrix.python-version }}