sts-sponsors team mailing list archive

[Alexsander de Souza <mp+433615@xxxxxxxxxxxxxxxxxx>]

Alexsander de Souza has proposed merging ~alexsander-souza/maas/+git/maas-release-tools:remove_dup_check into ~maas-committers/maas/+git/maas-release-tools:main.

Commit message:
remove duplicate check

Requested reviews:
  MAAS Committers (maas-committers)

For more details, see:
https://code.launchpad.net/~alexsander-souza/maas/+git/maas-release-tools/+merge/433615
-- 
Your team MAAS Committers is requested to review the proposed merge of ~alexsander-souza/maas/+git/maas-release-tools:remove_dup_check into ~maas-committers/maas/+git/maas-release-tools:main.

diff --git a/maas_release_tools/scripts/release_status.py b/maas_release_tools/scripts/release_status.py
index bcd7a75..9d0bfc6 100644
--- a/maas_release_tools/scripts/release_status.py
+++ b/maas_release_tools/scripts/release_status.py
@@ -18,7 +18,6 @@ import base64
 from functools import lru_cache
 import glob
 import json
-import subprocess
 import sys
 from typing import Iterable, Optional
 
@@ -81,7 +80,7 @@ def get_ubuntu_series() -> str:
     try:
         with open("debian/changelog", "r") as fh:
             ch = Changelog(fh, max_blocks=1)
-            return ch.distributions
+            return str(ch.distributions)
     except OSError:
         return "None"
 
@@ -107,9 +106,9 @@ class ReleasePreparer:
             success, message = step.check()
             if not success:
                 all_good = False
-                print("\N{large red circle}")
+                print("\N{Cross Mark}")
             else:
-                print("\N{check mark}")
+                print("\N{White Heavy Check Mark}")
             if message:
                 for line in message.splitlines():
                     print("  " + str(line))
@@ -197,22 +196,14 @@ class MAASVersion(ReleaseStep):
                 f"setup.cfg has {setup_version}, run 'release-prepare'"
             )
             return False, error_message
-        proc = subprocess.run(
-            ["dpkg-parsechangelog", "-S", "version"],
-            stdout=subprocess.PIPE,
-            text=True,
-        )
-        no_epoch_version = proc.stdout.split(":", 1)[-1]
-        no_ubuntu_version = no_epoch_version.split("-", 1)[0]
-        package_version = no_ubuntu_version.replace("~", "-")
-
-        if package_version != self.preparer.version.version:
-            error_message = (
-                f"changelog has {package_version} (expected {self.preparer.version.version}), run "
-                "utilities/release-prepare"
-            )
-            return False, error_message
-
+        deb_ver = self.preparer.version.deb_version
+        with open("debian/changelog", "r") as fh:
+            ch = Changelog(fh, max_blocks=1)
+            if ch.upstream_version != deb_ver:
+                return (
+                    False,
+                    f"Changelog doesn't contain {deb_ver} entry",
+                )
         return True, None
 
 
@@ -416,7 +407,9 @@ class PackagesCopiedToReleasePPA(MAASPPA):
         return f"Packages copied to ppa:{self.ppa_path}"
 
     def skip(self):
-        return self.preparer.version.grade == "beta" and self.ppa_type == "stable"
+        return (
+            self.preparer.version.grade == "beta" and self.ppa_type == "stable"
+        )
 
     def check(self):
         sources = {
@@ -700,23 +693,6 @@ class MilestoneReleased(ReleaseStep):
             return True, None
 
 
-class DebianChangelogUpdated(ReleaseStep):
-    @property
-    def title(self):
-        return "Debian Changelog updated"
-
-    def check(self):
-        ver = self.preparer.version.deb_version
-        with open("debian/changelog", "r") as fh:
-            ch = Changelog(fh, max_blocks=1)
-            if ch.upstream_version == ver:
-                return True, None
-        return (
-            False,
-            f"Changelog doesn't contain {ver} entry",
-        )
-
-
 def parse_args():
     parser = ArgumentParser(description=__doc__)
     parser.add_argument("version", help="The version of MAAS to be released")
@@ -756,7 +732,6 @@ def main():
         MAASVersion(preparer),
         NoUncommittedChanges(preparer),
         CommitInRemoteBranch(preparer),
-        DebianChangelogUpdated(preparer),
         VersionBranch(
             preparer,
             f"git+ssh://{launchpad.lp.me.name}@git.launchpad.net/maas",
diff --git a/maas_release_tools/version.py b/maas_release_tools/version.py
index 3b5b5e0..deb29bf 100644
--- a/maas_release_tools/version.py
+++ b/maas_release_tools/version.py
@@ -3,6 +3,7 @@
 from configparser import ConfigParser
 from dataclasses import dataclass
 from pathlib import Path
+from typing import Iterable
 
 from packaging.version import Version
 
@@ -47,7 +48,7 @@ class ReleaseVersion:
         else:
             raise InvalidReleaseVersion(f"Unknown version suffix: {suffix}")
 
-    def _snap_channels(self) -> str:
+    def _snap_channels(self) -> Iterable[str]:
         grade_map = {
             "final": "stable",
             "rc": "candidate",