Update develop-ref after dtcenter/MET#2529 and #2148 (#2153)

Co-authored-by: Julie Prestopnik <jpresto@ucar.edu> Co-authored-by: johnhg <johnhg@ucar.edu> Co-authored-by: cristianastan2 <cstan@gmu.edu> Co-authored-by: John Halley Gotway <johnhg@ucar.edu> Co-authored-by: bikegeek <minnawin@ucar.edu> Co-authored-by: Lisa Goodrich <lisag@ucar.edu> Co-authored-by: Julie Prestopnik <jpresto@seneca.rap.ucar.edu> Co-authored-by: George McCabe <23407799+georgemccabe@users.noreply.github.com> Co-authored-by: Hank Fisher <fisherh@ucar.edu> Co-authored-by: Dan Adriaansen <dadriaan@ucar.edu> Co-authored-by: jprestop <jpresto@ucar.edu> Co-authored-by: Tracy Hertneky <hertneky@seneca.rap.ucar.edu> Co-authored-by: Giovanni Rosa <giovanni.rosa@unimol.it> Co-authored-by: j-opatz <59586397+j-opatz@users.noreply.github.com> Co-authored-by: lisagoodrich <33230218+lisagoodrich@users.noreply.github.com> Co-authored-by: bikegeek <3753118+bikegeek@users.noreply.github.com> Co-authored-by: j-opatz <jopatz@ucar.edu> Co-authored-by: Will Mayfield <59745143+willmayfield@users.noreply.github.com> Co-authored-by: metplus-bot <97135045+metplus-bot@users.noreply.github.com> Co-authored-by: Tracy Hertneky <39317287+hertneky@users.noreply.github.com> Co-authored-by: Giovanni Rosa <g.rosa1@studenti.unimol.it> fixing errors #650 fixing errors take 2 #650 fixing errors take 3 #650 fixing errors take 4 #650 fixing errors take 5 #650 fixing question order #650 fix #1706 fix PhaseDiagram use case to avoid writing into INPUT_BASE (#1708) fix #1713 develop METPLOTPY_BASE (#1715) fix #1691 remove whitespace from output file paths (#1721) fix Contributor's Guide GitHub Workflow page (#1774) fix release (#1790) fix GitHub Actions warnings (#1864) fix #1884 develop PCPCombine {custom} in subtract method (#1887) fix #1939 develop - failure reading obs when zipped file also exists (#1941) Closes #1986 fix develop Fix broken documentation links (#2004) fix #2026 develop StatAnalysis looping (#2028) fix priority of obs_window config variables so that wrapper-specific version is preferred over generic OBS_WINDOW_BEGIN/END (#2062) fix #2070 var list numeric order (#2072) fix #2087 develop docs_pdf (#2091) fix #2096/#2098 develop - fix skip if output exists and do not error if no commands were run (#2099) Fix for Dockerfile smell DL4000 (#2112) fix #2082 develop regrid.convert/censor_thresh/censor_val (#2140) fix #2082 main_v5.0 regrid.convert/censor_thresh/censor_val (#2101) fix #2137 develop PointStat -obs_valid_beg/end (#2141)
dtcenter · Apr 28, 2023 · 4e79162 · 4e79162
1 parent aca29d1
commit 4e79162
Show file tree

Hide file tree

Showing 65 changed files with 1,608 additions and 324 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -2,7 +2,7 @@
 name: Bug report
 about: Fix something that's not working
 title: 'Bugfix: '
-labels: 'alert: NEED ACCOUNT KEY, alert: NEED MORE DEFINITION, alert: NEED PROJECT ASSIGNMENT, type: bug'
+labels: 'alert: NEED ACCOUNT KEY, alert: NEED MORE DEFINITION, alert: NEED CYCLE ASSIGNMENT, type: bug'
 assignees: ''
 
 ---
@@ -49,7 +49,7 @@ Describe the steps to reproduce the behavior:
 
 ### Projects and Milestone ###
 - [ ] Select **Organization** level **Project** for support of the current coordinated release
-- [ ] Select **Repository** level **Project** for development toward the next official release or add **alert: NEED PROJECT ASSIGNMENT** label
+- [ ] Select **Repository** level **Project** for development toward the next official release or add **alert: NEED CYCLE ASSIGNMENT** label
 - [ ] Select **Milestone** as the next bugfix version
 
 ## Define Related Issue(s) ##

