Merge branch 'develop' of https://github.com/dtcenter/MET into develop

dtcenter · Jan 17, 2023 · 9a1d71c · 9a1d71c
2 parents 8f439af + bfa7768
commit 9a1d71c
Show file tree

Hide file tree

Showing 1,105 changed files with 1,948,354 additions and 676,082 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,7 +1,7 @@
 ---
 name: Bug report
 about: Fix something that's not working
-title: ''
+title: 'Bugfix: '
 labels: 'alert: NEED ACCOUNT KEY, alert: NEED MORE DEFINITION, alert: NEED PROJECT ASSIGNMENT, type: bug'
 assignees: ''
 
@@ -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.

diff --git a/.github/ISSUE_TEMPLATE/enhancement_request.md b/.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.

diff --git a/.github/ISSUE_TEMPLATE/new_feature_request.md b/.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.

diff --git a/.github/ISSUE_TEMPLATE/task.md b/.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.

diff --git a/.github/jobs/build_docker_image.sh b/.github/jobs/build_docker_image.sh
@@ -10,9 +10,13 @@ CMD_LOGFILE=${GITHUB_WORKSPACE}/docker_build.log
 
 time_command docker build -t ${DOCKERHUB_TAG} \
     --build-arg SOURCE_BRANCH \
-    --build-arg MET_BASE_IMAGE \
+    --build-arg MET_BASE_REPO \
+    --build-arg MET_BASE_TAG \
     -f $DOCKERFILE_PATH ${GITHUB_WORKSPACE}
 if [ $? != 0 ]; then
   cat ${GITHUB_WORKSPACE}/docker_build.log
+  # Append the full make_install.log file
+  echo "Appending make_install.log to docker_build.log. See the logs artifact for details."
+  cat ${GITHUB_WORKSPACE}/make_install.log >> ${GITHUB_WORKSPACE}/docker_build.log
   exit 1
 fi
diff --git a/.github/jobs/build_documentation.sh b/.github/jobs/build_documentation.sh
@@ -3,7 +3,12 @@
 # path to docs directory relative to top level of repository
 # $GITHUB_WORKSPACE is set if the actions/checkout@v2 action is run first
 
-DOCS_DIR=${GITHUB_WORKSPACE}/met/docs
+DOCS_DIR=${GITHUB_WORKSPACE}/docs
+
+if [ ! -e ${DOCS_DIR} ]; then
+    echo "Documentation directory does not exist: ${DOCS_DIR}"
+    exit 1
+fi
 
 # run Make to build the documentation and return to previous directory
 cd ${DOCS_DIR}

