From 6172f36329cb787f031bb22bd9eb4d89b5c49514 Mon Sep 17 00:00:00 2001 From: Zachary Lentz Date: Tue, 1 Nov 2022 13:37:37 -0700 Subject: [PATCH] MAINT: switch dev to use latest tag as a base instead of old dev env, store latest tag in config file --- scripts/dev_conda | 4 ++-- scripts/pcds_conda | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/scripts/dev_conda b/scripts/dev_conda index e1814539..c657d023 100755 --- a/scripts/dev_conda +++ b/scripts/dev_conda @@ -28,8 +28,8 @@ source "${BASE_ENV}/etc/profile.d/conda.sh" # Activate base env first so things like conda build are available conda activate -# Default to dev pcds release -conda activate dev +# Default to latest pcds release as the base +conda activate "$(cat "${BASE_ENV}/latest_env")" PCDSDEVICES_DEV_UI="${APPS_ROOT}/dev/pcdsdevices/pcdsdevices/ui" diff --git a/scripts/pcds_conda b/scripts/pcds_conda index cd977ff1..b2f77cd7 100755 --- a/scripts/pcds_conda +++ b/scripts/pcds_conda @@ -65,9 +65,7 @@ if [[ -z "${PCDS_CONDA_VER}" ]]; then # If env var unset, then default to latest BASE_ENV="${CONDA_ROOT}/py39" PYTHON_VER="3.9" - PCDS_CONDA_VER="$(command ls "${BASE_ENV}/envs" | command grep pcds- | command tail -1)" - SERIES="pcds" - VER_NUM="$(echo "${PCDS_CONDA_VER}" | cut -d - -f 2)" + PCDS_CONDA_VER="$(cat "${BASE_ENV}/latest_env")" else # Figure out which base to use if [[ -z "${PCDS_CONDA_VER##*-*}" ]]; then