From c7fad98d0f7de7284da320c34c1b994d4bd66fe3 Mon Sep 17 00:00:00 2001
From: Eli Uriegas <eliuriegas@fb.com>
Date: Mon, 21 Jun 2021 10:52:50 -0700
Subject: [PATCH] ci: Remove mentions of conda-forge

No longer needed for Python 3.9

Signed-off-by: Eli Uriegas <eliuriegas@fb.com>
---
 .circleci/config.yml                               | 4 +---
 .circleci/config.yml.in                            | 4 +---
 .circleci/torchscript_bc_test/environment.yml      | 1 -
 .circleci/unittest/windows/scripts/environment.yml | 1 -
 packaging/pkg_helpers.bash                         | 4 ----
 5 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index c3263b562e..e18c99779e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -52,9 +52,7 @@ 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
+              # formerly used to add conda-forge flags for Python 3.9, reserving the mechanism for future python upgrades
 
 binary_common: &binary_common
   parameters:
diff --git a/.circleci/config.yml.in b/.circleci/config.yml.in
index 8a5cef16b3..ca680c943f 100644
--- a/.circleci/config.yml.in
+++ b/.circleci/config.yml.in
@@ -52,9 +52,7 @@ 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
+              # formerly used to add conda-forge flags for Python 3.9, reserving the mechanism for future python upgrades
 
 binary_common: &binary_common
   parameters:
diff --git a/.circleci/torchscript_bc_test/environment.yml b/.circleci/torchscript_bc_test/environment.yml
index f528ce99f4..4f445d4923 100644
--- a/.circleci/torchscript_bc_test/environment.yml
+++ b/.circleci/torchscript_bc_test/environment.yml
@@ -1,5 +1,4 @@
 channels:
-  - conda-forge
   - defaults
 dependencies:
   - flake8
diff --git a/.circleci/unittest/windows/scripts/environment.yml b/.circleci/unittest/windows/scripts/environment.yml
index 27322ccc01..b1ed84b75e 100644
--- a/.circleci/unittest/windows/scripts/environment.yml
+++ b/.circleci/unittest/windows/scripts/environment.yml
@@ -1,5 +1,4 @@
 channels:
-  - conda-forge
   - defaults
 dependencies:
   - flake8
diff --git a/packaging/pkg_helpers.bash b/packaging/pkg_helpers.bash
index 1626938863..9a0576d320 100644
--- a/packaging/pkg_helpers.bash
+++ b/packaging/pkg_helpers.bash
@@ -231,10 +231,6 @@ setup_conda_pytorch_constraint() {
   else
     export CONDA_CHANNEL_FLAGS="${CONDA_CHANNEL_FLAGS} -c pytorch -c pytorch-test -c pytorch-nightly"
   fi
-  # Some dependencies for Python 3.9 are only on conda-forge
-  if [[ "${PYTHON_VERSION}" = "3.9" ]]; then
-    export CONDA_CHANNEL_FLAGS="${CONDA_CHANNEL_FLAGS} -c conda-forge"
-  fi
   if [[ "$CU_VERSION" == cpu ]]; then
     export CONDA_PYTORCH_BUILD_CONSTRAINT="- pytorch==$PYTORCH_VERSION${PYTORCH_VERSION_SUFFIX}"
     export CONDA_PYTORCH_CONSTRAINT="- pytorch==$PYTORCH_VERSION"