diff --git a/.github/jobs/get_branch_name.sh b/.github/jobs/get_branch_name.sh
@@ -11,5 +11,5 @@ fi
 
 branch_name=${branch_name#"refs/heads/"}
 
-echo ::set-output name=branch_name::$branch_name
+echo "branch_name=${branch_name}" >> $GITHUB_OUTPUT
 echo branch_name: $branch_name
diff --git a/.github/jobs/set_job_controls.sh b/.github/jobs/set_job_controls.sh
@@ -5,7 +5,8 @@ run_push=false
 run_unit_tests=false
 run_diff=false
 run_update_truth=false
-met_base_image=minimum
+met_base_repo=met-base
+met_base_tag=v1.1
 input_data_version=develop
 truth_data_version=develop
 
@@ -102,26 +103,28 @@ fi
 # if running unit tests, use unit_test MET base image and push image
 if [ "$run_unit_tests" == "true" ]; then
 
-  met_base_image=unit_test
+  met_base_repo=met-base-unit-test
   run_push=true
 
 fi
 
-echo ::set-output name=run_compile::$run_compile
-echo ::set-output name=run_push::$run_push
-echo ::set-output name=run_unit_tests::$run_unit_tests
-echo ::set-output name=run_diff::$run_diff
-echo ::set-output name=run_update_truth::$run_update_truth
-echo ::set-output name=met_base_image::$met_base_image
-echo ::set-output name=input_data_version::$input_data_version
-echo ::set-output name=truth_data_version::$truth_data_version
+echo "run_compile=${run_compile}" >> $GITHUB_OUTPUT
+echo "run_push=${run_push}" >> $GITHUB_OUTPUT
+echo "run_unit_tests=${run_unit_tests}" >> $GITHUB_OUTPUT
+echo "run_diff=${run_diff}" >> $GITHUB_OUTPUT
+echo "run_update_truth=${run_update_truth}" >> $GITHUB_OUTPUT
+echo "met_base_repo=${met_base_repo}" >> $GITHUB_OUTPUT
+echo "met_base_tag=${met_base_tag}" >> $GITHUB_OUTPUT
+echo "input_data_version=${input_data_version}" >> $GITHUB_OUTPUT
+echo "truth_data_version=${truth_data_version}" >> $GITHUB_OUTPUT
 
 echo run_compile: $run_compile
 echo run_push: $run_push
 echo run_unit_tests: $run_unit_tests
 echo run_diff: $run_diff
 echo run_update_truth: $run_update_truth
-echo met_base_image: $met_base_image
+echo met_base_repo: $met_base_repo
+echo met_base_tag: $met_base_tag
 echo input_data_version: $input_data_version
 echo truth_data_version: $truth_data_version
 

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -30,6 +30,6 @@ See the [METplus Workflow](https://metplus.readthedocs.io/en/latest/Contributors
 Select: **Reviewer(s)**
 Select: **Organization** level software support **Project** or **Repository** level development cycle **Project**
 Select: **Milestone** as the version that will include these changes
-- [ ] After submitting the PR, select **Linked issues** with the original issue number.
+- [ ] After submitting the PR, select **Development** issue with the original issue number.
 - [ ] After the PR is approved, merge your changes. If permissions do not allow this, request that the reviewer do the merge.
 - [ ] Close the linked issue and delete your feature or bugfix branch from GitHub.
diff --git a/.github/workflows/build_docker_and_trigger_metplus.yml b/.github/workflows/build_docker_and_trigger_metplus.yml
@@ -7,6 +7,8 @@ on:
     paths-ignore:
       - 'met/docs/**'
 
+  workflow_dispatch:
+
 env:
   DOCKERHUB_REPO: dtcenter/met-dev
 
@@ -16,17 +18,18 @@ jobs:
     name: Handle Docker Image
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Get branch name
         id: get_branch_name
-        run: echo ::set-output name=branch_name::${GITHUB_REF#"refs/heads/"}
+        run: echo branch_name=${GITHUB_REF#refs/heads/} >> $GITHUB_OUTPUT
 
       - name: Build Docker Image
         run: .github/jobs/build_docker_image.sh
         env:
           SOURCE_BRANCH: ${{ steps.get_branch_name.outputs.branch_name }}-lite
-          MET_BASE_IMAGE: minimum
+          MET_BASE_REPO: met-base
+          MET_BASE_TAG: v1.1
 
       - name: Push Docker Image
         run: .github/jobs/push_docker_image.sh
@@ -44,7 +47,7 @@ jobs:
         env:
           GITHUB_CONTEXT: ${{ toJson(github) }}
         run: echo "$GITHUB_CONTEXT"
-      - uses: actions/github-script@v5
+      - uses: actions/github-script@v6
         with:
           github-token: ${{ secrets.METPLUS_BOT_TOKEN }}
           script: |

diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
@@ -11,28 +11,29 @@ on:
       - met/docs/**
   pull_request:
     types: [opened, reopened, synchronize]
+  workflow_dispatch:
 
 jobs:
   documentation:
     name: Build Documentation
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
         with:
-          python-version: '3.6'
+          python-version: '3.8'
       - name: Install dependencies
         run: |
           python -m pip install --upgrade python-dateutil requests sphinx \
           sphinx-gallery Pillow sphinx_rtd_theme sphinx-panels
       - name: Build docs
         run: ./.github/jobs/build_documentation.sh
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         if: always()
         with:
           name: documentation
           path: artifact/documentation
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         if: failure()
         with:
           name: documentation_warnings.log

diff --git a/.github/workflows/release-checksum.yml b/.github/workflows/release-checksum.yml
@@ -0,0 +1,14 @@
+name: Add checksum to release
+
+on:
+  release:
+    types:
+      - published
+
+jobs:
+  add-checksum:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: dtcenter/metplus-action-release-checksum@v1
+        with:
+          token: ${{ secrets.METPLUS_BOT_TOKEN }}