Merge pull request #1109 from MODFLOW-USGS/v6.4.1

Release 6.4.1
MODFLOW-USGS · Dec 9, 2022 · 9595b25 · 9595b25
2 parents 4458f9f + c8b782a
commit 9595b25
Show file tree

Hide file tree

Showing 51 changed files with 3,792 additions and 2,481 deletions.
diff --git a/.build_rtd_docs/conf.py b/.build_rtd_docs/conf.py
@@ -38,7 +38,7 @@
 pth = os.path.join("..", "distribution")
 args = (
     "python",
-    "make_release.py",
+    "update_version.py",
 )
 # run the command
 proc = Popen(args, stdout=PIPE, stderr=PIPE, cwd=pth)

diff --git a/distribution/.fprettify.yaml → .fprettify.yaml b/distribution/.fprettify.yaml → .fprettify.yaml
diff --git a/.github/common/fortran-format-check.sh b/.github/common/fortran-format-check.sh
@@ -26,7 +26,7 @@ for path in "${SEARCHPATHS[@]}"; do
 
     ((checkcount++))
 
-    if [[ ! -z $(fprettify -d -c ./distribution/.fprettify.yaml "${file}" 2>&1) ]]; then
+    if [[ ! -z $(fprettify -d -c .fprettify.yaml "${file}" 2>&1) ]]; then
       fformatfails+=("${file}")
     fi
   done