Update Develop-ref after #1753 (#1754)

Co-authored-by: George McCabe <23407799+georgemccabe@users.noreply.github.com>
Co-authored-by: Hank Fisher <fisherh@seneca.rap.ucar.edu>
Co-authored-by: Mrinal Biswas <biswas@seneca.rap.ucar.edu>
Co-authored-by: jprestop <jpresto@ucar.edu>
Co-authored-by: johnhg <johnhg@ucar.edu>
Co-authored-by: Mrinal Biswas <biswas@ucar.edu>
Co-authored-by: Julie Prestopnik <jpresto@seneca.rap.ucar.edu>
Co-authored-by: j-opatz <jopatz@ucar.edu>
Co-authored-by: Kathryn Newman <knewman@seneca.rap.ucar.edu>
Co-authored-by: j-opatz <59586397+j-opatz@users.noreply.github.com>
Co-authored-by: Lisa Goodrich <lisag@ucar.edu>
Co-authored-by: Julie Prestopnik <jpresto@ucar.edu>
Co-authored-by: Christina Kalb <kalb@mohawk.rap.ucar.edu>
Co-authored-by: Christina Kalb <kalb@ucar.edu>
Co-authored-by: Hank Fisher <fisherh@ucar.edu>
Co-authored-by: mrinalbiswas <biswas@ucar.edu>
Co-authored-by: bikegeek <3753118+bikegeek@users.noreply.github.com>
Co-authored-by: lisagoodrich <33230218+lisagoodrich@users.noreply.github.com>
Co-authored-by: Howard Soh <hsoh@seneca.rap.ucar.edu>
Co-authored-by: Molly Smith <molly.b.smith@noaa.gov>
Co-authored-by: hsoh-u <hsoh@ucar.edu>
Co-authored-by: bikegeek <minnawin@ucar.edu>

.github/ISSUE_TEMPLATE/bug_report.md

@@ -54,7 +54,7 @@ Describe the steps to reproduce the behavior:
 
 ## Define Related Issue(s) ##
 Consider the impact to the other METplus components.
