Skip to content

Commit 1cc4078

Browse files
Make wxflow links static instead of from link_workflow (#3008)
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.
1 parent f4e380a commit 1cc4078

File tree

5 files changed

+3
-23
lines changed

5 files changed

+3
-23
lines changed

.gitignore

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -171,11 +171,6 @@ ush/bufr2ioda_insitu*
171171
versions/build.ver
172172
versions/run.ver
173173

174-
# wxflow checkout and symlinks
175-
ush/python/wxflow
176-
workflow/wxflow
177-
ci/scripts/wxflow
178-
179174
# jcb checkout and symlinks
180175
ush/python/jcb
181176
workflow/jcb

ci/scripts/wxflow

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../sorc/wxflow/src/wxflow

sorc/link_workflow.sh

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -86,15 +86,6 @@ esac
8686
# Source fix version file
8787
source "${HOMEgfs}/versions/fix.ver"
8888

89-
# Link python pacakges in ush/python
90-
# TODO: This will be unnecessary when these are part of the virtualenv
91-
packages=("wxflow")
92-
for package in "${packages[@]}"; do
93-
cd "${HOMEgfs}/ush/python" || exit 1
94-
[[ -s "${package}" ]] && rm -f "${package}"
95-
${LINK} "${HOMEgfs}/sorc/${package}/src/${package}" .
96-
done
97-
9889
# Link GDASapp python packages in ush/python
9990
packages=("jcb")
10091
for package in "${packages[@]}"; do
@@ -103,15 +94,6 @@ for package in "${packages[@]}"; do
10394
${LINK} "${HOMEgfs}/sorc/gdas.cd/sorc/${package}/src/${package}" .
10495
done
10596

106-
# Link wxflow in workflow and ci/scripts
107-
# TODO: This will be unnecessary when wxflow is part of the virtualenv
108-
cd "${HOMEgfs}/workflow" || exit 1
109-
[[ -s "wxflow" ]] && rm -f wxflow
110-
${LINK} "${HOMEgfs}/sorc/wxflow/src/wxflow" .
111-
cd "${HOMEgfs}/ci/scripts" || exit 1
112-
[[ -s "wxflow" ]] && rm -f wxflow
113-
${LINK} "${HOMEgfs}/sorc/wxflow/src/wxflow" .
114-
11597
# Link fix directories
11698
if [[ -n "${FIX_DIR}" ]]; then
11799
if [[ ! -d "${HOMEgfs}/fix" ]]; then mkdir "${HOMEgfs}/fix" || exit 1; fi

ush/python/wxflow

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../sorc/wxflow/src/wxflow

workflow/wxflow

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../sorc/wxflow/src/wxflow

0 commit comments

Comments
 (0)