Merge ~apw/ubuntu-archive-tools:new-review--switch-form-and-minor-fixes into ubuntu-archive-tools:main

[Andy Whitcroft]

new-review: switch up application layout to match u-a-t standard and minor fixes

1) rebuild application to include new-review in new_review.py and symlink for use,
2) fix version fallback for non-kernel promotions, and
3) emit output on stdout to facilitate pager use.

Unmerged commits

0b08781... by Andy Whitcroft on 2023-11-27

new-review: merge new-review and library

Switch new-review to better match the normal form in
ubuntu-archive-tools.

Signed-off-by: Andy Whitcroft <email address hidden>

afabb53... by Andy Whitcroft on 2023-11-27

new-review: use stdout so you can simply use a pager

Signed-off-by: Andy Whitcroft <email address hidden>

1a26421... by Andy Whitcroft on 2023-11-27

new-review: fix non-kernel version fallback

Signed-off-by: Andy Whitcroft <email address hidden>

diff --git a/new-review b/new-review
 deleted file mode 100755
index 521df2f..0000000
--- a/new-review
+++ /dev/null
@@ -1,147 +0,0 @@
-#!/usr/bin/python3
-
-import logging
-import sys
-import yaml
-from argparse import ArgumentParser
-
-from new_review import ReviewServices, ReviewRequest, ReviewError, SigningBotSubmit
-
-
-class CustomFilter(logging.Filter):
-
-    def filter(self, record):
-        # Use nice clear explicit prefixes for warn and error.
-        if record.levelno == logging.WARN:
-            record.msg = "WARNING: " + record.msg
-        elif record.levelno == logging.ERROR:
-            record.msg = "ERROR: " + record.msg
-
-        return True
-
-
-class NewReview:
-
-    def __init__(self, services=None):
-        if services is None:
-            services = ReviewServices()
-
-        self.svcs = services
-
-    def identify_kernel(self, task):
-        for tag in task.bug.tags:
-            if tag.startswith("kernel-sru-cycle-"):
-                return tag[17:]
-        return "kernel"
-
-    def identify_other(self, task):
-        return "-"
-
-    def cmd_ready(self, args):
-        new_review_stati = ["In Progress", "Triaged"]
-        if args.early:
-            new_review_stati.append("Confirmed")
-        tasks = []
-        for project, task, stati, identify in [
-            ("kernel-sru-workflow", "new-review", new_review_stati, self.identify_kernel),
-            ("canonical-signing-jobs", None, ["In Progress", "Confirmed", "Triaged"], self.identify_other),
-        ]:
-            lp_pool = self.svcs.launchpad.projects[project]
-            if task:
-                lp_pool = lp_pool.getSeries(name=task)
-            #print(lp_pool)
-            #tasks += lp_pool.searchTasks(status=stati)
-            for task in lp_pool.searchTasks(status=stati):
-                tasks.append((task, identify(task)))
-            #print(len(tasks))
-        for task, area in tasks:
-            if task.status == "In Progress":
-                assigned = " (in-progress {})".format(task.assignee.name)
-            else:
-                assigned = ""
-            area_pad = " " + area if area[0].isdigit() else area
-            print("{bug:<7} {area:<12} {title}{assigned}".format(bug=task.bug.id, title=task.bug.title, area=area_pad, assigned=assigned))
-
-    def cmd_review(self, args):
-        signing_request = ReviewRequest.select(args, services=self.svcs)
-        if signing_request.task_assign(args):
-            signing_request.analyse(args)
-            if not args.approve:
-                signing_request.binary_new(args)
-
-            signing_bot = SigningBotSubmit()
-            signing_bot.submit(args, signing_request)
-
-            signing_request.task_finalise(args)
-
-    def _main(self):
-        parser = ArgumentParser(description='new-review command line tool')
-
-        commands = parser.add_subparsers(metavar='COMMAND',
-            title='sub-commands', help='add -h for command help')
-        # Work around http://bugs.python.org/issue9253
-        commands.required = True
-
-        subcmd = commands.add_parser('ready',
-            help='list trackers which are ready for review',
-            description='''
-                List all trackers which are currently ready for review
-                and promotion.
-            ''')
-        subcmd.set_defaults(func=self.cmd_ready)
-        subcmd.add_argument("--early", action="store_true")
-
-        subcmd = commands.add_parser('review',
-            help='perform new-review on the selected tracker',
-            description='''
-                Perform a new-review against the selected tracker
-                and reject or promote.
-            ''')
-        subcmd.set_defaults(func=self.cmd_review)
-        group = subcmd.add_argument_group(title='routing options')
-        group.add_argument("--from", dest="from_route")
-        group.add_argument("--from-suite", dest="from_suite")
-        group.add_argument("--to", dest="to_route")
-        group.add_argument("--to-suite", dest="to_suite")
-        group.add_argument("--existing-suite", dest="existing_suite")
-        group.add_argument("--embargo", action="store_true")
-        group = subcmd.add_argument_group(title='type/package options')
-        group.add_argument("--force-type")
-        group.add_argument("--key")
-        group.add_argument("--package", action="append")
-        group = subcmd.add_argument_group(title='disposition options')
-        group.add_argument("--view", action="store_true")
-        group.add_argument("--approve", action="store_true")
-        group.add_argument('--reject', metavar='REASON', help='mark the sru-review as rejected')
-        group.add_argument('--put-back', action="store_true")
-        group.add_argument("--complete", action="store_true")
-        group.add_argument("--ignore-depwait", action="store_true")
-        group.add_argument("--ignore-archs", action="store_true")
-        group = subcmd.add_argument_group(title='verbosity options')
-        group.add_argument("--show-job", action="store_true")
-        group = subcmd.add_argument_group(title='signing task options')
-        group.add_argument("--direct-file")
-        group.add_argument("--delay-ready", action="store_true", default=None)
-        group.add_argument("--no-delay-ready", action="store_false", dest="delay_ready")
-        group.add_argument("--task", default=0, type=int)
-        subcmd.add_argument("tracker", help="tracker (or kernel handle) to promote")
-
-        args = parser.parse_args()
-        args.func(args)
-
-    def main(self):
-        try:
-            self._main()
-        except ReviewError as e:
-            logger.error(str(e.args[0]))
-            sys.exit(1)
-
-
-logger = logging.getLogger(__name__)
-
-if __name__ == '__main__':
-    logging.basicConfig(level=logging.INFO, format="%(message)s")
-    root = logging.getLogger()
-    root.handlers[0].addFilter(CustomFilter())
-
-    NewReview().main()
diff --git a/new-review b/new-review
 new file mode 120000
