Skip to content

Commit f1b87fe

Browse files
committed
ci: Remove mentions of conda-forge for Python 3.9 (#1597)
No longer needed for Python 3.9 Signed-off-by: Eli Uriegas <[email protected]> (cherry picked from commit 284bd10) Signed-off-by: Eli Uriegas <[email protected]>
1 parent 33b2469 commit f1b87fe

File tree

5 files changed

+2
-12
lines changed

5 files changed

+2
-12
lines changed

.circleci/config.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,7 @@ commands:
4646
name: Adding CONDA_CHANNEL_FLAGS to BASH_ENV
4747
command: |
4848
CONDA_CHANNEL_FLAGS=""
49-
if [[ "${PYTHON_VERSION}" = *3.9* ]]; then
50-
echo "export CONDA_CHANNEL_FLAGS=-c=conda-forge" >> ${BASH_ENV}
51-
fi
49+
# formerly used to add conda-forge flags for Python 3.9, reserving the mechanism for future python upgrades
5250
5351
binary_common: &binary_common
5452
parameters:

.circleci/config.yml.in

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,7 @@ commands:
4646
name: Adding CONDA_CHANNEL_FLAGS to BASH_ENV
4747
command: |
4848
CONDA_CHANNEL_FLAGS=""
49-
if [[ "${PYTHON_VERSION}" = *3.9* ]]; then
50-
echo "export CONDA_CHANNEL_FLAGS=-c=conda-forge" >> ${BASH_ENV}
51-
fi
49+
# formerly used to add conda-forge flags for Python 3.9, reserving the mechanism for future python upgrades
5250

5351
binary_common: &binary_common
5452
parameters:

.circleci/torchscript_bc_test/environment.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
channels:
2-
- conda-forge
32
- defaults
43
dependencies:
54
- flake8

.circleci/unittest/windows/scripts/environment.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
channels:
2-
- conda-forge
32
- defaults
43
dependencies:
54
- flake8

packaging/pkg_helpers.bash

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -231,10 +231,6 @@ setup_conda_pytorch_constraint() {
231231
else
232232
export CONDA_CHANNEL_FLAGS="${CONDA_CHANNEL_FLAGS} -c pytorch -c pytorch-test -c pytorch-nightly"
233233
fi
234-
# Some dependencies for Python 3.9 are only on conda-forge
235-
if [[ "${PYTHON_VERSION}" = "3.9" ]]; then
236-
export CONDA_CHANNEL_FLAGS="${CONDA_CHANNEL_FLAGS} -c conda-forge"
237-
fi
238234
if [[ "$CU_VERSION" == cpu ]]; then
239235
export CONDA_PYTORCH_BUILD_CONSTRAINT="- pytorch==$PYTORCH_VERSION${PYTORCH_VERSION_SUFFIX}"
240236
export CONDA_PYTORCH_CONSTRAINT="- pytorch==$PYTORCH_VERSION"

0 commit comments

Comments
 (0)