From 7172489902532233ae7dfccfbfc3125fd20ae168 Mon Sep 17 00:00:00 2001 From: Eli Uriegas Date: Mon, 28 Jun 2021 10:29:50 -0700 Subject: [PATCH] ci: Remove mentions of conda-forge conda-forge is no longer necessary for building Python 3.9 Signed-off-by: Eli Uriegas --- .circleci/config.yml | 3 --- .circleci/config.yml.in | 3 --- .circleci/unittest/linux/scripts/environment.yml | 1 - .circleci/unittest/windows/scripts/environment.yml | 1 - 4 files changed, 8 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 953cd8b9be..6bc56a791d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -36,9 +36,6 @@ commands: name: Adding CONDA_CHANNEL_FLAGS to BASH_ENV command: | CONDA_CHANNEL_FLAGS="" - if [[ "${PYTHON_VERSION}" = *3.9* ]]; then - echo "export CONDA_CHANNEL_FLAGS=-c=conda-forge" >> ${BASH_ENV} - fi generate_cachekey: description: "Generate .cachekey file that changes on daily basis" steps: diff --git a/.circleci/config.yml.in b/.circleci/config.yml.in index f97eff89fc..6bc442abd0 100644 --- a/.circleci/config.yml.in +++ b/.circleci/config.yml.in @@ -36,9 +36,6 @@ commands: name: Adding CONDA_CHANNEL_FLAGS to BASH_ENV command: | CONDA_CHANNEL_FLAGS="" - if [[ "${PYTHON_VERSION}" = *3.9* ]]; then - echo "export CONDA_CHANNEL_FLAGS=-c=conda-forge" >> ${BASH_ENV} - fi generate_cachekey: description: "Generate .cachekey file that changes on daily basis" steps: diff --git a/.circleci/unittest/linux/scripts/environment.yml b/.circleci/unittest/linux/scripts/environment.yml index e1e9f2cda8..c77605953a 100644 --- a/.circleci/unittest/linux/scripts/environment.yml +++ b/.circleci/unittest/linux/scripts/environment.yml @@ -1,6 +1,5 @@ channels: - defaults - - conda-forge dependencies: - flake8>=3.7.9 - codecov diff --git a/.circleci/unittest/windows/scripts/environment.yml b/.circleci/unittest/windows/scripts/environment.yml index 9716f09114..5889f85d35 100644 --- a/.circleci/unittest/windows/scripts/environment.yml +++ b/.circleci/unittest/windows/scripts/environment.yml @@ -1,6 +1,5 @@ channels: - defaults - - conda-forge dependencies: - flake8>=3.7.9 - codecov