From 97648694b9e082d631320e5795823b939809aa44 Mon Sep 17 00:00:00 2001
From: w-bonelli <wbonelli@uga.edu>
Date: Fri, 30 Jun 2023 08:26:17 -0400
Subject: [PATCH] rename release notes staging file, fix update_version.py

---
 distribution/update_version.py                | 12 ++++--------
 doc/ReleaseNotes/ReleaseNotes.tex             |  2 +-
 doc/ReleaseNotes/{v6.dev4.tex => develop.tex} |  0
 3 files changed, 5 insertions(+), 9 deletions(-)
 rename doc/ReleaseNotes/{v6.dev4.tex => develop.tex} (100%)

diff --git a/distribution/update_version.py b/distribution/update_version.py
index e6c7d0c1fc5..8caf812a174 100755
--- a/distribution/update_version.py
+++ b/distribution/update_version.py
@@ -31,7 +31,6 @@
 import argparse
 import json
 import os
-import shutil
 import textwrap
 from collections import OrderedDict
 from datetime import datetime
@@ -140,7 +139,7 @@ def update_version_txt_and_py(version: Version, timestamp: datetime):
             + f"created using...{os.path.basename(__file__)}\n"
         )
         f.write("# created on..." + f"{timestamp.strftime('%B %d, %Y %H:%M:%S')}\n")
-        f.write(f"__version__ = '{version}'")
+        f.write(f'__version__ = "{version}"\n')
     log_update(py_path, version)
 
 
@@ -384,13 +383,10 @@ def test_update_version(version, approved, developmode):
             provided, the version number will not be changed. A file lock is held
             to synchronize file access. To indicate a version is production-ready
             use --approve. This will change the disclaimer and version tag label,
-            removing 'Release Candidate' from the latter and modifying the former
-            to reflect approval The IDEVELOPMODE flag is set to 1 for preliminary
-            versions and 0 for approved versions. The version tag must follow the
+            removing '(preliminary)' from the latter, and modifying the former to
+            reflect approval The --releasemode flag controls whether IDEVELOPMODE
+            is set to 0 instead of the default 1. The version tag must follow the
             '<major>.<minor>.<patch>' format conventions for semantic versioning.
-            If --version is provided, --bump-patch, --bump-minor and --bump-major
-            may not be provided. Likewise, if any of the latter are provided, the
-            version number must not be specified.
             """
         ),
     )
diff --git a/doc/ReleaseNotes/ReleaseNotes.tex b/doc/ReleaseNotes/ReleaseNotes.tex
index 47394197bcc..95d18e90f8d 100644
--- a/doc/ReleaseNotes/ReleaseNotes.tex
+++ b/doc/ReleaseNotes/ReleaseNotes.tex
@@ -189,7 +189,7 @@ \section{Changes Introduced in this Release}
 This section describes changes introduced into MODFLOW~6 for the current release.  These changes may substantially affect users.
 
 \begin{itemize}
-\input{v6.dev4.tex}
+\input{develop.tex}
 \end{itemize}
 
 % -------------------------------------------------
diff --git a/doc/ReleaseNotes/v6.dev4.tex b/doc/ReleaseNotes/develop.tex
similarity index 100%
rename from doc/ReleaseNotes/v6.dev4.tex
rename to doc/ReleaseNotes/develop.tex