diff --git a/.github/ISSUE_TEMPLATE/enhancement_request.md b/.github/ISSUE_TEMPLATE/enhancement_request.md
@@ -2,7 +2,7 @@
 name: Enhancement request
 about: Improve something that it's currently doing
 title: ''
-labels: 'alert: NEED ACCOUNT KEY, alert: NEED MORE DEFINITION, alert: NEED PROJECT ASSIGNMENT, type: enhancement'
+labels: 'alert: NEED ACCOUNT KEY, alert: NEED MORE DEFINITION, alert: NEED CYCLE ASSIGNMENT, type: enhancement'
 assignees: ''
 
 ---
@@ -38,7 +38,7 @@ Consider breaking the enhancement down into sub-issues.
 - [ ] Select **requestor(s)**
 
 ### Projects and Milestone ###
-- [ ] Select **Repository** and/or **Organization** level **Project(s)** or add **alert: NEED PROJECT ASSIGNMENT** label
+- [ ] Select **Repository** and/or **Organization** level **Project(s)** or add **alert: NEED CYCLE ASSIGNMENT** label
 - [ ] Select **Milestone** as the next official version or **Future Versions**
 
 ## Define Related Issue(s) ##

diff --git a/.github/ISSUE_TEMPLATE/new_feature_request.md b/.github/ISSUE_TEMPLATE/new_feature_request.md
@@ -2,7 +2,7 @@
 name: New feature request
 about: Make it do something new
 title: ''
-labels: 'alert: NEED ACCOUNT KEY, alert: NEED MORE DEFINITION, alert: NEED PROJECT ASSIGNMENT, type: new feature'
+labels: 'alert: NEED ACCOUNT KEY, alert: NEED MORE DEFINITION, alert: NEED CYCLE ASSIGNMENT, type: new feature'
 assignees: ''
 
 ---
@@ -42,7 +42,7 @@ Consider breaking the new feature down into sub-issues.
 - [ ] Select **requestor(s)**
 
 ### Projects and Milestone ###
-- [ ] Select **Repository** and/or **Organization** level **Project(s)** or add **alert: NEED PROJECT ASSIGNMENT** label
+- [ ] Select **Repository** and/or **Organization** level **Project(s)** or add **alert: NEED CYCLE ASSIGNMENT** label
 - [ ] Select **Milestone** as the next official version or **Future Versions**
 
 ## Define Related Issue(s) ##

diff --git a/.github/ISSUE_TEMPLATE/new_use_case.md b/.github/ISSUE_TEMPLATE/new_use_case.md
@@ -2,7 +2,7 @@
 name: New use case
 about: Add a new use case
 title: 'New Use Case: '
-labels: 'alert: NEED ACCOUNT KEY, alert: NEED MORE DEFINITION, alert: NEED PROJECT ASSIGNMENT, type: new use case'
+labels: 'alert: NEED ACCOUNT KEY, alert: NEED MORE DEFINITION, alert: NEED CYCLE ASSIGNMENT, type: new use case'
 assignees: ''
 
 ---
@@ -51,7 +51,7 @@ Consider breaking the new feature down into sub-issues.
 - [ ] Select **privacy**
 
 ### Projects and Milestone ###
-- [ ] Select **Repository** and/or **Organization** level **Project(s)** or add **alert: NEED PROJECT ASSIGNMENT** label
+- [ ] Select **Repository** and/or **Organization** level **Project(s)** or add **alert: NEED CYCLE ASSIGNMENT** label
 - [ ] Select **Milestone** as the next official version or **Future Versions**
 
 ## Define Related Issue(s) ##

diff --git a/.github/ISSUE_TEMPLATE/sub-issue.md b/.github/ISSUE_TEMPLATE/sub-issue.md
@@ -2,7 +2,7 @@
 name: Sub-Issue
 about: Break an issue down into smaller parts
 title: ''
-labels: 'alert: NEED ACCOUNT KEY, alert: NEED MORE DEFINITION, alert: NEED PROJECT ASSIGNMENT, type: sub-issue'
+labels: 'alert: NEED ACCOUNT KEY, alert: NEED MORE DEFINITION, alert: NEED CYCLE ASSIGNMENT, type: sub-issue'
 assignees: ''
 
 ---
