Per #2072, merge in the latest from develop.

.github/ISSUE_TEMPLATE/bug_report.md

@@ -69,15 +69,15 @@ Branch name: `bugfix_<Issue Number>_main_<Version>_<Description>`
 - [ ] Submit a pull request to merge into **main_\<Version>**.
 Pull request: `bugfix <Issue Number> main_<Version> <Description>`
 - [ ] Define the pull request metadata, as permissions allow.
-Select: **Reviewer(s)** and **Linked issues**
+Select: **Reviewer(s)** and **Development** issue
 Select: **Organization** level software support **Project** for the current coordinated release
 Select: **Milestone** as the next bugfix version
 - [ ] Iterate until the reviewer(s) accept and merge your changes.
 - [ ] Delete your fork or branch.
 - [ ] Complete the steps above to fix the bug on the **develop** branch.
 Branch name:  `bugfix_<Issue Number>_develop_<Description>`
 Pull request: `bugfix <Issue Number> develop <Description>`
-Select: **Reviewer(s)** and **Linked issues**
+Select: **Reviewer(s)** and **Development** issue
 Select: **Repository** level development cycle **Project** for the next official release
 Select: **Milestone** as the next official version
 - [ ] Close this issue.

.github/ISSUE_TEMPLATE/enhancement_request.md

@@ -58,7 +58,7 @@ Branch name: `feature_<Issue Number>_<Description>`
 - [ ] Submit a pull request to merge into **develop**.
 Pull request: `feature <Issue Number> <Description>`
 - [ ] Define the pull request metadata, as permissions allow.
-Select: **Reviewer(s)** and **Linked issues**
+Select: **Reviewer(s)** and **Development** issues
 Select: **Repository** level development cycle **Project** for the next official release
 Select: **Milestone** as the next official version
 - [ ] Iterate until the reviewer(s) accept and merge your changes.

.github/ISSUE_TEMPLATE/new_feature_request.md

@@ -62,7 +62,7 @@ Branch name: `feature_<Issue Number>_<Description>`
 - [ ] Submit a pull request to merge into **develop**.
 Pull request: `feature <Issue Number> <Description>`
 - [ ] Define the pull request metadata, as permissions allow.
-Select: **Reviewer(s)** and **Linked issues**
+Select: **Reviewer(s)** and **Development** issues
 Select: **Repository** level development cycle **Project** for the next official release
 Select: **Milestone** as the next official version
 - [ ] Iterate until the reviewer(s) accept and merge your changes.

.github/ISSUE_TEMPLATE/task.md

@@ -58,7 +58,7 @@ Branch name: `feature_<Issue Number>_<Description>`
 - [ ] Submit a pull request to merge into **develop**.
 Pull request: `feature <Issue Number> <Description>`
 - [ ] Define the pull request metadata, as permissions allow.
-Select: **Reviewer(s)** and **Linked issues**
+Select: **Reviewer(s)** and **Development** issues
 Select: **Repository** level development cycle **Project** for the next official release
 Select: **Milestone** as the next official version
 - [ ] Iterate until the reviewer(s) accept and merge your changes.

.github/jobs/build_docker_image.sh

@@ -4,7 +4,7 @@ source ${GITHUB_WORKSPACE}/.github/jobs/bash_functions.sh
 
 DOCKERHUB_TAG=${DOCKERHUB_REPO}:${SOURCE_BRANCH}
 
-DOCKERFILE_PATH=${GITHUB_WORKSPACE}/scripts/docker/Dockerfile.copy
+DOCKERFILE_PATH=${GITHUB_WORKSPACE}/internal/scripts/docker/Dockerfile.copy
 
 CMD_LOGFILE=${GITHUB_WORKSPACE}/docker_build.log
 

.github/jobs/set_job_controls.sh

@@ -17,9 +17,11 @@ if [ "${GITHUB_EVENT_NAME}" == "pull_request" ]; then
 
     run_diff=true
 
-    # if base branch starts with main_v, use that input data
+    # if pull request into main_vX.Y branch,
+    # set truth data version to branch name and set input data version to X.Y
     if [ "${GITHUB_BASE_REF:0:6}" == "main_v" ]; then
-	input_data_version=${GITHUB_BASE_REF:6}
+      truth_data_version=${GITHUB_BASE_REF}
+      input_data_version=${GITHUB_BASE_REF:6}
     fi
 
   fi
@@ -35,9 +37,9 @@ elif [ "${GITHUB_EVENT_NAME}" == "push" ]; then
     run_diff=true
     truth_data_version=${branch_name:0: -4}
 
-    # if branch starts with main_v, use that input data
+    # if main_vX.Y-ref branch, use X.Y input data
     if [ "${branch_name:0:6}" == "main_v" ]; then
-      input_data_version=${branch_name:6:-4}
+      input_data_version=${branch_name:6: -4}
     fi
 
   else
@@ -46,10 +48,10 @@ elif [ "${GITHUB_EVENT_NAME}" == "push" ]; then
     if [ "$branch_name" == "develop" ] ||
        [ "${branch_name:0:6}" == "main_v" ]; then
 
-       run_diff=true
-       truth_data_version=${branch_name}
+      run_diff=true
+      truth_data_version=${branch_name}
 
-      # if branch starts with main_v, use that input data
+      # if main_vX.Y branch, use X.Y input data
       if [ "${branch_name:0:6}" == "main_v" ]; then
         input_data_version=${branch_name:6}
       fi
