Skip to content

Commit

Permalink
Update develop-ref after dtcenter/MET#2820 (#2502)
Browse files Browse the repository at this point in the history
* update versions to fix bugs for METplotpy/calcpy use cases

* Bugfix #2026 develop StatAnalysis looping (#2028)

* Feature #2022 update python version to 3.10.4 for repo files (#2047)

* Feature #2022 Use Debian 10 / Python 3.10.4 in automated tests (#2050)

* add use case group name to output path so that output and error logs will contain use case category to more easily see which case was run

* remove -group0 from group names for output path

* add manual workflow to update truth data

* ci: set gh token on checkout to enable push, ci-skip-all

* Set user name/email via git config to allow push

* add token to checkout

* Feature #2049 Multiple interp.type.method/width (#2051)

* added missing argument to script if building envs locally

* get main_vX.Y truth data if running on main_vX.Y branch

* Updating README.md for label creation and adding bold to common_labels.txt

* Updated color for bold label

* Feature #2054 consensus.write_members in TCPairs (#2057)

* Create LICENSE.md (#2061)

* per #2006, fix priority of obs_window config variables so that wrapper-specific version is preferred over generic OBS_WINDOW_BEGIN/END (#2062)

* Feature 2065 v5.1.0 beta1 (#2066)

* updated version number

* added release notes

* Update docs/Users_Guide/release-notes.rst

Co-authored-by: John Halley Gotway <[email protected]>

---------

Co-authored-by: John Halley Gotway <[email protected]>

* updated version with -dev

* adding sphinx design to 3 files so dropdown menus will work in the release notes.

* fix version numbers for python requirements for building documentation

* fixed tab vs spaces

* Bugfix #2070 var list numeric order (#2072)

* Adding files for jet and hera

* added commented process list that was accidentally removed -- this is used if the pre-processing steps are needed

* Bugfix #2087 develop docs_pdf (#2091)

* Feature 2076 release dropdown menu (#2083)

* test dropdowns

* Update release-notes.rst

Attempting to resolve WARNING

* testing dropdowns

* adding dropdown menus

* testing dropdown

remove from warning section

* dropdown testing

* dropdown menu tests

* dropdown menus

after the warnings section, the dropdown menu only has one space instead of the normal 2 spaces.  If it has 2 spaces, it gets sucked into the warning section.

* spaces with warning

* no spaces for warning

* Update release-notes.rst

warning note has to be indented 1 space.  Originally it was no spaces but then all of the dropdown menus end up in the warning message.  If it's 2 spaces, as is normal, then the warning is indented, which is unnecessary.  1 space is slightly indented and keeps the dropdown menus separate.

---------

Co-authored-by: jprestop <[email protected]>

* Bugfix #2096/#2098 develop - fix skip if output exists and do not error if no commands were run (#2099)

* Feature 1516 use case mvmode (#2094)

Co-authored-by: Tracy Hertneky <[email protected]>
Co-authored-by: George McCabe <[email protected]>

* Fix for Dockerfile smell DL4000 (#2112)

Co-authored-by: Giovanni Rosa <[email protected]>

* Changed "PROJECT" to "CYCLE" ASSIGNMENT

* Feature 2115 update use cases (#2133)

* Bugfix #2082 develop regrid.convert/censor_thresh/censor_val (#2140)

fix #2082 main_v5.0 regrid.convert/censor_thresh/censor_val (#2101)

* Bugfix #2137 develop PointStat -obs_valid_beg/end (#2141)

* Feature #2143 5.1.0-beta2 release (#2144)

* update release guide steps with new info based on changes to GitHub web interface

* update version for development towards rc1 release

* Feature #1977 ARGO use case (#2148)

Co-authored-by: j-opatz <[email protected]>

* Feature develop cycle change (#2150)

* change PROJECT ASSIGNMENT to CYCLE ASSIGNMENT

* change PROJECT ASSIGNMENT to CYCLE ASSIGNMENT

* change PROJECT ASSIGNMENT to CYCLE ASSIGNMENT

* change PROJECT ASSIGNMENT to CYCLE ASSIGNMENT

* change PROJECT ASSIGNMENT to CYCLE ASSIGNMENT

* change PROJECT ASSIGNMENT to CYCLE ASSIGNMENT

* Added paths to ignore

---------

Co-authored-by: jprestop <[email protected]>

* Documentation: Update Truth Data instructions (#2154)

* upgrade python to 3.10 for documentation builds to fix failured introduced by urllib3 (see urllib3/urllib3#2168)

* update workflow to update input test data to use branch from pull down or enter branch by hand if branch does not exist in dtcenter/METplus repo, e.g. if updating data for a PR coming from a fork

* Bugfix #2161 develop PCPCombine additional field arguments in -subtract mode (#2162)

* changed order of workflow event triggering info to more easily see the repository and commit sha that triggered the workflow

* fix docker compose install and call -- needed due to new Alpine Linux release 3.18.0 that does not include docker-compose in the apk repository

* Bugfix #2168 develop - StatAnalysis time shift (#2169)

* Feature 1978 update pyreq doc (#2177)

* Updating for 5.1.0

* Adding greater than or equal to signs

* Feature 2106 release support (#2182)

* Added a paragraph for Release Support Policy

* Added a sentence about contacting the team through the METplus GitHub Discussions Forum.

* Added Release Support Policy info

* Per #2159, modify instructions to reflect that we only want a coordinated release for the official releases and updates to the coordinated release section for the bugfix releases. (#2183)

* Feature 2147 workflow doc (#2185)

* Add new images for github workflow

* Added PR section

* Modified the Find the GitHub Issue to be Find or Create a GitHub issue

* Trying out image keyword compared with figure keyword

* Trying out various widths

* Added new figures

* Reverting to figures from images after modifying figures

* Adding the old images which are better quality

* Trying out new indention

* Working on formatting again

* Reducing image widths

* Update docs/Contributors_Guide/github_workflow.rst

Co-authored-by: George McCabe <[email protected]>

* Update docs/Contributors_Guide/github_workflow.rst

Co-authored-by: George McCabe <[email protected]>

* Update docs/Contributors_Guide/github_workflow.rst

Co-authored-by: George McCabe <[email protected]>

* Update github_workflow.rst

---------

Co-authored-by: George McCabe <[email protected]>

* added scripts to create new conda environment for PANDA-C use cases

* Bugfix #2189 develop - spaces in complex thresholds (#2191)

* added release notes for completed issues for rc1

* Feature 2011 tci from cesm fluxnet2015 netcdf (#2192)

Co-authored-by: Mrinal Biswas <[email protected]>
Co-authored-by: George McCabe <[email protected]>

* Bugfix #2179 develop TCPairs fix -diag argument (#2187)

* sort list of files to make command more readable and make logic more easily testable

* fix unit test to expect alphabetical order of files

* Feature #2197 MODE new multi-variate options (#2203)

* added to release notes

* added release notes for other items completed for rc1 release

* Feature #1626 TCDiag Wrapper (#2201)

* Feature #1610 first round of SonarQube fixes (#2200)

* Feature #2195 create v5.1.0-rc1 release (#2204)

* Update version for development towards official release

* updated script to use metplotpy as base and install pygrib because conda was failing trying to install matplotlib in Docker for some strange reason

* Feature 2188 use case panda c (#2202)

* added first use case, need to finish docs and add to list

* added documentation files, 3 new cases

* added 5th use case, docs

* final use case, corrected paths for output

* Update GridStat_fcstGFS_obsERA5_lowAndTotalCloudFrac.py

* removed chars, added space to last section

* turn off 5/6 new air quality and comp use cases because they are causing the disk to fill up in the automated tests and only 1 is needed to test the new behavior. Reordered use case groups to be alphabetical

* disabled other new air quality use case because the disk is still filling up from this case

* Feature 2136 cross spectra (#2208)

* per #2212, continue instead of return so other forecast leads will not be skipped

* Feature #2210 MODE multi-variate variable rename (#2211)

* Bugfix diff tests (#2217)

* added change from NCEP produtil that was somehow not included in the changes pulled from their repo before starting SonarQube work

* Feature #2228 v5.1.0-rc2 release (#2229)

* update version after rc2 release to note development towards official 5.1.0 release

* Feature #2188 move PANDA-C cases to clouds category and fix automated tests (#2237)

Co-authored-by: j-opatz <[email protected]>

* Feature 2198 use case amdar pbl (#2206)

Co-authored-by: Daniel Adriaansen <[email protected]>
Co-authored-by: George McCabe <[email protected]>

* Bugfix #2235 rename multivar_itensity to multivar_intensity_flag (#2236)

* Feature #2230 MvMODE usecase doc updates (#2239)

This updates the use-case documentation to go along with the multivariate MODE enhancements.

* combine release notes from development releases for 5.1.0 release

* fix indentation to prevent incorrect nesting of drop down menus

* Bugfix #2241 Create directory containing -out_stat file (#2242)

* Enhance diff logic to control decimal precision to prevent failures (#2243)

* Bugfix #2245 use unique run ID to name logger instance (#2247)

* per #2245, add METplusConfig class function that is called when object is deleted to close log handlers. This prevents OSError: [Errno 24] Too many open files from running all pytests

* Feature #1626 TCDiag updates to wrapper and basic use case (#2248)

Co-authored-by: Jonathan Vigh <[email protected]>

* move new use case into another group

* Bugfix #2244 develop fix diff tests (#2254)

* skip diff for specific png images that produce diffs occasionally but look the same visually

* add 2 more keywords for use cases that occasionally flag small, unnoticeable diffs in png images

* Feature #2253 update tests for diff_util (#2256)

Co-authored-by: root <root@localhost>

* Feature #1974 Documentation: update coding standards section (#2260)

* Feature #2253 conftest fixture to set pytest tmpdir (#2261)

* Feature #2151 Documentation: Add quick search keywords METplotpy/calcpy use cases (#2259)

* Feature #2138 CI enhance MET Docker tag override (#2258)

* Updating development instructions.

* fixed typo

* fixed another typo

* Feature #2207 Documentation - Updates to Contributor's Guide (#2263)

Co-authored-by: Dan Adriaansen <[email protected]>

* Feature develop update install files (#2266)

* Updating installation files

* Removing run_commands.sh

* Updated the file to add a MINICONDA_PATH

* Adding files for jet

* Adding orion file

* Removing beta references

* Corrected met version

* Adding files for WCOSS2 machines

* Removing rc1 from acorn file

* Removing beta1

* Bugfix #1853 develop - PointStat don't require mask variables to be set (#2262)

* update version of certifi to match auto-generated dependabot PR #2267

* feature #2253 more tests for diff_util.py (#2264)

* update versions of METplus components for the next official release

* updated release notes for 5.1.0 release

* removed duplicate entries in release notes

* Added EC2 instance recipee with S3 mounting ability (#2269)

* Updating the Subsetting Tests by Marker section (#2272)

* update release date for 5.1.0 release (#2276)

* update version for development towards 6.0.0-beta1 release

* added new use case that was missing

* Bugfix #2279 develop - buoy station file from 2022 (#2280)

* Feature 2253 series analysis tests (#2277)

* Fix typo in pull_request_template.md

* Make code coverage report available (#2287)

* Use updated dtcenter/metplus-action-data-update tag that fixes bug that causes GHA disk to exceed capacity when too many data volumes are created. Use specific commit of coveralls python action to ensure it will not change

* removed climatology keyword from use cases that aren't relevant that were accidentally added with PR #1984

* update readme with current information

* Feature #2282 coord_release_docs (#2288)

Co-authored-by: George McCabe <[email protected]>

* continue workflow if coveralls step fails -- this typically happens on a pull request from a fork because the authentication fails

* Feature 2253 system util tests (#2297)

* Feature #2294 LSR use case (#2295)

* Feature 2253 run util tests (#2307)

* Release Guide - remove beta/rc tags/releases (#2309)

* Add 'component: repository maintenance' label. Already ran the script to push this change and the NOAA OAR reporting label to all the METplus repos.

* Hotfix for labels, adding a new one for 'component: input data' and also fixing the get_lablels.sh to search for up to 200 existing labels. Also work on the log messages.

* Fix typo in comment

* Feature #2283 time looping consolidation (#2311)

Co-authored-by: John Halley Gotway <[email protected]>

* New issue template: Update Truth (#2332)

Co-authored-by: John Halley Gotway <[email protected]>

* feature #2253 tests for run_util, 'Usage' bugfix (#2313)

* Feature #2338 Debian 12 Conda environments (#2341)

Co-authored-by: John Halley Gotway <[email protected]>

* Feature 1488 usecase satwinds (#2324)

Co-authored-by: George McCabe <[email protected]>

* Feature #2283 include times (#2345)

Co-authored-by: John Halley Gotway <[email protected]>

* feature #2253 tests for config_validate, mock logger in conftest (#2320)

* Feature #2299 / #2310 Remove deprecated MET config env vars and TCMPRPlotter (#2347)

Co-authored-by: John Halley Gotway <[email protected]>

* remove MODEL and OBTYPE to use defaults from MET config

* Feature #2348 v6.0.0-beta1 release (#2351)

* update version for development towards 6.0.0-beta2 release

* copy libGL and libEGL files into docker image to prevent errors with geovista python package

* run use that uses geovista to test

* Feature #2156 release_acceptance_testing (#2352)

* feature #2253 print error logs from conftest (#2358)

* feature #2253 met_db_load tests (#2355)

* Rename 5.1.0.lua_wcoss2 to 6.0.0.lua_wcoss2

* Update and rename 5.1.0_acorn to 6.0.0_acorn

* Update 6.0.0_acorn

* feature #2253 add tests for gfdl_tracker (#2354)

Co-authored-by: George McCabe <[email protected]>

* Create 6.0.0_gaea

* Update and rename 5.1.0_hera to 6.0.0_hera

* Feature #2156 release_acceptance_testing take2 (#2361)

Co-authored-by: lisagoodrich <[email protected]>

* Feature #2329 Docker info in Installation Chapter (#2366)

* feature_2253_extract_tiles_tests (#2368)

* Feature 2253 tc pairs tests (#2369)

* Feature 2253 tc csv writer (#2373)

* update requirements for building docs to get around build failure where python packages required to build RTD have disappeared from the automatically generated commands from RTD

* fix ReadTheDocs requirements to include pillow which is a dependency of sphinx-gallery: see https://blog.readthedocs.com/defaulting-latest-build-tools/ for more info on why this was necessary

* Feature #2340 TCDiag one_time_per_file_flag (#2374)

* Update and rename 5.1.0_jet to 6.0.0_jet

* Added libssh

* prune docker files before running use cases to prevent running out of disk space when running use cases, ci-run-all-diff

* Feature 2253 command builder tests (#2378)

* Feature 2253 series analysis test (#2380)

* Feature 2253 py embed test (#2379)

* ignore cyclone plotter from code coverage report because it will be replaced with METplotpy logic

* Feature 898 headers (#2389)

* changing _ to - for header consistency

* changing _ to - for header consistency

* updating all headers for consistency

* updating all headers for consistency and adding spacing

The spacing doesn't seem to be required but it is the convention that we follow for headers.

* updating all headers for consistency

* updating headers for consistency and adding capital letters to  headers

* Using the overline ### to keep index consistent with other indexes

* updating all headers for consistency

* update requirements for building docs to get around build failure where python packages required to build RTD have disappeared from the automatically generated commands from RTD

* updating all headers and some spacing for consistency

* updating headers for consistency

* changing to ### for consistency

* Per #898, fixed the headers for the Release Guide part, chapters, and sections.

* Duplicating changes in develop branch for requirements.txt file

* updating headers

* Per #2669, updated header formatting to resolve errors

* Per #2669, udpating header

* Per #2669, udpating headers

* Per #2669, udpating header

* Per #2669, updated header formatting

* Per #2669, update header formatting

* updating headers

* Per #898, removed space in front of title

* Capitalizing Please

* changing to just italics to match standard formatting

* indenting for consistent formatting

* fixing italics again

* changing from note to warning for consistency

* updating headers, adding some capitalizing to the headers

* fixing typo

Co-authored-by: George McCabe <[email protected]>

* This file was committed but never updated or used

Per Minna, ok to delete.

* Restructuring table of contents to make it more clear which guides are for users and which are for contributors

* fixing formatting for clairity

Co-authored-by: Julie Prestopnik <[email protected]>

---------

Co-authored-by: George McCabe <[email protected]>
Co-authored-by: Julie Prestopnik <[email protected]>

* Feature #2349 upgrade instructions for deprecated MET config files (#2386)

* Feature 2123 di doc update (#2392)

Co-authored-by: Tracy <[email protected]>

* change log to list name of config variable , e.g. GRID_STAT_CONFIG_FILE, to easily see which variable should be removed

* Feature 1667 doc conventions (#2397)

* New additions based on the old branch feature_1667_updating_overview

* Moving the release-notes reference label

* Added label for METplus_glossary for use in Documentation conentions section.

* Adding images for the Documentation Conventions section

* Modifying wording and testing formatting in Internal Links section

* Second take on formatting

* Third attempt at formatting

* Fourth attempt at formatting

* Modified wording, sections, and formatting

* Minor modifications

* Added period

* Changed Pretty Table to PrettyTable

* Modify informationg about converting an existing table and adding images

* Resolving errors

* Reformatting

* Moving placement of reference label

* Attempting to fix table title

* Fixed incorrect alignment

* Made changes based on Lisa's suggestions

* Made changes based on Lisa's suggestions

* Made corrections

* Made corrections

* Per #1667, fixing typos

* Per #1667, corrected text

---------

Co-authored-by: Julie Prestopnik <[email protected]>

* Feature #2377 Log to terminal only (#2398)

* Update conda envs to use conda-forge only (#2402)

* rearrange MET config env var tables for GridStat so they are in the order that they appear in the wrapped MET config file

* use mamba instead of conda and update version of netcdf python package used to 1.6.2

* skip s2s_mid_lat WeatherRegime use case that produces different results often

* updated version of xesmf because <0.7.1 does not work with mamba

* per #2412, fix bug in GenVxMask to put quotes around argument so a grid specification string with spaces will be an accepted value

* downgrade version of esmf package to fix bug described in pangeo-data/xESMF#246

* Feature #2219 SeriesAnalysis multiple input files (#2408)

* Adding 3 new requestors to the list of common_labels.txt for NOAA/NHC, CSU/CIRA, and Australian BOM ci-skip-all

* Feature 2405 match tables2wrapper (#2416)

Co-authored-by: George McCabe <[email protected]>

* per #2423, follow symbolic links when traversing directories to find files within a time window, ci-run-all-diff

* Feature #2252 WaveletStat wrapper (#2427)

Co-authored-by: j-opatz <[email protected]>

* add WaveletStat use case to group and temporarily disable TCDiag use case because changes to the wrapper are needed to fix it after changes to the MET tool were merged

* update version number for beta2 release (#2431)

* update version for dev towards beta3

* Feature #2371 Embed use case upgrade demo video into upgrade instructions (#2444)

* fix failing use case tests -- install python packages dateutil and requests via apk instead of pip because the pip commands began failing -- see PEP668 https://peps.python.org/pep-0668/ -- also changed scripts to create conda environments for use case tests to install all packages in a single call to mamba instead of individual calls

* remove commands to install geovista from source because it is now installed from conda

* Feature #1989: Add OMI use case (#2457)

Co-authored-by: George McCabe <[email protected]>

* Feature #2432 TCDiag new config changes (#2453)

* move medium range 10 use case into group with 3-5 to speed up runs

* Feature #2334 land_mask (and topo_mask) in PointStat (#2456)

* added use cases with pygrib

* Feature #2430 TCPairs consensus.diag_required and consensus.diag_min_req (#2439)

* Quickfix cloud use case desc imgs (#2464)

* added pics, updated desc

* add last two imgs

* Fixing spelling and capitalization

* Feature 2454 doc overview conv (#2471)

* adding documentation in different sections

* adding grid table section

* fixing links

* grammar updates

* Per #2454, updated sections and wording.

* Per #2454, added a period to the end of a sentence.

* Per #2454, fixing formatting

* Per #2454, updating wording

* adding a section for line breaks in a table

* adding :code: information

* trying to fix warning

* take 2

* take 3 or 4

* maybe fixed

* updating link

* fixing web link again

* web link saga continues

* Changed "ReadTheDocs" to "Read the Docs"

* Updated "main_v" references to be "main_v12.0"

* Removed references to main_v*, replacing with raw RST 

It is not maintainable to have links to branches which will become old.  Since we can avoid it by adding the raw RST in the documentation, I have removed all references to main_v* in favor of placing the raw RST in the documentation.

* Modified the "Code in a Paragraph" section

* Reworded for consistency within the document

* Added back the link for Sphinx code blocks

---------

Co-authored-by: Julie Prestopnik <[email protected]>

* add argument to workflow dispatch event so that MET DockerHub repo used for tests can be easily overridden to test changes in a MET PR before merging

* Feature dtcenter/MET#2796 GHA Node20 deprecation warnings (#2473)

* per dtcenter/MET#2796, update versions of actions to prevent deprecated node warnings in GHA runs

* change arguments to workflow dispatch so they are no longer required -- these are not needed to be set when triggering by hand through the web interface

* Feature dtcenter/MET#2796 develop - Fix error log artifact creation (#2475)

* updated version of pillow to fix security vulnerability alerted by dependabot in PR #2477

* remove docker image after runtime image is created from metplus image and conda env image

* turn on use case to test image removal

* prune images if image tag doesn't exist -- it appears that if the image is built on the fly (when PR is coming from fork) then the tag exists, but if not, the image tag is set to <none>

* support commands that must run in the shell to see if || will work in docker image pruning step

* try to fix image removal

* Feature 2383 use case sat alt (#2480)

* new docs, files for use case

* new files

* updating to run use case

* updated python libraries, changed test env

* trying new point logic

* added to script for nan removal

* redid Python script to take adv of new MET ability for nans

* Update run status

* removed unused settings

* run image prune commands separately

* changed shell back to false

* split up use case groups so the same envs are used by a group to see if that resolves the disk space issues

* turn off use cases

* feature 2253 fix empty pytest logs (#2485)

* added more commands to free up disk space as suggested in https://github.com/apache/flink/blob/master/tools/azure-pipelines/free_disk_space.sh, ci-run-all-cases

* Feature 2406 redo usecase rrfs (#2488)

* issue #2406 RRFS use case files

* issue #2406 added usecase to tests

* Issue #2406 added metplotpy and metcalcpy as dependencies

* Feature #2460 allow missing input (#2493)

* changed template to use datetime format that works on MacOS

* update logic to only write a file list file if there are more than 1 files, updated unit tests to match new behavior, added exception handling to series analysis to prevent crash if file does not exist

* use getraw instead of getstr to prevent crash if providing a filename template tag to override a config variable on the command line

* Add optional argument to subset file function to always write a file list text file even if there is only 1 file found. Use this argument in UserScript wrapper so that the environment variables that contain paths to file list files are consistent in format for use in user scripts

* enhanced function to support different output variable types

* removed the need for overriding clear function in specific wrappers and added optional argument to skip clearing input file list

* clean up formatting

* per #2460, start to implement logic to prevent errors when some input files are not found

* isolate logic to find input files into find_input_files functions. clean up those functions to return boolean instead of sometimes returning None or a list of files to be consistent

* remove python embedding checks because MET is now smart enough to determine if a python script is used with always setting file_type

* turn on use cases to test error handling

* merge artifacts

* run only failed cases

* always run merge step

* run on a case that will succeed to test error log merge step

* only run error log merge step if there were 'Save error logs' jobs that succeeded

* run cases that will fail

* fix condition to merge error logs

* run group that will succeed but have diffs - check error logs doesn't fail

* testing - add use case group that will succeed but will cause diffs becaus there is no truth data - to confirm that the error log merge step behaves properly in this case

* run 3 jobs, 2 should error, to confirm that error_logs is created properly

* repeat diff no error test but with

* per dtcenter/MET#2796, fix error log artifact creation by merging error logs if any of the 'Save error logs' steps ran successfully

* run test to confirm diff does not cause merge error logs to fail

* Revert "run test to confirm diff does not cause merge error logs to fail"

This reverts commit ff2d1ca.

* run test to confirm error logs are merged properly when 2 use case groups have errors

* try checking output variable as string instead of boolean

* Revert "run test to confirm error logs are merged properly when 2 use case groups have errors"

This reverts commit 8106666.

* run test again

* test again

* move check for error logs for shell script and use github env vars

* Revert "run test again"

This reverts commit 7a0a99c.

* break 2 use cases to test that error logs are still created properly

* checkout repo to get script used to merge error logs

* Revert "break 2 use cases to test that error logs are still created properly"

This reverts commit cb6d0b4.

* test merge error log again on no error diff run

* fix script

* move merge error logic back to workflow

* break 2 use cases to test that error logs are still created properly

* Revert "break 2 use cases to test that error logs are still created properly"

This reverts commit 82aa0e1.

* remove testing use case group

* Revert "remove python embedding checks because MET is now smart enough to determine if a python script is used with always setting file_type"

This reverts commit de3b4b0.

* clean up lines

* update logic to check that python embedding is set up properly to only try to set file_type automatically if it is not already set and if the wrapper is a tool that supports multiple input files via python embedding (which require file_type to be set). also changed error if not set properly to warning and use PYTHON_NUMPY as a default

* remove run_count increment before run_at_time_once - set closer to find_input_files so run count and missing input count are consistent

* return boolean from find_input_files function to be consistent with other functions

* per #2460, warn instead of error if missing inputs are allowed, track counters for number of runs and missing inputs

* per #2460, added check to report error if allowed missing input threshold is met

* run clear before running plot_data_plane

* removed test group

* report warning instead of error if ALLOW_MISSING_INPUTS is True

* cleanup

* change function to pytest fixture so it can be used by other test scripts

* update ascii2nc test to process more than 1 time to ensure commands are built properly for each run

* add unit tests to ensure missing input file logic works properly for ascii2nc and grid_stat

* set variable to skip RuntimeFreq logic to find input files to prevent duplicate increment of run_count -- these will be removed when the wrapper has been updated to find files using RuntimeFreq logic

* remove unneccesary error checking

* cleanup

* call function to handle input templates that need to be handled separately for each item in the comma-separated list (for UserScript and GridDiag only)

* add time_info to ALL_FILES dictionaries to be consistent with other wrappers

* clean up logging for reporting error when missing inputs exceeds threshold

* added function to get files for a single run time to be consistent with other functions

* skip increment of run_count when FIND_FILES=True and RuntimeFreq input file logic is skipped to prevent duplicate increments

* added empty test files

* remove redundant variables

* view warnings on a failed test run

* add more empty test files

* added unit tests for missing input logic

* remove MANDATORY setting for EnsembleStat and GenEnsProd and instead pass mandatory argument to call to find model files so warnings/errors are properly displayed for other inputs

* cleanup

* remove allow missing input logic from ExtractTiles wrapper

* added functions to parse template/dir variables from config, removed explicit calls to read those variables from GridStat

* remove error if more labels than inputs are provided (for UserScript and GridDiag only) -- extra labels will just be ignored

* added required boolean for input templates

* per #2460, change warning messages to debug when checking a list of DA offsets since it is common that a given offset will not always be found in the files

* added tests for missing input logic for many wrappers

* cleanup

* fix increment of number of runs

* skip missing input logic

* change how required is handled for input templates

* warn instead of error if missing input is allowed

* remove increment of missing input counters because it is handled in RuntimeFreq

* check status of input files and increment counters in overridden run_once_per_lead. remove increment of missing input counters because it is handled in run_once_per_lead

* added unit tests for missing input logic

* skip missing input logic

* cleanup

* cleanup, use fixture for tests, add unit tests for missing input, bypass missing input logic on wrappers that don't need it

* removed file that is not needed

* added unit tests for pb2nc to test -valid_beg/end arguments and changes to properly support any runtime frequencies

* warn instead of error if allowing missing inputs

* cleanup

* implement changes to properly support all runtime frequencies for pb2nc. previously all files that match a wildcard will be used instead of selecting only files that fall within the specified time range. some functions moved into pb2nc wrapper will eventually be moved up so that they are used by all wrappers to be consistent

* added unit tests that will fail until wrapper is updated

* replace functions in RuntimeFreq wrapper used to find input files so they can be used by all wrappers, updated ioda2nc wrapper to find input files properly to fix tests

* cleanup

* removed mtd version of get_input_templates and added logic to RuntimeFreq's version to get the same behavior

* added unit tests for MTD missing input checks

* per #2491, add release notes for beta3

* Feature #2491 v6.0.0 beta3 (#2495)

* update version for beta3 release

* fixed typos in release notes

* update version to note development towards beta4 release

* Per suggestion from @JohnHalleyGotway, create intermediate branch for updating truth data to avoid branch protection rules. I added a step to delete the intermediate branch locally if it exists to prevent conflicts with the update

* added quotes to prevent error in echo caused by parenthesis

* fix incorrect command

* Revert "fix incorrect command"

This reverts commit e7dffb6.

* Revert "added quotes to prevent error in echo caused by parenthesis"

This reverts commit c1cb3c4.

* Revert "Per suggestion from @JohnHalleyGotway, create intermediate branch for updating truth data to avoid branch protection rules. I added a step to delete the intermediate branch locally if it exists to prevent conflicts with the update"

This reverts commit 525809d.

---------

Co-authored-by: George McCabe <[email protected]>
Co-authored-by: metplus-bot <[email protected]>
Co-authored-by: Julie Prestopnik <[email protected]>
Co-authored-by: lisagoodrich <[email protected]>
Co-authored-by: j-opatz <[email protected]>
Co-authored-by: John Halley Gotway <[email protected]>
Co-authored-by: j-opatz <[email protected]>
Co-authored-by: Lisa Goodrich <[email protected]>
Co-authored-by: Tracy Hertneky <[email protected]>
Co-authored-by: Tracy Hertneky <[email protected]>
Co-authored-by: Giovanni Rosa <[email protected]>
Co-authored-by: Giovanni Rosa <[email protected]>
Co-authored-by: Dan Adriaansen <[email protected]>
Co-authored-by: mrinalbiswas <[email protected]>
Co-authored-by: Mrinal Biswas <[email protected]>
Co-authored-by: Christina Kalb <[email protected]>
Co-authored-by: jason-english <[email protected]>
Co-authored-by: Jonathan Vigh <[email protected]>
Co-authored-by: John Sharples <[email protected]>
Co-authored-by: root <root@localhost>
Co-authored-by: Hank Fisher <[email protected]>
Co-authored-by: reza-armuei <[email protected]>
Co-authored-by: Tracy <[email protected]>
Co-authored-by: Mallory Row <[email protected]>
Co-authored-by: bikegeek <[email protected]>
  • Loading branch information
26 people authored Feb 15, 2024
1 parent b3f2f93 commit 411abb2
Show file tree
Hide file tree
Showing 84 changed files with 1,838 additions and 852 deletions.
1 change: 0 additions & 1 deletion .github/workflows/testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,6 @@ jobs:
needs: use_case_tests
if: ${{ always() && needs.use_case_tests.result == 'failure' }}
steps:
- uses: actions/checkout@v4
- name: Check for error logs
id: check-for-error-logs
run: |
Expand Down
42 changes: 42 additions & 0 deletions docs/Users_Guide/release-notes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,48 @@ When applicable, release notes are followed by the
`GitHub issue <https://github.com/dtcenter/METplus/issues>`__ number which
describes the bugfix, enhancement, or new feature.

METplus Version 6.0.0 Beta 3 Release Notes (2024-02-08)
-------------------------------------------------------

.. dropdown:: Enhancements

* Add support for MET land-mask settings in Point-Stat
(`#2334 <https://github.com/dtcenter/METplus/issues/2334>`_)
* Enhance the TC-Pairs wrapper to support the new diag_required and diag_min_req configuration options
(`#2430 <https://github.com/dtcenter/METplus/issues/2430>`_)
* Enhance the TC-Diag wrapper to support new configuration options added in MET-12.0.0-beta2
(`#2432 <https://github.com/dtcenter/METplus/issues/2432>`_)
* Prevent error if some input files are missing
(`#2460 <https://github.com/dtcenter/METplus/issues/2460>`_)

.. dropdown:: Bugfix

NONE

.. dropdown:: New Wrappers

NONE

.. dropdown:: New Use Cases

* Verify Total Column Ozone against NASA's OMI dataset
(`#1989 <https://github.com/dtcenter/METplus/issues/1989>`_)
* RRFS reformatting, aggregating, and plotting use case
(`#2406 <https://github.com/dtcenter/METplus/issues/2406>`_)
* Satellite Altimetry data
(`#2383 <https://github.com/dtcenter/METplus/issues/2383>`_)

.. dropdown:: Documentation

* Create video to demonstrate how to update use cases that use deprecated environment variables
(`#2371 <https://github.com/dtcenter/METplus/issues/2371>`_)

.. dropdown:: Internal

* Update Documentation Overview and Conventions
(`#2454 <https://github.com/dtcenter/METplus/issues/2454>`_)


METplus Version 6.0.0 Beta 2 Release Notes (2023-11-14)
-------------------------------------------------------

Expand Down
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
21 changes: 21 additions & 0 deletions internal/tests/pytests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,14 @@ def test_example(metplus_config):
if len(msg.args) != 0]
print("Tests raised the following errors:")
print("\n".join(err_msgs))
if config.logger.warning.call_args_list:
warn_msgs = [
str(msg.args[0])
for msg
in config.logger.warning.call_args_list
if len(msg.args) != 0]
print("\nTests raised the following warnings:")
print("\n".join(warn_msgs))
config.logger = old_logger
# don't remove output base if test fails
if request.node.rep_call.failed:
Expand Down Expand Up @@ -185,3 +193,16 @@ def make_nc(tmp_path, lon, lat, z, data, variable='Temp', file_name='fake.nc'):
temp[0, :, :, :] = data

return file_name


@pytest.fixture(scope="function")
def get_test_data_dir():
"""!Get path to directory containing test data.
"""
def get_test_data_path(subdir):
internal_tests_dir = os.path.abspath(
os.path.join(os.path.dirname(__file__), os.pardir)
)
return os.path.join(internal_tests_dir, 'data', subdir)

return get_test_data_path
2 changes: 2 additions & 0 deletions internal/tests/pytests/util/run_util/test_run_util.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@
'METPLUS_BASE',
'PARM_BASE',
'METPLUS_VERSION',
'ALLOW_MISSING_INPUTS',
'INPUT_THRESH',
]


Expand Down
56 changes: 46 additions & 10 deletions internal/tests/pytests/wrappers/ascii2nc/test_ascii2nc_wrapper.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ def ascii2nc_wrapper(metplus_config, config_overrides=None):
'LOOP_BY': 'VALID',
'VALID_TIME_FMT': '%Y%m%d%H',
'VALID_BEG': '2010010112',
'VALID_END': '2010010112',
'VALID_INCREMENT': '1M',
'VALID_END': '2010010118',
'VALID_INCREMENT': '6H',
'ASCII2NC_INPUT_TEMPLATE': '{INPUT_BASE}/met_test/data/sample_obs/ascii/precip24_{valid?fmt=%Y%m%d%H}.ascii',
'ASCII2NC_OUTPUT_TEMPLATE': '{OUTPUT_BASE}/ascii2nc/precip24_{valid?fmt=%Y%m%d%H}.nc',
'ASCII2NC_CONFIG_FILE': '{PARM_BASE}/met_config/Ascii2NcConfig_wrapped',
Expand Down Expand Up @@ -47,6 +47,36 @@ def ascii2nc_wrapper(metplus_config, config_overrides=None):
return ASCII2NCWrapper(config, instance=instance)


@pytest.mark.parametrize(
'missing, run, thresh, errors, allow_missing', [
(1, 3, 0.5, 0, True),
(1, 3, 0.8, 1, True),
(1, 3, 0.5, 1, False),
]
)
@pytest.mark.wrapper
def test_ascii2nc_missing_inputs(metplus_config, get_test_data_dir,
missing, run, thresh, errors, allow_missing):
config_overrides = {
'INPUT_MUST_EXIST': True,
'ASCII2NC_ALLOW_MISSING_INPUTS': allow_missing,
'ASCII2NC_INPUT_THRESH': thresh,
'ASCII2NC_INPUT_TEMPLATE': os.path.join(get_test_data_dir('ascii'), 'precip24_{valid?fmt=%Y%m%d%H}.ascii'),
'VALID_END': '2010010200',
}
wrapper = ascii2nc_wrapper(metplus_config, config_overrides)
assert wrapper.isOK

all_cmds = wrapper.run_all_times()
for cmd, _ in all_cmds:
print(cmd)

print(f'missing: {wrapper.missing_input_count} / {wrapper.run_count}, errors: {wrapper.errors}')
assert wrapper.missing_input_count == missing
assert wrapper.run_count == run
assert wrapper.errors == errors


@pytest.mark.parametrize(
'config_overrides, env_var_values', [
({},
Expand Down Expand Up @@ -163,11 +193,13 @@ def test_ascii2nc_wrapper(metplus_config, config_overrides,

input_path = wrapper.config.getraw('config', 'ASCII2NC_INPUT_TEMPLATE')
input_dir = os.path.dirname(input_path)
input_file = 'precip24_2010010112.ascii'
input_file1 = 'precip24_2010010112.ascii'
input_file2 = 'precip24_2010010118.ascii'

output_path = wrapper.config.getraw('config', 'ASCII2NC_OUTPUT_TEMPLATE')
output_dir = os.path.dirname(output_path)
output_file = 'precip24_2010010112.nc'
output_file1 = 'precip24_2010010112.nc'
output_file2 = 'precip24_2010010118.nc'

all_commands = wrapper.run_all_times()
print(f"ALL COMMANDS: {all_commands}")
Expand All @@ -177,13 +209,17 @@ def test_ascii2nc_wrapper(metplus_config, config_overrides,
verbosity = f"-v {wrapper.c_dict['VERBOSITY']}"
config_file = wrapper.c_dict.get('CONFIG_FILE')

expected_cmd = (f"{app_path} "
f"{input_dir}/{input_file} "
f"{output_dir}/{output_file} "
f"-config {config_file} "
f"{verbosity}")
expected_cmds = [
(f"{app_path} {input_dir}/{input_file1} {output_dir}/{output_file1} "
f"-config {config_file} {verbosity}"),
(f"{app_path} {input_dir}/{input_file2} {output_dir}/{output_file2} "
f"-config {config_file} {verbosity}"),
]

assert all_commands[0][0] == expected_cmd
assert len(all_commands) == len(expected_cmds)
for (cmd, _), expected_cmd in zip(all_commands, expected_cmds):
# ensure commands are generated as expected
assert cmd == expected_cmd

env_vars = all_commands[0][1]

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1199,17 +1199,20 @@ def test_errors_and_defaults(metplus_config):
assert actual == False
assert _in_last_err('Could not generate command', cb.logger)

# test python embedding error
# test python embedding check
with mock.patch.object(cb_wrapper, 'is_python_script', return_value=True):
actual = cb.check_for_python_embedding('FCST',{'fcst_name':'pyEmbed'})
assert actual == None
assert _in_last_err('must be set to a valid Python Embedding type', cb.logger)
assert actual == 'python_embedding'

cb.c_dict['FCST_INPUT_DATATYPE'] = 'PYTHON_XARRAY'
cb.env_var_dict['METPLUS_FCST_FILE_TYPE'] = "PYTHON_NUMPY"
with mock.patch.object(cb_wrapper, 'is_python_script', return_value=True):
actual = cb.check_for_python_embedding('FCST',{'fcst_name':'pyEmbed'})
assert actual == 'python_embedding'

with mock.patch.object(cb_wrapper, 'is_python_script', return_value=False):
actual = cb.check_for_python_embedding('FCST',{'fcst_name':'pyEmbed'})
assert actual == 'pyEmbed'

# test field_info not set
cb.c_dict['CURRENT_VAR_INFO'] = None
actual = cb.set_current_field_config()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@

import os

from datetime import datetime


from metplus.wrappers.ensemble_stat_wrapper import EnsembleStatWrapper

fcst_dir = '/some/path/fcst'
Expand All @@ -27,7 +24,7 @@
run_times = ['2005080700', '2005080712']


def set_minimum_config_settings(config, set_fields=True):
def set_minimum_config_settings(config, set_fields=True, set_obs=True):
# set config variables to prevent command from running and bypass check
# if input files actually exist
config.set('config', 'DO_NOT_RUN_EXE', True)
Expand All @@ -46,11 +43,12 @@ def set_minimum_config_settings(config, set_fields=True):
config.set('config', 'ENSEMBLE_STAT_CONFIG_FILE',
'{PARM_BASE}/met_config/EnsembleStatConfig_wrapped')
config.set('config', 'FCST_ENSEMBLE_STAT_INPUT_DIR', fcst_dir)
config.set('config', 'OBS_ENSEMBLE_STAT_GRID_INPUT_DIR', obs_dir)
config.set('config', 'FCST_ENSEMBLE_STAT_INPUT_TEMPLATE',
'{init?fmt=%Y%m%d%H}/fcst_file_F{lead?fmt=%3H}')
config.set('config', 'OBS_ENSEMBLE_STAT_GRID_INPUT_TEMPLATE',
'{valid?fmt=%Y%m%d%H}/obs_file')
if set_obs:
config.set('config', 'OBS_ENSEMBLE_STAT_GRID_INPUT_DIR', obs_dir)
config.set('config', 'OBS_ENSEMBLE_STAT_GRID_INPUT_TEMPLATE',
'{valid?fmt=%Y%m%d%H}/obs_file')
config.set('config', 'ENSEMBLE_STAT_OUTPUT_DIR',
'{OUTPUT_BASE}/EnsembleStat/output')
config.set('config', 'ENSEMBLE_STAT_OUTPUT_TEMPLATE', '{valid?fmt=%Y%m%d%H}')
Expand All @@ -62,6 +60,74 @@ def set_minimum_config_settings(config, set_fields=True):
config.set('config', 'OBS_VAR1_LEVELS', obs_level)


@pytest.mark.parametrize(
'allow_missing, optional_input, missing, run, thresh, errors', [
(True, None, 3, 8, 0.4, 0),
(True, None, 3, 8, 0.7, 1),
(False, None, 3, 8, 0.7, 3),
(True, 'obs_grid', 4, 8, 0.4, 0),
(True, 'obs_grid', 4, 8, 0.7, 1),
(False, 'obs_grid', 4, 8, 0.7, 4),
(True, 'point_grid', 4, 8, 0.4, 0),
(True, 'point_grid', 4, 8, 0.7, 1),
(False, 'point_grid', 4, 8, 0.7, 4),
(True, 'ens_mean', 4, 8, 0.4, 0),
(True, 'ens_mean', 4, 8, 0.7, 1),
(False, 'ens_mean', 4, 8, 0.7, 4),
(True, 'ctrl', 4, 8, 0.4, 0),
(True, 'ctrl', 4, 8, 0.7, 1),
(False, 'ctrl', 4, 8, 0.7, 4),
# still errors if more members than n_members found
(True, 'low_n_member', 8, 8, 0.7, 6),
(False, 'low_n_member', 8, 8, 0.7, 8),
]
)
@pytest.mark.wrapper_b
def test_ensemble_stat_missing_inputs(metplus_config, get_test_data_dir, allow_missing,
optional_input, missing, run, thresh, errors):
config = metplus_config
set_minimum_config_settings(config, set_obs=False)
config.set('config', 'INPUT_MUST_EXIST', True)
config.set('config', 'ENSEMBLE_STAT_ALLOW_MISSING_INPUTS', allow_missing)
config.set('config', 'ENSEMBLE_STAT_INPUT_THRESH', thresh)
n_members = 4 if optional_input == 'low_n_member' else 6
config.set('config', 'ENSEMBLE_STAT_N_MEMBERS', n_members)
config.set('config', 'INIT_BEG', '2009123106')
config.set('config', 'INIT_END', '2010010100')
config.set('config', 'INIT_INCREMENT', '6H')
config.set('config', 'LEAD_SEQ', '24H, 48H')
config.set('config', 'FCST_ENSEMBLE_STAT_INPUT_DIR', get_test_data_dir('ens'))
config.set('config', 'FCST_ENSEMBLE_STAT_INPUT_TEMPLATE',
'{init?fmt=%Y%m%d%H}/arw-*-gep?/d01_{init?fmt=%Y%m%d%H}_{lead?fmt=%3H}00.grib')

if optional_input == 'obs_grid':
prefix = 'OBS_ENSEMBLE_STAT_GRID'
elif optional_input == 'point_grid':
prefix = 'OBS_ENSEMBLE_STAT_POINT'
elif optional_input == 'ens_mean':
prefix = 'ENSEMBLE_STAT_ENS_MEAN'
elif optional_input == 'ctrl':
prefix = 'ENSEMBLE_STAT_CTRL'
else:
prefix = None

if prefix:
config.set('config', f'{prefix}_INPUT_DIR', get_test_data_dir('obs'))
config.set('config', f'{prefix}_INPUT_TEMPLATE', '{valid?fmt=%Y%m%d%H}_obs_file')

wrapper = EnsembleStatWrapper(config)
assert wrapper.isOK

all_cmds = wrapper.run_all_times()
for cmd, _ in all_cmds:
print(cmd)

print(f'missing: {wrapper.missing_input_count} / {wrapper.run_count}, errors: {wrapper.errors}')
assert wrapper.missing_input_count == missing
assert wrapper.run_count == run
assert wrapper.errors == errors


@pytest.mark.parametrize(
'config_overrides, expected_filename', [
# 0 - set forecast level
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

from metplus.wrappers.extract_tiles_wrapper import ExtractTilesWrapper


def extract_tiles_wrapper(metplus_config):
config = metplus_config
config.set('config', 'PROCESS_LIST', 'ExtractTiles')
Expand All @@ -22,10 +23,6 @@ def extract_tiles_wrapper(metplus_config):
config.set('config', 'EXTRACT_TILES_LAT_ADJ', '15')
config.set('config', 'EXTRACT_TILES_LON_ADJ', '15')
config.set('config', 'EXTRACT_TILES_FILTER_OPTS', '-basin ML')
config.set('config', 'FCST_EXTRACT_TILES_INPUT_TEMPLATE',
'gfs_4_{init?fmt=%Y%m%d}_{init?fmt=%H}00_{lead?fmt=%HHH}.grb2')
config.set('config', 'OBS_EXTRACT_TILES_INPUT_TEMPLATE',
'gfs_4_{valid?fmt=%Y%m%d}_{valid?fmt=%H}00_000.grb2')
config.set('config', 'EXTRACT_TILES_GRID_INPUT_DIR',
'{INPUT_BASE}/cyclone_track_feature/reduced_model_data')
config.set('config', 'EXTRACT_TILES_PAIRS_INPUT_DIR',
Expand Down
Loading

0 comments on commit 411abb2

Please sign in to comment.