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

[develop] Integrate Unified Workflow templater tool #793

Merged
merged 45 commits into from
Jun 9, 2023
+1,071 −758
Merged

[develop] Integrate Unified Workflow templater tool #793

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
fc0aa9c
First pass at replacing fill_jinja_template with set_template
christinaholtNOAA May 3, 2023
62b6595
Removing fill_jinja_template.py
christinaholtNOAA May 3, 2023
4d052b1
Changes in place. Failing on env. Needs modulefile fix.
christinaholtNOAA May 3, 2023
d8ec59f
Merge remote-tracking branch 'origin/develop' into uw_tools_templates
christinaholtNOAA May 5, 2023
7fdb117
Add pythonpath for uwtools package items.
christinaholtNOAA May 8, 2023
1394c57
Temp files for all calls to set_template.
christinaholtNOAA May 8, 2023
b818f8c
Merge remote-tracking branch 'origin/develop' into uw_tools_templates
christinaholtNOAA May 8, 2023
d2d6900
Linting the small modified python utilities.
christinaholtNOAA May 8, 2023
c35337d
Linting workflow generation script.
christinaholtNOAA May 8, 2023
8d317e7
Fix some silly typos.
christinaholtNOAA May 10, 2023
d50496b
There it is!
christinaholtNOAA May 11, 2023
03d2b93
Use dev branch for uwtools for now.
christinaholtNOAA May 11, 2023
635065f
Handle PYTHONPATH for github actions.
christinaholtNOAA May 11, 2023
ee33935
Make unittests work on GHA?
christinaholtNOAA May 12, 2023
721cfad
Merge remote-tracking branch 'origin/develop' into uw_tools_templates
christinaholtNOAA May 12, 2023
6bb4dc6
Check out uwtools as an external for these tests.
christinaholtNOAA May 12, 2023
91aac52
Updating the hash of workflow-tools.
christinaholtNOAA May 12, 2023
6bf7087
Merge remote-tracking branch 'origin/develop' into uw_tools_templates
christinaholtNOAA May 15, 2023
5ac70d1
Checkout uwtools externals to pass linter.
christinaholtNOAA May 15, 2023
d5312af
Same PYTHONPATH as unittests.
christinaholtNOAA May 15, 2023
72f57fa
Replate fill_jinja_template in new scripts.
christinaholtNOAA May 15, 2023
4484a19
Add missed tmpfile creation block.
christinaholtNOAA May 15, 2023
b25a7a2
Merge remote-tracking branch 'origin/develop' into uw_tools_templates
christinaholtNOAA May 17, 2023
7dd1c7a
Linting.
christinaholtNOAA May 17, 2023
cf3871c
Ignore the new external.
christinaholtNOAA May 18, 2023
ae14c9b
Merge remote-tracking branch 'origin/develop' into uw_tools_templates
christinaholtNOAA May 19, 2023
cdb098d
Attempting to fix a getcwd issue with tests.
christinaholtNOAA May 19, 2023
787b2f7
Set PYTHONPATH for all platforms.
christinaholtNOAA May 19, 2023
89c6a71
Fix bad text edits.
christinaholtNOAA May 19, 2023
3599c64
Change external from uwtools to workflow-tools
christinaholtNOAA May 22, 2023
f627f08
Add comments on where the import comes from.
christinaholtNOAA May 22, 2023
6d033e4
Change the external name in .gitignore.
christinaholtNOAA May 22, 2023
11eb439
PYTHONPATH is platform- and task-independent.
christinaholtNOAA May 22, 2023
a6b0232
Change all conda envs to workflow_tools
christinaholtNOAA May 22, 2023
13036c9
Plotting still needs regional_workflow env.
christinaholtNOAA May 22, 2023
a278ab5
Update ush/generate_FV3LAM_wflow.py
christinaholtNOAA May 22, 2023
15285be
Allow f-strings in log messages.
christinaholtNOAA May 22, 2023
1d47cd6
Find the right solution for exit status and log.
christinaholtNOAA May 22, 2023
ef7514c
Ignore since we don't have custom exceptions.
christinaholtNOAA May 22, 2023
54e97cc
Address Chan-hoo's comments.
christinaholtNOAA May 24, 2023
1fdd508
Accidently reverted mkavulich's recent change.
christinaholtNOAA May 24, 2023
7d8f24f
Module use should also be done for all platforms.
christinaholtNOAA May 25, 2023
54bb064
Address yaml issue with aqm yaml file.
christinaholtNOAA May 31, 2023
65831d1
Merge remote-tracking branch 'origin/develop' into uw_tools_templates
christinaholtNOAA Jun 8, 2023
5a07402
Using workflow_tools for workflow instead of regional_workflow
christinaholtNOAA Jun 8, 2023
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
7 changes: 5 additions & 2 deletions .github/workflows/python_linter.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,8 @@ jobs:
# Run python unittests
- name: Lint the test directory
run: |
export PYTHONPATH=${PWD}/ush
pylint --min-similarity-lines=15 --ignore-imports=yes tests/test_python/
./manage_externals/checkout_externals workflow-tools
export PYTHONPATH=$(pwd)/ush:$(pwd)/ush/python_utils/workflow-tools:$(pwd)/ush/python_utils/workflow-tools/src
pylint --ignore-imports=yes tests/test_python/
pylint ush/create_*.py
pylint ush/generate_FV3LAM_wflow.py
4 changes: 2 additions & 2 deletions .github/workflows/python_unittests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ jobs:
# Run python unittests
- name: Run python unittests
run: |
./manage_externals/checkout_externals ufs-weather-model
./manage_externals/checkout_externals ufs-weather-model workflow-tools
# exclude test_retrieve_data that is tested in functional test
export PYTHONPATH=${PWD}/ush
export PYTHONPATH=$(pwd)/ush:$(pwd)/ush/python_utils/workflow-tools:$(pwd)/ush/python_utils/workflow-tools/src
python3 -m unittest -b tests/test_python/*.py

1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ tests/WE2E/log.*
ush/__pycache__/
ush/config.yaml
ush/python_utils/__pycache__/
ush/python_utils/workflow-tools/
ush/*.swp

*.swp
Expand Down
Loading