-- [ ] [METplus](https://github.com/dtcenter/METplus/issues/new/choose), [MET](https://github.com/dtcenter/MET/issues/new/choose), [METdatadb](https://github.com/dtcenter/METdatadb/issues/new/choose), [METviewer](https://github.com/dtcenter/METviewer/issues/new/choose), [METexpress](https://github.com/dtcenter/METexpress/issues/new/choose), [METcalcpy](https://github.com/dtcenter/METcalcpy/issues/new/choose), [METplotpy](https://github.com/dtcenter/METplotpy/issues/new/choose)
+- [ ] [METplus](https://github.com/dtcenter/METplus/issues/new/choose), [MET](https://github.com/dtcenter/MET/issues/new/choose), [METdataio](https://github.com/dtcenter/METdataio/issues/new/choose), [METviewer](https://github.com/dtcenter/METviewer/issues/new/choose), [METexpress](https://github.com/dtcenter/METexpress/issues/new/choose), [METcalcpy](https://github.com/dtcenter/METcalcpy/issues/new/choose), [METplotpy](https://github.com/dtcenter/METplotpy/issues/new/choose)
 
 ## Bugfix Checklist ##
 See the [METplus Workflow](https://metplus.readthedocs.io/en/latest/Contributors_Guide/github_workflow.html) for details.

.github/ISSUE_TEMPLATE/enhancement_request.md

@@ -43,7 +43,7 @@ Consider breaking the enhancement down into sub-issues.
 
 ## Define Related Issue(s) ##
 Consider the impact to the other METplus components.
-- [ ] [METplus](https://github.com/dtcenter/METplus/issues/new/choose), [MET](https://github.com/dtcenter/MET/issues/new/choose), [METdatadb](https://github.com/dtcenter/METdatadb/issues/new/choose), [METviewer](https://github.com/dtcenter/METviewer/issues/new/choose), [METexpress](https://github.com/dtcenter/METexpress/issues/new/choose), [METcalcpy](https://github.com/dtcenter/METcalcpy/issues/new/choose), [METplotpy](https://github.com/dtcenter/METplotpy/issues/new/choose)
+- [ ] [METplus](https://github.com/dtcenter/METplus/issues/new/choose), [MET](https://github.com/dtcenter/MET/issues/new/choose), [METdataio](https://github.com/dtcenter/METdataio/issues/new/choose), [METviewer](https://github.com/dtcenter/METviewer/issues/new/choose), [METexpress](https://github.com/dtcenter/METexpress/issues/new/choose), [METcalcpy](https://github.com/dtcenter/METcalcpy/issues/new/choose), [METplotpy](https://github.com/dtcenter/METplotpy/issues/new/choose)
 
 ## Enhancement Checklist ##
 See the [METplus Workflow](https://metplus.readthedocs.io/en/latest/Contributors_Guide/github_workflow.html) for details.

.github/ISSUE_TEMPLATE/new_feature_request.md

@@ -47,7 +47,7 @@ Consider breaking the new feature down into sub-issues.
 
 ## Define Related Issue(s) ##
 Consider the impact to the other METplus components.
-- [ ] [METplus](https://github.com/dtcenter/METplus/issues/new/choose), [MET](https://github.com/dtcenter/MET/issues/new/choose), [METdatadb](https://github.com/dtcenter/METdatadb/issues/new/choose), [METviewer](https://github.com/dtcenter/METviewer/issues/new/choose), [METexpress](https://github.com/dtcenter/METexpress/issues/new/choose), [METcalcpy](https://github.com/dtcenter/METcalcpy/issues/new/choose), [METplotpy](https://github.com/dtcenter/METplotpy/issues/new/choose)
+- [ ] [METplus](https://github.com/dtcenter/METplus/issues/new/choose), [MET](https://github.com/dtcenter/MET/issues/new/choose), [METdataio](https://github.com/dtcenter/METdataio/issues/new/choose), [METviewer](https://github.com/dtcenter/METviewer/issues/new/choose), [METexpress](https://github.com/dtcenter/METexpress/issues/new/choose), [METcalcpy](https://github.com/dtcenter/METcalcpy/issues/new/choose), [METplotpy](https://github.com/dtcenter/METplotpy/issues/new/choose)
 
 ## New Feature Checklist ##
 See the [METplus Workflow](https://metplus.readthedocs.io/en/latest/Contributors_Guide/github_workflow.html) for details.

.github/ISSUE_TEMPLATE/task.md

@@ -43,7 +43,7 @@ Consider breaking the task down into sub-issues.
 
 ## Define Related Issue(s) ##
 Consider the impact to the other METplus components.
-- [ ] [METplus](https://github.com/dtcenter/METplus/issues/new/choose), [MET](https://github.com/dtcenter/MET/issues/new/choose), [METdatadb](https://github.com/dtcenter/METdatadb/issues/new/choose), [METviewer](https://github.com/dtcenter/METviewer/issues/new/choose), [METexpress](https://github.com/dtcenter/METexpress/issues/new/choose), [METcalcpy](https://github.com/dtcenter/METcalcpy/issues/new/choose), [METplotpy](https://github.com/dtcenter/METplotpy/issues/new/choose)
+- [ ] [METplus](https://github.com/dtcenter/METplus/issues/new/choose), [MET](https://github.com/dtcenter/MET/issues/new/choose), [METdataio](https://github.com/dtcenter/METdataio/issues/new/choose), [METviewer](https://github.com/dtcenter/METviewer/issues/new/choose), [METexpress](https://github.com/dtcenter/METexpress/issues/new/choose), [METcalcpy](https://github.com/dtcenter/METcalcpy/issues/new/choose), [METplotpy](https://github.com/dtcenter/METplotpy/issues/new/choose)
 
 ## Task Checklist ##
 See the [METplus Workflow](https://metplus.readthedocs.io/en/latest/Contributors_Guide/github_workflow.html) for details.

.github/jobs/set_job_controls.sh

@@ -40,45 +40,47 @@ elif [ "${GITHUB_REF: -4}" == -ref ]; then
 else
 
   # if develop or main branch, run all use cases
+  # and ignore commit message keywords
   branch_name=`cut -d "/" -f3 <<< "${GITHUB_REF}"`
   if [ "$branch_name" == "develop" ] || \
 	 [ "${branch_name:0:6}" == "main_v" ]; then
     run_use_cases=true
     run_all_use_cases=true
-  fi
-
-  # check commit messages for skip or force keywords
-  if grep -q "ci-skip-all" <<< "$commit_msg"; then
-    run_get_image=false
-    run_get_input_data=false
-    run_unit_tests=false
-    run_use_cases=false
-    run_save_truth_data=false
-    run_diff=false
-  fi
-
-  if grep -q "ci-skip-use-cases" <<< "$commit_msg"; then
-    run_use_cases=false
-  fi
+  else
+
+    # check commit messages for skip or force keywords
+    if grep -q "ci-skip-all" <<< "$commit_msg"; then
+      run_get_image=false
+      run_get_input_data=false
+      run_unit_tests=false
+      run_use_cases=false
+      run_save_truth_data=false
+      run_diff=false
+    fi
+
+    if grep -q "ci-skip-use-cases" <<< "$commit_msg"; then
+      run_use_cases=false
+    fi
+
+    if grep -q "ci-skip-unit-tests" <<< "$commit_msg"; then
+      run_unit_tests=false
+    fi
+
+    if grep -q "ci-run-all-cases" <<< "$commit_msg"; then
+      run_use_cases=true
+      run_all_use_cases=true
+    fi
+
+    if grep -q "ci-run-all-diff" <<< "$commit_msg"; then
+      run_all_use_cases=true
+      run_diff=true
+    fi
+
+    if grep -q "ci-run-diff" <<< "$commit_msg"; then
+      run_diff=true
+    fi
 
-  if grep -q "ci-skip-unit-tests" <<< "$commit_msg"; then
-    run_unit_tests=false
-  fi
-
-  if grep -q "ci-run-all-cases" <<< "$commit_msg"; then
-    run_use_cases=true
-    run_all_use_cases=true
   fi
-
-  if grep -q "ci-run-all-diff" <<< "$commit_msg"; then
-    run_all_use_cases=true
-    run_diff=true
-  fi
-
-  if grep -q "ci-run-diff" <<< "$commit_msg"; then
-    run_diff=true
-  fi
-
 fi
 
 echo ::set-output name=run_get_image::$run_get_image

.github/labels/README.md

@@ -30,7 +30,7 @@ Sample commands for processing all METplus repos:
 
 ```
 # List of METplus repositories
-REPO_LIST="metplus met metplotpy metcalcpy metdatadb metviewer \
+REPO_LIST="metplus met metplotpy metcalcpy metdataio metviewer \
                       metexpress metplus-training metplus-internal";
 
 # Build commands to add/update common labels

.github/labels/common_labels.txt

@@ -30,6 +30,7 @@
 {"name": "requestor: DTC/PAS","color": "3101c1","description": "DTC Physics Across Scales T&E"}
 {"name": "requestor: DTC/Containers","color": "3101c1","description": "DTC Containers and Cloud Computing Project"}
 {"name": "requestor: DTC/AF V&V","color": "3101c1","description": "Air Force Verification and Validation Project"}
+{"name": "requestor: DTC/Ensembles","color": "3101c1","description": "DTC Ensembles Team"}
 {"name": "requestor: NASA/CCMC","color": "3101c1","description": "NASA Community Coordinated Modeling Center"}
 {"name": "requestor: NASA/other","color": "3101c1","description": "NASA, not otherwise specified"}
 {"name": "requestor: NCAR","color": "3101c1","description": "National Center for Atmospheric Research"}

.github/labels/delete_labels.sh

@@ -7,7 +7,7 @@
 
 if [[ $# -ne 3 ]]; then
   echo "ERROR: `basename $0` ... must specify the GitHub username, authorization key, and repository name."
-  echo "ERROR:   repo list: metplus, met, metdatadb, metcalcpy, metplotpy, metviewer, metexpress, metplus-training"
+  echo "ERROR:   repo list: metplus, met, metdataio, metcalcpy, metplotpy, metviewer, metexpress, metplus-training"
   exit 1
 else
   user=$1

.github/labels/get_labels.sh

@@ -7,7 +7,7 @@
 
 if [[ $# -ne 3 ]]; then
   echo "ERROR: `basename $0` ... must specify the GitHub username, authorization key, and repository name."
-  echo "ERROR:   repo names: metplus, met, metdatadb, metcalcpy, metplotpy, metviewer, metexpress, metplus-training"
+  echo "ERROR:   repo names: metplus, met, metdataio, metcalcpy, metplotpy, metviewer, metexpress, metplus-training"
   exit 1
 else
   user=$1

.github/labels/post_patch_labels.sh

@@ -8,7 +8,7 @@
 
 if [[ $# -ne 4 ]]; then
   echo "ERROR: `basename $0` ... must specify the GitHub username, authorization key, repository name, and label file."
-  echo "ERROR:   repo names: metplus, met, metdatadb, metcalcpy, metplotpy, metviewer, metexpress, metplus-training, metplus-internal"
+  echo "ERROR:   repo names: metplus, met, metdataio, metcalcpy, metplotpy, metviewer, metexpress, metplus-training, metplus-internal"
   exit 1
 else
   user=$1

.github/labels/process_labels.sh

@@ -16,7 +16,7 @@ fi
 SCRIPT_DIR=`dirname $0`
 
 # List of METplus repositories
-REPO_LIST="metplus met metplotpy metcalcpy metdatadb metviewer \
+REPO_LIST="metplus met metplotpy metcalcpy metdataio metviewer \
            metexpress metplus-training";
 
 # Build commands to add/update common labels

.github/parm/test_settings.conf

@@ -14,3 +14,6 @@ GEMPAKTOCF_JAR = /data/input/GempakToCF.jar
 
 # also set location of GFDL Tracker executables
 GFDL_TRACKER_EXEC = /usr/local/bin
+
+[user_env_vars]
+METPLOTPY_BASE = {METPLUS_BASE}/../METplotpy

.github/parm/use_case_groups.json

@@ -1,19 +1,14 @@
 [
   {
     "category": "met_tool_wrapper",
-    "index_list": "0-29",
+    "index_list": "0-29,59-61",
     "run": false
   },
   {
     "category": "met_tool_wrapper",
     "index_list": "30-58",
     "run": false
   },
-  {
-    "category": "met_tool_wrapper",
-    "index_list": "59-60",
-    "run": false
-  },
   {
     "category": "air_quality_and_comp",
     "index_list": "0",

docs/Contributors_Guide/add_use_case.rst

@@ -638,7 +638,8 @@ created and tested.
 Trigger Input Data Ingest
 -------------------------
 
-If working in the *dtcenter/METplus repository*, please skip this step.
+**IF WORKING IN THE *dtcenter/METplus REPOSITORY*, PLEASE SKIP THIS STEP.**
+
 If working in a forked METplus repository, the newly added input data will not
 become available for the tests unless it is triggered from the dtcenter
 repository. A METplus developer will need to run the following steps. Please
@@ -952,7 +953,7 @@ Copy data from the feature directory into the next version directory
 
 **CONDITION 2:** MET Tool Wrapper Use Cases::
 
-    from_directory=${METPLUS_DATA_TARFILE_DIR}/${METPLUS_FEATURE_BRANCH}/met_test
+    from_directory=${METPLUS_DATA_TARFILE_DIR}/${METPLUS_FEATURE_BRANCH}/met_test/new
     echo $from_directory
     ls $from_directory
 

docs/Release_Guide/index.rst

@@ -73,12 +73,12 @@ Release instructions for each of the METplus components are described in the fol
 
    metplus
    met
-   metdatadb
+   metdataio
    metcalcpy
    metplotpy
    metviewer
    metexpress
-
+   recreate_release
 
 
 Indices and tables

docs/Release_Guide/met_bugfix.rst

@@ -15,5 +15,4 @@ Create a new vX.Y.Z bugfix release from the main_vX.Y branch.
 .. include:: release_steps/create_release_on_github.rst
 .. include:: release_steps/create_release_extra.rst
 .. include:: release_steps/met/update_dtc_website.rst
-.. include:: release_steps/met/confirm_zenodo.rst
 .. include:: release_steps/finalize_release_on_github_bugfix.rst

docs/Release_Guide/met_official.rst

@@ -20,5 +20,5 @@ Create a new vX.Y.Z official release from the develop branch.
 .. include:: release_steps/met/update_dtc_website.rst
 .. include:: release_steps/finalize_release_on_github_official.rst
 .. include:: release_steps/update_docs_official.rst
-.. include:: release_steps/met/confirm_zenodo.rst
+.. include:: release_steps/met/update_zenodo.rst
 .. include:: release_steps/set_beta_deletion_reminder_official.rst

docs/Release_Guide/metdataio.rst

@@ -0,0 +1,10 @@
+*****************
+METdataio Release
+*****************
+
+.. toctree::
+   :titlesonly:
+
+   metdataio_official
+   metdataio_bugfix
+   metdataio_development

docs/Release_Guide/metdatadb_bugfix.rst → docs/Release_Guide/metdataio_bugfix.rst

@@ -1,7 +1,7 @@
-METdatadb Bugfix Release
+METdataio Bugfix Release
 ========================
 
-.. |projectRepo| replace:: METdatadb
+.. |projectRepo| replace:: METdataio
 .. |projectName| replace:: |projectRepo|
 .. |addTarfileStep| replace:: Link text should be the name of the release and the URL should be the release page that was just created under the GitHub Releases tab.
 .. |otherWebsiteUpdates| replace:: Make any other necessary website updates.
@@ -12,7 +12,7 @@ Create a new vX.Y.Z bugfix release from the main_vX.Y branch.
 .. include:: release_steps/clone_project_repository.rst
 .. include:: release_steps/checkout_main_branch.rst
 .. include:: release_steps/create_release_feature_branch.rst
-.. include:: release_steps/metdatadb/update_version_bugfix.rst
+.. include:: release_steps/metdataio/update_version_bugfix.rst
 .. include:: release_steps/update_release_notes_bugfix.rst
 .. include:: release_steps/merge_release_issue.rst
 .. include:: release_steps/create_release_on_github.rst

docs/Release_Guide/metdatadb_development.rst → docs/Release_Guide/metdataio_development.rst

@@ -1,7 +1,7 @@
-METdatadb Development Release
+METdataio Development Release
 =============================
 
-.. |projectRepo| replace:: METdatadb
+.. |projectRepo| replace:: METdataio
 .. |projectName| replace:: |projectRepo|
 .. |addTarfileStep| replace:: Link text should be the name of the release and the URL should be the release page that was just created under the GitHub Releases tab.
 .. |otherWebsiteUpdates| replace:: Make any other necessary website updates.
@@ -12,11 +12,11 @@ Create a new vX.Y.Z-betaN or vX.Y.Z-rcN development release from the develop bra
 .. include:: release_steps/clone_project_repository.rst
 .. include:: release_steps/checkout_develop_branch.rst
 .. include:: release_steps/create_release_feature_branch.rst
-.. include:: release_steps/metdatadb/update_version.rst
+.. include:: release_steps/metdataio/update_version.rst
 .. include:: release_steps/update_release_notes_development.rst
 .. include:: release_steps/merge_release_issue.rst
 .. include:: release_steps/create_release_on_github.rst
 .. include:: release_steps/create_release_extra.rst
 .. include:: release_steps/common/update_dtc_website.rst
 .. include:: release_steps/finalize_release_on_github_development.rst
-.. include:: release_steps/metdatadb/update_version_on_develop.rst
+.. include:: release_steps/metdataio/update_version_on_develop.rst

docs/Release_Guide/metdatadb_official.rst → docs/Release_Guide/metdataio_official.rst

@@ -1,7 +1,7 @@
-METdatadb Official Release
+METdataio Official Release
 ==========================
 
-.. |projectRepo| replace:: METdatadb
+.. |projectRepo| replace:: METdataio
 .. |projectName| replace:: |projectRepo|
 .. |addTarfileStep| replace:: Link text should be the name of the release and the URL should be the release page that was just created under the GitHub Releases tab.
 .. |otherWebsiteUpdates| replace:: Make any other necessary website updates.
@@ -12,7 +12,7 @@ Create a new vX.Y.Z official release from the develop branch.
 .. include:: release_steps/clone_project_repository.rst
 .. include:: release_steps/checkout_develop_branch.rst
 .. include:: release_steps/create_release_feature_branch.rst
-.. include:: release_steps/metdatadb/update_version_official.rst
+.. include:: release_steps/metdataio/update_version_official.rst
 .. include:: release_steps/update_release_notes_official.rst
 .. include:: release_steps/rotate_authorship.rst
 .. include:: release_steps/merge_release_issue.rst
@@ -22,6 +22,6 @@ Create a new vX.Y.Z official release from the develop branch.
 .. include:: release_steps/create_release_extra.rst
 .. include:: release_steps/common/update_dtc_website.rst
 .. include:: release_steps/finalize_release_on_github_official.rst
-.. include:: release_steps/metdatadb/update_version_on_develop.rst
+.. include:: release_steps/metdataio/update_version_on_develop.rst
 .. include:: release_steps/update_docs_official.rst
 .. include:: release_steps/set_beta_deletion_reminder_official.rst

docs/Release_Guide/recreate_release.rst

@@ -0,0 +1,22 @@
+Recreate an Existing Release
+----------------------------
+
+To recreate an existing development, bugfix, or official release:
+
+* Reopen the corresponding development project from the
+  `Developmental Testbed Center organization project page <https://github.com/orgs/dtcenter/projects>`_.
+* Make an necessary additions to the existing project.  For example, move
+  any newly completed issues and pull requests (e.g. from beta3 back to
+  beta2).
+* Reopen the GitHub issue for creating the previously created release.
+* Delete the existing release from GitHub.
+* Delete the existing release tag (e.g. v11.0.0-beta2) from GitHub.  
+* Follow the instructions from the
+  `Release Guide <https://metplus.readthedocs.io/en/develop/Release_Guide/index.html#instructions-summary>`_,
+  being sure to update the release data for the actual release note. Consider
+  adding a note in description section for the GitHub release to indicate
+  that this release was re-created with an explanation. For example, "NOTE:
+  The MET-11.0.0-beta2 development release from 8/3/2022 has been
+  recreated to resolve a compilation issue."
+
+

docs/Release_Guide/release_steps/met/update_zenodo.rst

@@ -0,0 +1,7 @@
+Update Zenodo
+-------------
+
+In the `MET GitHub repository <https://github.com/dtcenter/MET>`_
+scroll down to the README file and check the
+`MET Digital Object Identifier (DOI) <https://doi.org/10.5281/zenodo.5565322>`_
+on Zenodo. Use the zip file for the new MET release to create a new version on Zenodo.

docs/Release_Guide/release_steps/metplus/update_zenodo.rst

@@ -7,6 +7,3 @@ scroll down to the README file and check the
 on Zenodo. Once all METplus components have been released, gather the zip files
 for each METplus component release in the METplus Verification System
 Coordinated Release and upload them to create a new version on Zenodo.
-
-
-