Merge pull request #138 from lsst/tickets/DM-29063

DM-29063: Update rubin-env to 0.4.2.

scripts/newinstall.sh

@@ -11,24 +11,14 @@
 
 set -Eeo pipefail
 
-#
-# Note to developers: change these when the EUPS version we use changes
-#
-
-LSST_EUPS_VERSION=${LSST_EUPS_VERSION:-2.1.5}
-
-LSST_EUPS_GITREV=${LSST_EUPS_GITREV:-}
-LSST_EUPS_GITREPO=${LSST_EUPS_GITREPO:-https://github.com/RobertLuptonTheGood/eups.git}
-LSST_EUPS_TARURL=${LSST_EUPS_TARURL:-https://github.com/RobertLuptonTheGood/eups/archive/${LSST_EUPS_VERSION}.tar.gz}
-
 LSST_EUPS_PKGROOT_BASE_URL=${LSST_EUPS_PKGROOT_BASE_URL:-https://eups.lsst.codes/stack}
 LSST_EUPS_USE_TARBALLS=${LSST_EUPS_USE_TARBALLS:-false}
 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:-0.4.1}}
+LSST_SPLENV_REF=${LSST_SPLENV_REF:-${LSST_LSSTSW_REF:-0.4.2}}
 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}}
@@ -47,6 +37,14 @@ LSST_HOME="$PWD"
 # the canonical source of this script
 NEWINSTALL_URL="https://raw.githubusercontent.com/lsst/lsst/master/scripts/newinstall.sh"
 
+#
+# These EUPS variables are purely for legacy purposes.
+#
+LSST_EUPS_VERSION=${LSST_EUPS_VERSION:-2.1.5}
+LSST_EUPS_GITREV=${LSST_EUPS_GITREV:-}
+LSST_EUPS_GITREPO=${LSST_EUPS_GITREPO:-https://github.com/RobertLuptonTheGood/eups.git}
+LSST_EUPS_TARURL=${LSST_EUPS_TARURL:-https://github.com/RobertLuptonTheGood/eups/archive/${LSST_EUPS_VERSION}.tar.gz}
+
 #
 # removing leading/trailing whitespace from a string
 #