@@ -28,5 +28,5 @@ This is a sub-issue of #*List the parent issue number here*.
 - [ ] Select **requestor(s)**
 
 ### Projects and Milestone ###
-- [ ] Select **Repository** and/or **Organization** level **Project(s)** or add **alert: NEED PROJECT ASSIGNMENT** label
+- [ ] Select **Repository** and/or **Organization** level **Project(s)** or add **alert: NEED CYCLE ASSIGNMENT** label
 - [ ] Select **Milestone** as the next official version or **Future Versions**
diff --git a/.github/ISSUE_TEMPLATE/task.md b/.github/ISSUE_TEMPLATE/task.md
@@ -2,7 +2,7 @@
 name: Task
 about: Describe something that needs to be done
 title: ''
-labels: 'alert: NEED ACCOUNT KEY, alert: NEED MORE DEFINITION, alert: NEED PROJECT ASSIGNMENT, type: task'
+labels: 'alert: NEED ACCOUNT KEY, alert: NEED MORE DEFINITION, alert: NEED CYCLE ASSIGNMENT, type: task'
 assignees: ''
 
 ---
@@ -38,7 +38,7 @@ Consider breaking the task down into sub-issues.
 - [ ] Select **requestor(s)**
 
 ### Projects and Milestone ###
-- [ ] Select **Repository** and/or **Organization** level **Project(s)** or add **alert: NEED PROJECT ASSIGNMENT** label
+- [ ] Select **Repository** and/or **Organization** level **Project(s)** or add **alert: NEED CYCLE ASSIGNMENT** label
 - [ ] Select **Milestone** as the next official version or **Future Versions**
 
 ## Define Related Issue(s) ##

diff --git a/.github/jobs/setup_and_run_diff.py b/.github/jobs/setup_and_run_diff.py
@@ -4,6 +4,7 @@
 import sys
 import subprocess
 import shlex
+import re
 
 from docker_utils import VERSION_EXT, get_branch_name
 
@@ -33,8 +34,9 @@
     output_data_branch = os.environ.get('GITHUB_BASE_REF')
 else:
     branch_name = get_branch_name()
-    if branch_name.startswith('main_v'):
-        output_data_branch = branch_name
+    match = re.match(r'.*(main_v\d+\.\d+).*', branch_name)
+    if match:
+        output_data_branch = match.group(1)
     else:
         output_data_branch = 'develop'
 

diff --git a/.github/labels/common_labels.txt b/.github/labels/common_labels.txt
@@ -1,6 +1,6 @@
 {"name": "alert: NEED ACCOUNT KEY","color": "ffff33","description": "Need to assign an account key to this issue"}
 {"name": "alert: NEED MORE DEFINITION","color": "ffff33","description": "Not yet actionable, additional definition required"}
-{"name": "alert: NEED PROJECT ASSIGNMENT","color": "ffff33","description": "Need to assign to a release development cycle"}
+{"name": "alert: NEED CYCLE ASSIGNMENT","color": "ffff33","description": "Need to assign to a release development cycle"}
 {"name": "component: CI/CD","color": "1d76db","description": "Continuous integration and deployment issues"}
 {"name": "component: build process","color": "1d76db","description": "Build process issue"}
 {"name": "component: code cleanup","color": "1d76db","description": "Code cleanup and maintenance issue"}

diff --git a/.github/parm/use_case_groups.json b/.github/parm/use_case_groups.json
@@ -84,6 +84,11 @@
     "index_list": "7",
     "run": false
   },
