diff --git a/esmvaltool/utils/recipe_test_workflow/app/get_esmval/bin/clone_latest_esmval.sh b/esmvaltool/utils/recipe_test_workflow/app/get_esmval/bin/clone_latest_esmval.sh index 331eada6c3..8a40b1edc7 100755 --- a/esmvaltool/utils/recipe_test_workflow/app/get_esmval/bin/clone_latest_esmval.sh +++ b/esmvaltool/utils/recipe_test_workflow/app/get_esmval/bin/clone_latest_esmval.sh @@ -12,8 +12,15 @@ if [[ -d ${ESMVALCORE_DIR} ]]; then rm -rf "${ESMVALCORE_DIR}" fi -# Checkout the specified branch for ESMValCore and ESMValTool. Use the +# Checkout the specified branch for ESMValCore and ESMValTool to a `src` dir. Use the # quiet ('-q') option to prevent the progress status from being reported # (which is done via done via 'stderr'). -git clone -q -b "${BRANCH}" "${ESMVALTOOL_URL}" "${ESMVALTOOL_DIR}" -git clone -q -b "${BRANCH}" "${ESMVALCORE_URL}" "${ESMVALCORE_DIR}" +git clone -q -b "${BRANCH}" "${ESMVALTOOL_URL}" "${ESMVALTOOL_SOURCE_DIR}" +git clone -q -b "${BRANCH}" "${ESMVALCORE_URL}" "${ESMVALCORE_SOURCE_DIR}" + +# Copy ESMValCore and ESMValTool into 'lib/python', adding them to the PYTHONPATH. +# 'pip install' does this and also triggers `setuptools-scm` to increment the +# package version number. Otherwise `version` returns the last tagged +# release, not the current development version. +rtw-env pip install "${ESMVALTOOL_SOURCE_DIR}" --target="${ESMVALTOOL_DIR}" --no-deps +rtw-env pip install "${ESMVALCORE_SOURCE_DIR}" --target="${ESMVALCORE_DIR}" --no-deps diff --git a/esmvaltool/utils/recipe_test_workflow/app/get_esmval/opt/rose-app-metoffice.conf b/esmvaltool/utils/recipe_test_workflow/app/get_esmval/opt/rose-app-metoffice.conf index 8911ca1cfd..1ed0bdc399 100644 --- a/esmvaltool/utils/recipe_test_workflow/app/get_esmval/opt/rose-app-metoffice.conf +++ b/esmvaltool/utils/recipe_test_workflow/app/get_esmval/opt/rose-app-metoffice.conf @@ -3,5 +3,7 @@ default=clone_latest_esmval.sh [env] BRANCH=main +ESMVALCORE_SOURCE_DIR=${CYLC_WORKFLOW_SHARE_DIR}/src/ESMValCore ESMVALCORE_URL=git@github.com:ESMValGroup/ESMValCore.git +ESMVALTOOL_SOURCE_DIR=${CYLC_WORKFLOW_SHARE_DIR}/src/ESMValTool ESMVALTOOL_URL=git@github.com:ESMValGroup/ESMValTool.git diff --git a/esmvaltool/utils/recipe_test_workflow/opt/rose-suite-metoffice.conf b/esmvaltool/utils/recipe_test_workflow/opt/rose-suite-metoffice.conf index 5a9287cb7a..6d089bf8ef 100644 --- a/esmvaltool/utils/recipe_test_workflow/opt/rose-suite-metoffice.conf +++ b/esmvaltool/utils/recipe_test_workflow/opt/rose-suite-metoffice.conf @@ -1,7 +1,7 @@ [template variables] DRS_CMIP5="BADC" DRS_CMIP6="BADC" -ENV_NAME="scitools/community/esmvaltool/2.11.0" +ENV_NAME="/home/h02/cbillows/esmvt-rtw-tmp" KGO_ROOT_PATH="/data/users/esmval/KGO" ROOTPATH_CMIP5="/project/champ/data/cmip5/output1" ROOTPATH_CMIP6="/project/champ/data/CMIP6"