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

RTW process tasks to log package development version numbers #3851

Draft
wants to merge 5 commits into
base: main
Choose a base branch
from
Draft

RTW process tasks to log package development version numbers #3851

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d518c48
#3849: Use a temp env to add `rich`
chrisbillowsMO Jan 6, 2025
69ce57d
#3849: Clone into `src` and pip install via a tmp env module
chrisbillowsMO Jan 6, 2025
38c7f58
#3849: Use an existing sss for pip
chrisbillowsMO Jan 6, 2025
4e6325a
#3849: Use site env for pip (works for esmvaltool env also)
chrisbillowsMO Jan 6, 2025
1fbbccc
#3849: Run rose config dump
chrisbillowsMO Jan 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions esmvaltool/utils/recipe_test_workflow/app/get_esmval/bin/clone_latest_esmval.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 2 additions & 0 deletions esmvaltool/utils/recipe_test_workflow/app/get_esmval/opt/rose-app-metoffice.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,7 @@ default=clone_latest_esmval.sh

[env]
BRANCH=main
ESMVALCORE_SOURCE_DIR=${CYLC_WORKFLOW_SHARE_DIR}/src/ESMValCore
[email protected]:ESMValGroup/ESMValCore.git
ESMVALTOOL_SOURCE_DIR=${CYLC_WORKFLOW_SHARE_DIR}/src/ESMValTool
[email protected]:ESMValGroup/ESMValTool.git
2 changes: 1 addition & 1 deletion esmvaltool/utils/recipe_test_workflow/opt/rose-suite-metoffice.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
Loading