Merge lp:~mwhudson/ubuntu-archive-scripts/team-report-yaml into lp:ubuntu-archive-scripts

[Michael Hudson-Doyle]

This produces output like this: http://paste.ubuntu.com/p/QKpv9RVxN4/

I'm not sure who asked for this but we should ask them if this matches their expectations :)

[Sebastien Bacher (seb128)]

Thanks for working on that, we (desktop) requested to have that yaml, the output from that pastebin looks fine to me and the code seems fine as well, so giving a +1

review: Approve

[Łukasz Zemczak (sil2100)]

Looks good.

review: Approve

=== modified file 'generate-team-p-m'
--- generate-team-p-m	2018-09-11 21:26:25 +0000
+++ generate-team-p-m	2018-12-19 02:43:29 +0000
@@ -16,7 +16,7 @@
 # A copy of the GNU General Public License version 2 is in LICENSE.
 
 import argparse
-from collections import defaultdict
+from collections import defaultdict, OrderedDict
 import datetime
 import json
 import os
@@ -133,6 +133,31 @@
             package_to_teams.setdefault(package, []).append(team)
     return package_to_teams
 
+def setup_yaml():
+    """ http://stackoverflow.com/a/8661021 """
+    represent_dict_order = (
+        lambda self, data: self.represent_mapping('tag:yaml.org,2002:map',
+                                                  data.items()))
+    yaml.add_representer(OrderedDict, represent_dict_order)
+
+
+setup_yaml()
+
+def as_data(inst):
+    r = OrderedDict()
+    fields = [field.name for field in attr.fields(type(inst))]
+    fields.extend(getattr(inst, "extra_fields", []))
+    for field in fields:
+        if field.startswith('_'):
+            continue
+        v = getattr(
+            inst,
+            'serialize_' + field,
+            lambda: getattr(inst, field))()
+        if v is not None:
+            r[field] = v
+    return r
+
 @attr.s
 class ArchRegression:
     arch = attr.ib(default=None)
@@ -147,6 +172,9 @@
     version = attr.ib(default=None) # version that regressed
     arches = attr.ib(default=None) # [ArchRegression]
 
+    def serialize_arches(self):
+        return [as_data(a) for a in self.arches]
+
     @property
     def package_version(self):
         return self.package + '/' + self.version
@@ -163,6 +191,11 @@
 
     _age = attr.ib(default=None)
 
+    extra_fields = ['age']
+
+    def serialize_regressions(self):
+        return [as_data(r) for r in self.regressions]
+
     @property
     def late(self):
         return self.age > 3
@@ -173,6 +206,7 @@
             return self._age
         else:
             return self.data["policy_info"]["age"]["current-age"]
+
     @age.setter
     def age(self, val):
         self._age = val
@@ -193,6 +227,7 @@
     parser.add_argument('--true-ages', action='store_true')
     parser.add_argument('--excuses-yaml', action='store')
     parser.add_argument('output')
+    parser.add_argument('yaml_output', default=None)
     args = parser.parse_args()
 
     components = args.components.split(',')
@@ -296,6 +331,13 @@
             team_to_problems=team_to_problems,
             team_to_attn_count=team_to_attn_count,
             now=excuses["generated-date"].strftime("%Y.%m.%d %H:%M:%S")))
+    if args.yaml_output:
+        team_to_problem_data = {}
+        for t, ps in team_to_problems.items():
+            team_to_problem_data[t] = [as_data(p) for p in ps]
+        with open(args.yaml_output, 'w', encoding='utf-8') as fp:
+            yaml.dump(team_to_problem_data, fp)
+
 
 if __name__ == '__main__':
     main()
 
=== modified file 'run-proposed-migration'
--- run-proposed-migration	2018-10-30 11:14:50 +0000
+++ run-proposed-migration	2018-12-19 02:43:29 +0000
@@ -51,5 +51,5 @@
     cd ~/public_html/proposed-migration/
     generate-team-p-m --excuses-yaml $SERIES/update_excuses.yaml \
                       --subscribers-json ~/public_html/package-team-mapping.json \
-                      $SERIES/update_excuses_by_team.html
+                      $SERIES/update_excuses_by_team.html $SERIES/update_excuses_by_team.yaml
 fi