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

Tickets/dm 19830 #107

Merged
merged 3 commits into from
Nov 4, 2019
Merged

Tickets/dm 19830 #107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2d96a26
Miniconda version sync with the one used in lsstsw
gcomoretto Oct 25, 2019
c6cf2c0
Fix conda clean
gcomoretto Oct 26, 2019
2b7bb02
Fix unit test
gcomoretto Nov 4, 2019
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
8 changes: 2 additions & 6 deletions scripts/newinstall.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ LSST_EUPS_USE_EUPSPKG=${LSST_EUPS_USE_EUPSPKG:-true}

# force Python 3
LSST_PYTHON_VERSION=3
LSST_MINICONDA_VERSION=${LSST_MINICONDA_VERSION:-4.5.12}
LSST_MINICONDA_VERSION=${LSST_MINICONDA_VERSION:-4.7.10}
# this git ref controls which set of conda packages are used to initialize the
# the default conda env defined in scipipe_conda_env git package (RFC-553).
LSST_SPLENV_REF=${LSST_SPLENV_REF:-${LSST_LSSTSW_REF:-4d7b902}}
Expand Down Expand Up @@ -499,15 +499,11 @@ n8l::miniconda::lsst_env() {
local baseurl="https://raw.githubusercontent.com/lsst/scipipe_conda_env/${ref}/etc/"
local tmpfile

# conda may leave behind lock files from an uncompleted package installation
# attempt. These need to be cleaned up before [re]attempting to install
# packages.
$cmd conda clean --lock

(
set -Eeo pipefail

tmpfile=$(mktemp -t "${conda_packages//X/_}.XXXXXXXX")
tmpfile="${tmpfile}.yml"
# attempt to be a good citizen and not leave tmp files laying around
# after either a normal exit or an error condition
# shellcheck disable=SC2064
Expand Down
5 changes: 2 additions & 3 deletions spec/unit/n8l/miniconda/lsst_env_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,16 +71,15 @@
instance_of(String)
)

expect(conda).to be_called_with_arguments.times(3)
expect(conda).to be_called_with_arguments('clean', '--lock')
expect(conda).to be_called_with_arguments.times(2)
expect(conda).to be_called_with_arguments(
'env',
'update',
'--name',
/^lsst-scipipe/,
'--quiet',
'--file',
'/dne/file',
'/dne/file.yml',
)
expect(conda).to be_called_with_arguments('env', 'export')

Expand Down