make command idempotent (#20)

Author: acabarbaye

continuous_delivery_scripts/generate_news.py

@@ -31,7 +31,7 @@ def version_project(commit_type: CommitType) -> Tuple[bool, Optional[str], Dict[
         (is new version, the new version)
     """
     use_news_files = commit_type in [CommitType.BETA, CommitType.RELEASE]
-    is_new_version, new_version, version_elements = calculate_version(commit_type, use_news_files)
+    is_new_version, new_version, version_elements = calculate_version(commit_type, use_news_files, True)
     _generate_changelog(new_version, use_news_files)
     return is_new_version, new_version, version_elements
 

continuous_delivery_scripts/get_version.py

@@ -26,7 +26,7 @@ def get_project_version_string(commit_type: CommitType) -> str:
         (is new version, the new version)
     """
     use_news_files = commit_type in [CommitType.BETA, CommitType.RELEASE]
-    _, new_version, version_elements = calculate_version(commit_type, use_news_files)
+    _, new_version, version_elements = calculate_version(commit_type, use_news_files, False)
     version_string = determine_version_string(commit_type, new_version, version_elements)
     return version_string
 

continuous_delivery_scripts/utils/versioning.py

@@ -17,7 +17,9 @@
 logger = logging.getLogger(__name__)
 
 
-def calculate_version(commit_type: CommitType, use_news_files: bool) -> Tuple[bool, Optional[str], Dict[str, str]]:
+def calculate_version(
+    commit_type: CommitType, use_news_files: bool, record_state: bool
+) -> Tuple[bool, Optional[str], Dict[str, str]]:
     """Calculates the version for the release.
 
     eg. "0.1.2"
@@ -44,6 +46,7 @@ def calculate_version(commit_type: CommitType, use_news_files: bool) -> Tuple[bo
             enable_file_triggers=enable_file_triggers,
             commit_count_as=bump,
             config_path=project_config_path,
+            dry_run=not record_state,
         )
         # Autoversion second returned value is not actually the new version
         # There seem to be a bug in autoversion.

news/202108111624.bugfix

@@ -0,0 +1 @@
+Made `cd-determine-version` idempotent

tests/versioning/test_versioning.py

@@ -10,12 +10,12 @@
 class TestVersioning(unittest.TestCase):
     def test_calculate_version(self):
         for release_type in CommitType.choices():
-            _, new_version, version_elements = calculate_version(CommitType.RELEASE, False)
+            _, new_version, version_elements = calculate_version(CommitType.RELEASE, False, False)
             self.assertIsNotNone(new_version)
             self.assertNotEquals(new_version, "")
             self.assertIsNotNone(version_elements)
             self.assertGreater(len(version_elements), 0)
-            _, new_version, version_elements = calculate_version(CommitType.RELEASE, True)
+            _, new_version, version_elements = calculate_version(CommitType.RELEASE, True, False)
             self.assertIsNotNone(new_version)
             self.assertNotEquals(new_version, "")
             self.assertIsNotNone(version_elements)