+  {
+    "category": "marine_and_cryosphere",
+    "index_list": "8",
+    "run": false
+  },
   {
     "category": "medium_range",
     "index_list": "0",

diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
@@ -11,15 +11,29 @@ on:
       - 'bugfix_**'
     paths-ignore:
       - 'docs/**'
-
+      - '.github/pull_request_template.md'
+      - '.github/ISSUE_TEMPLATE/**'
+      - '.github/labels/**'
+      - 'build_components/**'
+      - 'manage_externals/**'
+      - '**/README.md'
+      - '**/LICENSE.md'
+
   pull_request:
     types: [opened, synchronize, reopened]
     branches:
       - develop
       - 'main_*'
     paths-ignore:
       - 'docs/**'
-
+      - '.github/pull_request_template.md'
+      - '.github/ISSUE_TEMPLATE/**'
+      - '.github/labels/**'
+      - 'build_components/**'
+      - 'manage_externals/**'
+      - '**/README.md'
+      - '**/LICENSE.md'
+
   workflow_dispatch:
     inputs:
       repository:

diff --git a/docs/Release_Guide/release_steps/create_release_on_github.rst b/docs/Release_Guide/release_steps/create_release_on_github.rst
@@ -12,7 +12,9 @@ Create Release on GitHub
 * Add a link to the release notes from the |projectRepo| User's Guide, i.e.
   https://|projectRepo|.readthedocs.io/en/vX.Y.Z-betaN/Users_Guide/release-notes.html
   (Note: the URL will not be active until the release is created)
+  Refer to a previous release to easily copy and modify this information.
 
 * Add links to the HTML and PDF versions of the |projectRepo| User's Guide on ReadTheDocs.
   https://|projectRepo|.readthedocs.io/_/downloads/en/vX.Y.Z-betaN/pdf/
   (Note: the URL will not be active until the release is created)
+  Refer to a previous release to easily copy and modify this information.
diff --git a/docs/Release_Guide/release_steps/metplus/create_release_extra.rst b/docs/Release_Guide/release_steps/metplus/create_release_extra.rst
@@ -1,7 +1,9 @@
 * Add link to `METplus_Data <https://dtcenter.ucar.edu/dfiles/code/METplus/METplus_Data>`_
   and add a note to instruct users to use sub-directory corresponding to this
-  release, i.e. v4.0.0)
+  release, i.e. v4.0)
+  Refer to a previous release to easily copy and modify this information.
 
 * If this is a development release, check the box that says "This is a pre-release"
+  and uncheck "Set as latest release"
 
 * Click on "Publish release".
diff --git a/docs/Users_Guide/glossary.rst b/docs/Users_Guide/glossary.rst
@@ -995,7 +995,7 @@ METplus Configuration Glossary
      | *Used by:*  GridStat
 
    POINT2GRID_REGRID_TO_GRID
-     Used to set the regrid dictionary item 'to_grid' in the MET Point2Grid config file. See the `MET User's Guide <https://dtcenter.org/community-code/model-evaluation-tools-met/documentation>`_ for more information.
+     Used to set the grid definition for point2grid.
 
      | *Used by:*  Point2Grid
 
@@ -10253,3 +10253,138 @@ METplus Configuration Glossary
      Specify the value for 'seeps_p1_thresh' in the MET configuration file for PointStat.
 
      | *Used by:* PointStat
