diff --git a/.circleci/config.yml b/.circleci/config.yml index 5a9ca3ef1b..b2824bbd21 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 5473c45f65..bb516c6eb0 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 73c1cc9e15..dbf84c006e 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 04142428c2..21833a0c52 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