index 0000000..55214c8
--- /dev/null
+++ b/new-review
@@ -0,0 +1 @@
+new_review.py
 \ No newline at end of file
diff --git a/new_review.py b/new_review.py
index 23c82ad..de9be95 100755
--- a/new_review.py
+++ b/new_review.py
@@ -716,7 +716,7 @@ class ReviewRequestKernel(ReviewRequest):
                         if match:
                             main_version = match.group(1)
                         else:
-                            main_version = package_version
+                            main_version = package.version
 
                         for ucs_ref, ucs_pocket in self.proposed_routes:
                             lp_archive = lp.archives.getByReference(reference=ucs_ref)
@@ -1588,4 +1588,140 @@ class SigningBotSubmit:
                 signing_task.lp_save()
 
 
+class CustomFilter(logging.Filter):
+
+    def filter(self, record):
+        # Use nice clear explicit prefixes for warn and error.
+        if record.levelno == logging.WARN:
+            record.msg = "WARNING: " + record.msg
+        elif record.levelno == logging.ERROR:
+            record.msg = "ERROR: " + record.msg
+
+        return True
+
+
+class NewReview:
+
+    def __init__(self, services=None):
+        if services is None:
+            services = ReviewServices()
+
+        self.svcs = services
+
+    def identify_kernel(self, task):
+        for tag in task.bug.tags:
+            if tag.startswith("kernel-sru-cycle-"):
+                return tag[17:]
+        return "kernel"
+
+    def identify_other(self, task):
+        return "-"
+
+    def cmd_ready(self, args):
+        new_review_stati = ["In Progress", "Triaged"]
+        if args.early:
+            new_review_stati.append("Confirmed")
+        tasks = []
+        for project, task, stati, identify in [
+            ("kernel-sru-workflow", "new-review", new_review_stati, self.identify_kernel),
+            ("canonical-signing-jobs", None, ["In Progress", "Confirmed", "Triaged"], self.identify_other),
+        ]:
+            lp_pool = self.svcs.launchpad.projects[project]
+            if task:
+                lp_pool = lp_pool.getSeries(name=task)
+            #print(lp_pool)
+            #tasks += lp_pool.searchTasks(status=stati)
+            for task in lp_pool.searchTasks(status=stati):
+                tasks.append((task, identify(task)))
+            #print(len(tasks))
+        for task, area in tasks:
+            if task.status == "In Progress":
+                assigned = " (in-progress {})".format(task.assignee.name)
+            else:
+                assigned = ""
+            area_pad = " " + area if area[0].isdigit() else area
+            print("{bug:<7} {area:<12} {title}{assigned}".format(bug=task.bug.id, title=task.bug.title, area=area_pad, assigned=assigned))
+
+    def cmd_review(self, args):
+        signing_request = ReviewRequest.select(args, services=self.svcs)
+        if signing_request.task_assign(args):
+            signing_request.analyse(args)
+            if not args.approve:
+                signing_request.binary_new(args)
+
+            signing_bot = SigningBotSubmit()
+            signing_bot.submit(args, signing_request)
+
+            signing_request.task_finalise(args)
+
+    def _main(self):
+        parser = ArgumentParser(description='new-review command line tool')
+
+        commands = parser.add_subparsers(metavar='COMMAND',
+            title='sub-commands', help='add -h for command help')
+        # Work around http://bugs.python.org/issue9253
+        commands.required = True
+
+        subcmd = commands.add_parser('ready',
+            help='list trackers which are ready for review',
+            description='''
+                List all trackers which are currently ready for review
+                and promotion.
+            ''')
+        subcmd.set_defaults(func=self.cmd_ready)
+        subcmd.add_argument("--early", action="store_true")
+
+        subcmd = commands.add_parser('review',
+            help='perform new-review on the selected tracker',
+            description='''
+                Perform a new-review against the selected tracker
+                and reject or promote.
+            ''')
+        subcmd.set_defaults(func=self.cmd_review)
+        group = subcmd.add_argument_group(title='routing options')
+        group.add_argument("--from", dest="from_route")
+        group.add_argument("--from-suite", dest="from_suite")
+        group.add_argument("--to", dest="to_route")
+        group.add_argument("--to-suite", dest="to_suite")
+        group.add_argument("--existing-suite", dest="existing_suite")
+        group.add_argument("--embargo", action="store_true")
+        group = subcmd.add_argument_group(title='type/package options')
+        group.add_argument("--force-type")
+        group.add_argument("--key")
+        group.add_argument("--package", action="append")
+        group = subcmd.add_argument_group(title='disposition options')
+        group.add_argument("--view", action="store_true")
+        group.add_argument("--approve", action="store_true")
+        group.add_argument('--reject', metavar='REASON', help='mark the sru-review as rejected')
+        group.add_argument('--put-back', action="store_true")
+        group.add_argument("--complete", action="store_true")
+        group.add_argument("--ignore-depwait", action="store_true")
+        group.add_argument("--ignore-archs", action="store_true")
+        group = subcmd.add_argument_group(title='verbosity options')
+        group.add_argument("--show-job", action="store_true")
+        group = subcmd.add_argument_group(title='signing task options')
+        group.add_argument("--direct-file")
+        group.add_argument("--delay-ready", action="store_true", default=None)
+        group.add_argument("--no-delay-ready", action="store_false", dest="delay_ready")
+        group.add_argument("--task", default=0, type=int)
+        subcmd.add_argument("tracker", help="tracker (or kernel handle) to promote")
+
+        args = parser.parse_args()
+        args.func(args)
+
+    def main(self):
+        try:
+            self._main()
+        except ReviewError as e:
+            logger.error(str(e.args[0]))
+            sys.exit(1)
+
+
 logger = logging.getLogger(__name__)
+
+if __name__ == '__main__':
+    logging.basicConfig(level=logging.INFO, format="%(message)s", stream=sys.stdout)
+    root = logging.getLogger()
+    root.handlers[0].addFilter(CustomFilter())
+
+    NewReview().main()