+
+   ENSEMBLE_STAT_REGRID_CONVERT
+     Specify the value for 'regrid.convert' in the MET configuration file for EnsembleStat.
+
+     | *Used by:* EnsembleStat
+
+   ENSEMBLE_STAT_REGRID_CENSOR_THRESH
+     Specify the value for 'regrid.censor_thresh' in the MET configuration file for EnsembleStat.
+
+     | *Used by:* EnsembleStat
+
+   ENSEMBLE_STAT_REGRID_CENSOR_VAL
+     Specify the value for 'regrid.censor_val' in the MET configuration file for EnsembleStat.
+
+     | *Used by:* EnsembleStat
+
+   GEN_ENS_PROD_REGRID_CONVERT
+     Specify the value for 'regrid.convert' in the MET configuration file for GenEnsProd.
+
+     | *Used by:* GenEnsProd
+
+   GEN_ENS_PROD_REGRID_CENSOR_THRESH
+     Specify the value for 'regrid.censor_thresh' in the MET configuration file for GenEnsProd.
+
+     | *Used by:* GenEnsProd
+
+   GEN_ENS_PROD_REGRID_CENSOR_VAL
+     Specify the value for 'regrid.censor_val' in the MET configuration file for GenEnsProd.
+
+     | *Used by:* GenEnsProd
+
+   GRID_DIAG_REGRID_CONVERT
+     Specify the value for 'regrid.convert' in the MET configuration file for GridDiag.
+
+     | *Used by:* GridDiag
+
+   GRID_DIAG_REGRID_CENSOR_THRESH
+     Specify the value for 'regrid.censor_thresh' in the MET configuration file for GridDiag.
+
+     | *Used by:* GridDiag
+
+   GRID_DIAG_REGRID_CENSOR_VAL
+     Specify the value for 'regrid.censor_val' in the MET configuration file for GridDiag.
+
+     | *Used by:* GridDiag
+
+   GRID_STAT_REGRID_CONVERT
+     Specify the value for 'regrid.convert' in the MET configuration file for GridStat.
+
+     | *Used by:* GridStat
+
+   GRID_STAT_REGRID_CENSOR_THRESH
+     Specify the value for 'regrid.censor_thresh' in the MET configuration file for GridStat.
+
+     | *Used by:* GridStat
+
+   GRID_STAT_REGRID_CENSOR_VAL
+     Specify the value for 'regrid.censor_val' in the MET configuration file for GridStat.
+
+     | *Used by:* GridStat
+
+   MODE_REGRID_CONVERT
+     Specify the value for 'regrid.convert' in the MET configuration file for MODE.
+
+     | *Used by:* MODE
+
+   MODE_REGRID_CENSOR_THRESH
+     Specify the value for 'regrid.censor_thresh' in the MET configuration file for MODE.
+
+     | *Used by:* MODE
+
+   MODE_REGRID_CENSOR_VAL
+     Specify the value for 'regrid.censor_val' in the MET configuration file for MODE.
+
+     | *Used by:* MODE
+
+   MTD_REGRID_CONVERT
+     Specify the value for 'regrid.convert' in the MET configuration file for MTD.
+
+     | *Used by:* MTD
+
+   MTD_REGRID_CENSOR_THRESH
+     Specify the value for 'regrid.censor_thresh' in the MET configuration file for MTD.
+
+     | *Used by:* MTD
+
+   MTD_REGRID_CENSOR_VAL
+     Specify the value for 'regrid.censor_val' in the MET configuration file for MTD.
+
+     | *Used by:* MTD
+
+   POINT_STAT_REGRID_CONVERT
+     Specify the value for 'regrid.convert' in the MET configuration file for PointStat.
+
+     | *Used by:* PointStat
+
+   POINT_STAT_REGRID_CENSOR_THRESH
+     Specify the value for 'regrid.censor_thresh' in the MET configuration file for PointStat.
+
+     | *Used by:* PointStat
+
+   POINT_STAT_REGRID_CENSOR_VAL
+     Specify the value for 'regrid.censor_val' in the MET configuration file for PointStat.
+
+     | *Used by:* PointStat
+
+   SERIES_ANALYSIS_REGRID_CONVERT
+     Specify the value for 'regrid.convert' in the MET configuration file for SeriesAnalysis.
+
+     | *Used by:* SeriesAnalysis
+
+   SERIES_ANALYSIS_REGRID_CENSOR_THRESH
+     Specify the value for 'regrid.censor_thresh' in the MET configuration file for SeriesAnalysis.
+
+     | *Used by:* SeriesAnalysis
+
+   SERIES_ANALYSIS_REGRID_CENSOR_VAL
+     Specify the value for 'regrid.censor_val' in the MET configuration file for SeriesAnalysis.
+
+     | *Used by:* SeriesAnalysis
+
+   TC_RMW_REGRID_CONVERT
+     Specify the value for 'regrid.convert' in the MET configuration file for TCRMW.
+
+     | *Used by:* TCRMW
+
+   TC_RMW_REGRID_CENSOR_THRESH
+     Specify the value for 'regrid.censor_thresh' in the MET configuration file for TCRMW.
+
+     | *Used by:* TCRMW
+
+   TC_RMW_REGRID_CENSOR_VAL
+     Specify the value for 'regrid.censor_val' in the MET configuration file for TCRMW.
+
+     | *Used by:* TCRMW
diff --git a/docs/Users_Guide/installation.rst b/docs/Users_Guide/installation.rst
@@ -90,16 +90,7 @@ Using conda::
 **MET Python Embedding Requirements**
 
 If running use cases that use Python embedding, the **MET** executables
-must be installed with Python enabled
-and the following Python packages installed:
-
-- xarray (2022.3.0)
-
-- numpy (1.22.4)
-
-- pandas (1.4.2)
-
-- netCDF4 (1.5.8)
+must be installed with Python enabled.
 
 See `Appendix F Python Embedding <https://met.readthedocs.io/en/latest/Users_Guide/appendixF.html>`_
 section in the MET User's Guide for more information.