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

DM-37324: Update to rubin-env 5.1.0. #170

Merged
merged 2 commits into from
Dec 14, 2022
Merged

DM-37324: Update to rubin-env 5.1.0. #170

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6fc9d3f
Update to rubin-env 5.1.0.
ktlim Dec 13, 2022
47a7706
Appease shellcheck.
ktlim Dec 13, 2022
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
15 changes: 7 additions & 8 deletions scripts/newinstall.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ LSST_EUPS_USE_EUPSPKG=${LSST_EUPS_USE_EUPSPKG:-true}
LSST_MINICONDA_VERSION=${LSST_MINICONDA_VERSION:-py38_4.9.2}
# 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:-5.0.0}}
LSST_SPLENV_REF=${LSST_SPLENV_REF:-${LSST_LSSTSW_REF:-5.1.0}}
LSST_MINICONDA_BASE_URL=${LSST_MINICONDA_BASE_URL:-https://repo.continuum.io/miniconda}
LSST_CONDA_CHANNELS=${LSST_CONDA_CHANNELS:-"conda-forge"}
LSST_CONDA_ENV_NAME=${LSST_CONDA_ENV_NAME:-lsst-scipipe-${LSST_SPLENV_REF}}
Expand Down Expand Up @@ -623,7 +623,6 @@ n8l::conda_check() {
EOF
} | n8l::fmt
n8l::fail
break;
;;
* ) echo "Please answer yes or no.";;
esac
Expand Down Expand Up @@ -1013,16 +1012,16 @@ n8l::main() {
if [[ $PRESERVE_EUPS_PKGROOT_FLAG == true ]]; then
EUPS_PKGROOT=${EUPS_PKGROOT:-$(
n8l::default_eups_pkgroot \
$LSST_EUPS_USE_EUPSPKG \
$LSST_EUPS_USE_TARBALLS \
$LSST_USE_CONDA_SYSTEM
"$LSST_EUPS_USE_EUPSPKG" \
"$LSST_EUPS_USE_TARBALLS" \
"$LSST_USE_CONDA_SYSTEM"
)}
else
EUPS_PKGROOT=$(
n8l::default_eups_pkgroot \
$LSST_EUPS_USE_EUPSPKG \
$LSST_EUPS_USE_TARBALLS \
$LSST_USE_CONDA_SYSTEM
"$LSST_EUPS_USE_EUPSPKG" \
"$LSST_EUPS_USE_TARBALLS" \
"$LSST_USE_CONDA_SYSTEM"
)
fi

Expand Down