@@ -59,29 +61,35 @@ elif [ "${GITHUB_EVENT_NAME}" == "push" ]; then
     # check commit messages for skip or force keywords                                                                         
     if grep -q "ci-skip-all" <<< "$commit_msg"; then
 
-       run_compile=false
-       run_push=false
-       run_unit_tests=false
-       run_diff=false
-       run_update_truth=false
+      run_compile=false
+      run_push=false
+      run_unit_tests=false
+      run_diff=false
+      run_update_truth=false
 
     fi    
 
     # check commit messages for ci-skip or ci-run keywords
     if grep -q "ci-skip-compile" <<< "$commit_msg"; then
 
-       run_compile=false
+      run_compile=false
 
     fi
 
     if grep -q "ci-run-unit" <<< "$commit_msg"; then
 
-       run_diff=true
+      run_diff=true
 
     fi
 
   fi
-
+
+elif [ "${GITHUB_EVENT_NAME}" == "workflow_dispatch" ]; then
+
+  if [ "${force_tests}" == "true" ]; then
+    run_diff=true
+  fi
+
 fi
 
 # if updating truth or running diff, run unit tests

.github/jobs/test_env_vars.sh

@@ -1,7 +1,7 @@
 export MET_BASE=/usr/local/share/met
 
-export MET_BUILD_BASE=${MET_REPO_DIR}/met
-export MET_TEST_BASE=${MET_REPO_DIR}/test
+export MET_BUILD_BASE=${MET_REPO_DIR}
+export MET_TEST_BASE=${MET_REPO_DIR}/internal/test_unit
 export PERL5LIB=${MET_TEST_BASE}/lib
 
 export MET_TEST_INPUT=/data/input/MET_test_data/unit_test

.github/workflows/build_docker_and_trigger_metplus.yml

@@ -25,13 +25,13 @@ jobs:
       - name: Build Docker Image
         run: .github/jobs/build_docker_image.sh
         env:
-          SOURCE_BRANCH: ${{ steps.get_branch_name.outputs.branch_name }}
+          SOURCE_BRANCH: ${{ steps.get_branch_name.outputs.branch_name }}-lite
           MET_BASE_IMAGE: minimum
 
       - name: Push Docker Image
         run: .github/jobs/push_docker_image.sh
         env:
-          SOURCE_BRANCH: ${{ steps.get_branch_name.outputs.branch_name }}
+          SOURCE_BRANCH: ${{ steps.get_branch_name.outputs.branch_name }}-lite
           DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
           DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
 

.github/workflows/testing.yml

@@ -23,6 +23,13 @@ on:
     paths-ignore:
       - 'met/docs/**'
 
+  workflow_dispatch:
+    inputs:
+      force_tests:
+        description: 'Run the unit tests'
+        default: true
+        type: boolean
+
 env:
   DOCKERHUB_REPO: dtcenter/met-dev
 
@@ -39,6 +46,7 @@ jobs:
         run: .github/jobs/set_job_controls.sh
         env:
           commit_msg: ${{ github.event.head_commit.message }}
+          force_tests: ${{ github.event.inputs.force_tests }}
 
     outputs:
       run_compile: ${{ steps.job_status.outputs.run_compile }}

.gitignore

@@ -1,8 +1,19 @@
 # Sphinx documentation
-met/docs/_build/
+docs/_build/
 
 # tilda files generated by emacs
 *~
 
-# log file created in Docker image
+# temp files surrounded by #
+*#*#
+
+autom4te.cache
+config.h
+config.log
+config.status
+stamp-h1
+bin
+share
+Makefile
+make.log
 make_install.log

.readthedocs.yaml

@@ -14,10 +14,10 @@ formats: [pdf]
 python:
    version: 3.7
    install:
-   - requirements: met/docs/requirements.txt
+   - requirements: docs/requirements.txt
 
 # Configuration for Sphinx documentation (this is the default documentation
 # type)
 sphinx:
   builder: html
-  configuration: met/docs/conf.py
+  configuration: docs/conf.py

met/Makefile.am → Makefile.am

@@ -21,7 +21,7 @@ ACLOCAL_AMFLAGS		= -I m4
 SUBDIRS 		= data src scripts/Rscripts scripts/python
 
 if ENABLE_DEVELOPMENT
-  SUBDIRS += internal_tests
+  SUBDIRS += internal/test_util
 endif
 
 MAINTAINERCLEANFILES 	= \
@@ -31,16 +31,13 @@ MAINTAINERCLEANFILES 	= \
 	config.h.in
 
 # Cleanup for the distribution
-#   - Remove any SVN files
 #   - Remove lex/yacc source files
 #   - Run the check for copyright utility
 
 dist-hook:
-	-rm -rf `find ${distdir} -name .svn`
 	-rm -rf `find ${distdir} -name "*.ll"`
-	-rm -rf `find ${distdir} -name "*.yy"`
 	${top_srcdir}/src/tools/dev_utils/chk4copyright -dir ${distdir} -notice ${top_srcdir}/data/copyright_notice.txt
-	-rm -rf ${distdir}/internal_tests
+	-rm -rf ${distdir}/internal
 	-rm -rf ${distdir}/src/tools/dev_utils
 	-rm -rf ${distdir}/ylwrap