Skip to content

Commit

Permalink
Make wxflow links static instead of from link_workflow (#3008)
Browse files Browse the repository at this point in the history
Commits symlinks to the repo for wxflow instead of relying on
link_workflow to create them. This will allow testing in the ci or
workflow directory without needing to run an otherwise unnecessary
link_workflow first.
  • Loading branch information
WalterKolczynski-NOAA authored Oct 31, 2024
1 parent f4e380a commit 1cc4078
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 23 deletions.
5 changes: 0 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -171,11 +171,6 @@ ush/bufr2ioda_insitu*
versions/build.ver
versions/run.ver

# wxflow checkout and symlinks
ush/python/wxflow
workflow/wxflow
ci/scripts/wxflow

# jcb checkout and symlinks
ush/python/jcb
workflow/jcb
Expand Down
1 change: 1 addition & 0 deletions ci/scripts/wxflow
18 changes: 0 additions & 18 deletions sorc/link_workflow.sh
Original file line number Diff line number Diff line change
Expand Up @@ -86,15 +86,6 @@ esac
# Source fix version file
source "${HOMEgfs}/versions/fix.ver"

# Link python pacakges in ush/python
# TODO: This will be unnecessary when these are part of the virtualenv
packages=("wxflow")
for package in "${packages[@]}"; do
cd "${HOMEgfs}/ush/python" || exit 1
[[ -s "${package}" ]] && rm -f "${package}"
${LINK} "${HOMEgfs}/sorc/${package}/src/${package}" .
done

# Link GDASapp python packages in ush/python
packages=("jcb")
for package in "${packages[@]}"; do
Expand All @@ -103,15 +94,6 @@ for package in "${packages[@]}"; do
${LINK} "${HOMEgfs}/sorc/gdas.cd/sorc/${package}/src/${package}" .
done

# Link wxflow in workflow and ci/scripts
# TODO: This will be unnecessary when wxflow is part of the virtualenv
cd "${HOMEgfs}/workflow" || exit 1
[[ -s "wxflow" ]] && rm -f wxflow
${LINK} "${HOMEgfs}/sorc/wxflow/src/wxflow" .
cd "${HOMEgfs}/ci/scripts" || exit 1
[[ -s "wxflow" ]] && rm -f wxflow
${LINK} "${HOMEgfs}/sorc/wxflow/src/wxflow" .

# Link fix directories
if [[ -n "${FIX_DIR}" ]]; then
if [[ ! -d "${HOMEgfs}/fix" ]]; then mkdir "${HOMEgfs}/fix" || exit 1; fi
Expand Down
1 change: 1 addition & 0 deletions ush/python/wxflow
1 change: 1 addition & 0 deletions workflow/wxflow

0 comments on commit 1cc4078

Please sign in to comment.