From 38ce77c8e138df2c67acf008a05f243eb7aca73b Mon Sep 17 00:00:00 2001
From: dzbaker <dylan.z.baker@nasa.gov>
Date: Thu, 31 Oct 2024 09:13:40 -0400
Subject: [PATCH 1/2] Fix #244, making version string PEP 440-compliant

---
 _version.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/_version.py b/_version.py
index dda2ecf..46ed959 100644
--- a/_version.py
+++ b/_version.py
@@ -18,7 +18,8 @@
 
 # Development Build Macro Definitions
 _cFS_GrndSys_build_number = 2
-_cFS_GrndSys_build_baseline = "equuleus-rc1"
+_cFS_GrndSys_build_baseline = "7.2"
+_cFS_GrndSys_build_dev_baseline = "equuleus-rc1"
 _cFS_GrndSys_build_dev_cycle = "equuleus-rc2"
 _cFS_GrndSys_build_codename = "Equuleus"
 
@@ -37,7 +38,7 @@
 
 # Development Build format for __version__
 # Baseline git tag + Number of commits since baseline
-__version__ = "+dev".join((_cFS_GrndSys_build_baseline,str(_cFS_GrndSys_build_number)))
+__version__ = "+".join((_cFS_GrndSys_build_baseline, _cFS_GrndSys_build_dev_baseline + "_dev" + str(_cFS_GrndSys_build_number)))
 
 # Development Build format for __version_string__
 _version_string = " cFS-GroundSystem DEVELOPMENT BUILD\n " + __version__

From dadf35183e32fbe67004d7981865a609f47f7d05 Mon Sep 17 00:00:00 2001
From: Dylan <dylan.z.baker@nasa.gov>
Date: Tue, 5 Nov 2024 09:49:29 -0500
Subject: [PATCH 2/2] Updating documentation and version numbers for
 equuleus-rc1+dev6

---
 CHANGELOG.md | 4 ++++
 _version.py  | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 78005ca..333c288 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## Development Build: equuleus-rc1+dev6
+- making version string PEP 440-compliant
+- See <https://github.com/nasa/cFS-GroundSystem/pull/245>
+
 ## Development Build: equuleus-rc1+dev2
 - updating cFS_GroundSystem to use new versioning system
 - See <https://github.com/nasa/cFS-GroundSystem/pull/239>
diff --git a/_version.py b/_version.py
index 46ed959..4c18d55 100644
--- a/_version.py
+++ b/_version.py
@@ -17,7 +17,7 @@
 #
 
 # Development Build Macro Definitions
-_cFS_GrndSys_build_number = 2
+_cFS_GrndSys_build_number = 6
 _cFS_GrndSys_build_baseline = "7.2"
 _cFS_GrndSys_build_dev_baseline = "equuleus-rc1"
 _cFS_GrndSys_build_dev_cycle = "equuleus-rc2"