Merge pull request #133 from lsst/tickets/DM-28511

DM-28511: Add defaults channel.
lsst · Jan 27, 2021 · 126742d · 126742d
2 parents 1d9a823 + aadf16b
commit 126742d
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/scripts/newinstall.sh b/scripts/newinstall.sh
@@ -30,7 +30,7 @@ LSST_MINICONDA_VERSION=${LSST_MINICONDA_VERSION:-py38_4.9.2}
 # the default conda env defined in scipipe_conda_env git package (RFC-553).
 LSST_SPLENV_REF=${LSST_SPLENV_REF:-${LSST_LSSTSW_REF:-0.1.5}}
 LSST_MINICONDA_BASE_URL=${LSST_MINICONDA_BASE_URL:-https://repo.continuum.io/miniconda}
-LSST_CONDA_CHANNELS=${LSST_CONDA_CHANNELS:-"conda-forge"}
+LSST_CONDA_CHANNELS=${LSST_CONDA_CHANNELS:-"conda-forge defaults"}
 LSST_CONDA_ENV_NAME=${LSST_CONDA_ENV_NAME:-lsst-scipipe-${LSST_SPLENV_REF}}
 LSST_USE_CONDA_SYSTEM=${LSST_USE_CONDA_SYSTEM:-true}
 
@@ -494,7 +494,9 @@ n8l::miniconda::lsst_env() {
 			args+=("--quiet")
 		fi
 
-		args+=("-c conda-forge")
+		for c in $conda_channels; do
+			args+=("-c $c")
+		done
 		args+=("rubin-env=${ref}")
 
 		$cmd conda "${args[@]}"