Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use conda-forge as the default channel for conda --system #114

Merged
merged 1 commit into from
May 20, 2020
Merged

Use conda-forge as the default channel for conda --system #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 5 additions & 7 deletions scripts/newinstall.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}

Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion spec/unit/n8l/miniconda/config_channels_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down