Merge pull request #246 from nasa/integration-candidate

cFS-GroundSystem Integration candidate: Equuleus-rc1+dev20
nasa · Nov 5, 2024 · e22282c · e22282c
2 parents 821a163 + dadf351
commit e22282c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git 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
@@ -17,8 +17,9 @@
 #
 
 # Development Build Macro Definitions
-_cFS_GrndSys_build_number = 2
-_cFS_GrndSys_build_baseline = "equuleus-rc1"
+_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"
 _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__