Update develop-ref after #2161 (#2166)

Co-authored-by: Julie Prestopnik <jpresto@seneca.rap.ucar.edu>
Co-authored-by: johnhg <johnhg@ucar.edu>
Co-authored-by: Seth Linden <linden@kiowa.rap.ucar.edu>
Co-authored-by: John Halley Gotway <johnhg@ucar.edu>
Co-authored-by: j-opatz <59586397+j-opatz@users.noreply.github.com>
Co-authored-by: Howard Soh <hsoh@kiowa.rap.ucar.edu>
Co-authored-by: John Halley Gotway <johnhg@kiowa.rap.ucar.edu>
Co-authored-by: jprestop <jpresto@ucar.edu>
Co-authored-by: Howard Soh <hsoh@seneca.rap.ucar.edu>
Co-authored-by: Randy Bullock <bullock@seneca.rap.ucar.edu>
Co-authored-by: davidfillmore <fillmore.winslow.david@gmail.com>
Co-authored-by: rgbullock <bullock@ucar.edu>
Co-authored-by: Seth Linden <linden@seneca.rap.ucar.edu>
Co-authored-by: George McCabe <23407799+georgemccabe@users.noreply.github.com>
Co-authored-by: Seth Linden <linden@ucar.edu>
Co-authored-by: hsoh-u <hsoh@ucar.edu>
Co-authored-by: John Halley Gotway <johnhg@seneca.rap.ucar.edu>
Co-authored-by: MET Tools Test Account <met_test@seneca.rap.ucar.edu>
Co-authored-by: mo-mglover <78152252+mo-mglover@users.noreply.github.com>
Co-authored-by: davidalbo <dave@ucar.edu>
Co-authored-by: lisagoodrich <33230218+lisagoodrich@users.noreply.github.com>
Co-authored-by: Dan Adriaansen <dadriaan@ucar.edu>
Co-authored-by: Molly Smith <molly.b.smith@noaa.gov>

.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/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

.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