Merge pull request #114 from lsst/tickets/DM-24232

Use conda-forge as the default channel for conda --system
lsst · May 20, 2020 · 3836ba5 · 3836ba5
2 parents 9648a75 + 27d4647
commit 3836ba5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/scripts/newinstall.sh b/scripts/newinstall.sh
@@ -32,7 +32,7 @@ LSST_MINICONDA_VERSION=${LSST_MINICONDA_VERSION:-4.7.12}
 # the default conda env defined in scipipe_conda_env git package (RFC-553).
 LSST_SPLENV_REF=${LSST_SPLENV_REF:-${LSST_LSSTSW_REF:-973126a}}
 LSST_MINICONDA_BASE_URL=${LSST_MINICONDA_BASE_URL:-https://repo.continuum.io/miniconda}
-LSST_CONDA_CHANNELS=${LSST_CONDA_CHANNELS:-}
+LSST_CONDA_CHANNELS=${LSST_CONDA_CHANNELS:-"conda-forge"}
 LSST_CONDA_ENV_NAME=${LSST_CONDA_ENV_NAME:-lsst-scipipe-${LSST_SPLENV_REF}}
 LSST_USE_CONDA_SYSTEM=${LSST_USE_CONDA_SYSTEM:-true}
 
@@ -475,16 +475,14 @@ n8l::miniconda::config_channels() {
 
 	# remove any previously configured non-default channels
 	# XXX allowed to fail
-	$cmd conda config --remove-key channels || true
+	$cmd conda config --env --remove-key channels || true
 
 	for c in $channels; do
-		$cmd conda config --add channels "$c"
+		$cmd conda config --env --add channels "$c"
 	done
 
-	# remove the default channels
-	$cmd conda config --remove channels defaults
-
-	$cmd conda config --show
+	$cmd conda config --env --set channel_priority strict
+	$cmd conda config --env --show
 }
 
 # Install packages on which the stack is known to depend

diff --git a/spec/unit/n8l/miniconda/config_channels_spec.rb b/spec/unit/n8l/miniconda/config_channels_spec.rb
@@ -34,7 +34,7 @@
 
         %w[a b c].each do |chan|
           expect(conda).to be_called_with_arguments(
-            'config', '--add', 'channels', chan
+            'config', '--env', '--add', 'channels', chan
           )
         end
       end