Version class is comparison aware, remove unnecessary split & conversions

Author: Dariquest

ci/scripts/autobump-dependencies.py

@@ -356,33 +356,26 @@ def fetch_latest_release(self) -> Release:
             version.parse(latest_version),
         )
 
-    # Parse, validate and split version into parts
-    def _parse_and_split_version(self, version):
-        version_parts = version.split('.')
-        if len(version_parts) < 3:
-            raise Exception(f"Expected version with 3 semver segments (major.minor.patch), got less: {version}.")
-        return version_parts[0], version_parts[1], version_parts[2]
-
-    # Returns normalized versions for changelog comparison
-    def _get_comparison_versions(self, current_version, latest_version):
-        comparison_current = str(current_version)
-        comparison_latest = str(latest_version)
-
-        current_major, current_minor, current_patch = self._parse_and_split_version(comparison_current)
-        latest_major, latest_minor, latest_patch = self._parse_and_split_version(comparison_latest)
-
-        # Major and minor version jump adjustment to the zero version
-        if int(latest_major) > int(current_major) or int(latest_minor) > int(current_minor):
-            comparison_current = f"{current_major}.{current_minor}.0"
+    def _get_comparison_versions(self):
+        """ HAProxy tracks each minor version in a dedicated repository and the changelog in each repository only ever
+        observes the .0 of previous minor versions as they are split off into a dedicated repository at that point.
+        To make a comparison across major and minor versions we need to compare against the .0 of the previous minor
+        version, this helper converts the comparison base accordingly.
+        """
+        current_version = self.current_version
+        latest_version = self.latest_release.version
+        if latest_version.major > current_version.major or latest_version.minor > current_version.minor:
+            current_version = version.Version(f"{current_version.major}.{current_version.minor}.0")
 
-        return comparison_current, comparison_latest
+        return str(current_version), str(latest_version)
 
     def get_release_notes(self) -> str:
-        current_version = self.current_version
-        latest_version = self.latest_release.version
 
-        if (current_version == latest_version):
-            raise Exception(f"""Changelog requested but current and latest versions are the same: {current_version}""")
+        if self.current_version == self.latest_release.version:
+            raise Exception(f"""Changelog requested for identical current and latest versions: {self.current_version}""")
+
+        # Set patch part of the current version to 0 for minor and major version bumps
+        current_version, latest_version = self._get_comparison_versions()
 
         releaseNote = textwrap.dedent(f"""
             [Changelog for HAProxy {latest_version}](https://www.haproxy.org/download/{HAPROXY_VERSION}/src/CHANGELOG).
@@ -402,14 +395,11 @@ def get_release_notes(self) -> str:
                 ```
             """)
 
-            # Get normalized versions for comparison
-            comparison_current, comparison_latest = self._get_comparison_versions(current_version, latest_version)
-
             startCopy = False
             for line in file:
-                if (line.endswith(comparison_latest+"\n")):          # Start copying from latest version head
+                if (line.endswith(latest_version+"\n")):          # Start copying from latest version head
                     startCopy = True
-                if (line.endswith(comparison_current+"\n")):         # Stop when reaching current version
+                if (line.endswith(current_version+"\n")):         # Stop when reaching current version
                     break
                 if not startCopy:
                     continue