Label format change: 'c: website / wiki', 'p: blocker / 1'

Author: Matthias Koeppe

migrate.cfg.sagetracmigrationarchive

@@ -109,9 +109,9 @@ migrate_milestones: yes
 
 # Map for certain Trac milestones to GitHub labels
 milestones_to_labels = {
- 'sage-duplicate/invalid/wontfix': 'duplicate/invalid/wontfix',
- 'sage-duplicate/invalid': 'duplicate/invalid/wontfix',
- 'sage-duplicate': 'duplicate/invalid/wontfix',
+ 'sage-duplicate/invalid/wontfix': 'invalid',
+ 'sage-duplicate/invalid': 'invalid',
+ 'sage-duplicate': 'duplicate',
  'sage-wait': 'pending',
  'sage-pending': 'pending',
  'sage-feature': 'feature',
@@ -141,6 +141,8 @@ components_to_labels = {
  'optional packages': 'c: packages: optional',
  'packages': 'c: packages: standard',
  'plotting': 'c: graphics',
+ # More readable with space
+ 'website/wiki': 'c: website / wiki',
  # Old components, merge into something larger
  'debian-package': 'c: distribution',
  'pbuild': 'c: build',
@@ -168,7 +170,7 @@ label_colors = {
  'keyword': '0000ff',
  'c: documentation': '0075ca',
  'c: translations': '0075ca',
- 'c: website/wiki': '0075ca',
+ 'c: website / wiki': '0075ca',
  'c: python3': '0000b0',
  'c: build': '0000b0',
  'c: build: configure': '0000b0',
@@ -201,11 +203,11 @@ label_colors = {
  'needs review': '7fff00',
  'positive review': 'dfffc0',
  'help wanted': '008672',
- 'p: 1 \u2013 blocker': 'ff0000',
- 'p: 2 \u2013 critical': 'ff7700',
- 'p: 3 \u2013 major': 'ffbb00',
- 'p: 4 \u2013 minor': 'ffe799',
- 'p: 5 \u2013 trivial': 'fff9e5',
+ 'p: blocker / 1': 'ff0000',
+ 'p: critical / 2': 'ff7700',
+ 'p: major / 3': 'ffbb00',
+ 'p: minor / 4': 'ffe799',
+ 'p: trivial / 5': 'fff9e5',
  'wishlist item': 'e81ff9',
  'good first issue': '7057ff',
  'bug': 'd73a4a',

migrate.py

@@ -1521,7 +1521,7 @@ def map_priority(priority):
         numerical_priority = 5 - ['trivial', 'minor', 'major', 'critical', 'blocker'].index(priority)
     except ValueError:
         return priority
-    return f'p: {numerical_priority} \u2013 {priority}'
+    return f'p: {priority} / {numerical_priority}'
 
 default_severity = 'normal'
 def map_severity(severity):
@@ -1802,11 +1802,10 @@ def gh_comment_issue(dest, issue, comment, src_ticket_id, comment_id=None, minim
 priority_labels = set(map_priority(priority)
                       for priority in ['trivial', 'minor', 'major', 'critical', 'blocker'])
 def normalize_labels(dest, labels):
-    if 'duplicate/invalid/wontfix' in labels:
-        labels.remove('duplicate/invalid/wontfix')
-        if not any(x in labels for x in ['duplicate', 'invalid', 'wontfix', 'worksforme']):
-            labels.append('invalid')
-            gh_ensure_label(dest, 'invalid', label_category='resolution')
+    if 'invalid' in labels:
+        if any(x in labels for x in ['duplicate', 'invalid', 'wontfix', 'worksforme']):
+            # Remove in favor of the more specific label.
+            labels.remove('invalid')
     if any(x in labels for x in ['duplicate', 'invalid', 'wontfix', 'worksforme']):
         labels = sorted(set(labels).difference(priority_labels))
     return labels