Merge pull request #174 from tobiasdiez/update-labels

Add more prefixes to some labels

Author: Matthias Köppe

docs/Migration-Trac-to-Github.md

@@ -58,7 +58,7 @@ See also: https://trac.sagemath.org/ticket/30363
 
   - [Open an Issue on GitHub](https://docs.github.com/en/issues). Preview of Issues (converted from Trac): https://github.com/sagemath/trac_to_gh/issues
   - **Trac ticket box attributes** are mapped as follows (see https://github.com/sagemath/trac-to-github/issues/8):
-    - **Type** ("defect", "enhancement", "task") are mapped to "Labels" "bug", "enhancement".
+    - **Type** ("defect", "enhancement", "task") are mapped to "Labels" "t: bug", "t: enhancement".
     - **Component** ("basic arithmetic", "linear algebra", "geometry", ...) are mapped to "Labels" 
       with prefix `c: `
     - **Priority** ("trivial"/"minor"/"major"/"critical"/"blocker") are mapped to "Labels" with prefix `p: `
@@ -71,7 +71,7 @@ See also: https://trac.sagemath.org/ticket/30363
     - **Milestone = duplicate/invalid/wontfix** and **Resolution** ("duplicate", "invalid", "wontfix")
       are replaced by
       - [marking as duplicate](https://docs.github.com/en/issues/tracking-your-work-with-issues/marking-issues-or-pull-requests-as-a-duplicate), 
-      - "Labels" "duplicate", "invalid", "wontfix", or
+      - "Labels" "r: duplicate", "r: invalid", "r: wontfix", or
       - closing with a comment; use "Close as not wanted"
     - **Dependencies**: Use the phrase "Depends on ", followed by the Issue or PR reference.
       Repeat this in separate lines if there is more than one dependency.
@@ -125,7 +125,7 @@ See also: https://trac.sagemath.org/ticket/30363
     - alternatively, with the [GitHub command-line interface](https://trac.sagemath.org/ticket/34523), use [`gh pr checkout PULL_REQUEST_ID`](https://cli.github.com/manual/gh_pr_checkout)
 
 - For closing issues, **instead of marking it as invalid/duplicate and ready for review**,
-  - if you have the rights to do so, simply [close the issue](https://docs.github.com/en/issues/tracking-your-work-with-issues/closing-an-issue), add a label to specify the reason (e.g. "duplicate") and maybe add a short comment explaining why the issue has been closed, if that's not already clear from the discussion; optionally, to change the reason for closing the issue, click the arrow next to "Close issue" and select a reason;
+  - if you have the rights to do so, simply [close the issue](https://docs.github.com/en/issues/tracking-your-work-with-issues/closing-an-issue), add a label to specify the reason (e.g. "r: duplicate") and maybe add a short comment explaining why the issue has been closed, if that's not already clear from the discussion; optionally, to change the reason for closing the issue, click the arrow next to "Close issue" and select a reason;
   - otherwise, add a short comment indicating that you think the issue should be closed and someone else with the necessary rights will take care of this. 
   
   > If you think an issue has been prematurely be closed, feel free to reopen it.

migrate.cfg.sagetracmigrationarchive

@@ -62,15 +62,15 @@ keywords_to_labels: {
  'elliptic curves': 'c: elliptic curves',
  'manifold': 'c: manifolds',
  'manifolds': 'c: manifolds',
- 'memory leak': 'memleak',
- 'memleak': 'memleak',
+ 'memory leak': 't: bug',
+ 'memleak': 't: bug',
  'number field': 'c: number fields',
  'number fields': 'c: number fields',
  'database': 'c: databases',
- 'doctest': 'doctest coverage',
- 'doctests': 'doctest coverage',
- 'coverage': 'doctest coverage',
- 'performance': 'performance',
+ 'doctest': 't: tests',
+ 'doctests': 't: tests',
+ 'coverage': 't: tests',
+ 'performance': 't: performance',
  'game theory': 'c: game theory',
  'geometry': 'c: geometry',
  'graph': 'c: graph theory',
@@ -109,12 +109,12 @@ migrate_milestones: yes
 
 # Map for certain Trac milestones to GitHub labels
 milestones_to_labels = {
- 'sage-duplicate/invalid/wontfix': 'invalid',
- 'sage-duplicate/invalid': 'invalid',
- 'sage-duplicate': 'duplicate',
- 'sage-wait': 'pending',
- 'sage-pending': 'pending',
- 'sage-feature': 'feature',
+ 'sage-duplicate/invalid/wontfix': 'r: invalid',
+ 'sage-duplicate/invalid': 'r: invalid',
+ 'sage-duplicate': 'r: duplicate',
+ 'sage-wait': 's: pending',
+ 'sage-pending': 's: pending',
+ 'sage-feature': 't: feature',
  'sage-wishlist': 'wishlist item',
  'sage-combinat': 'c: combinatorics',
  'sage-symbolics': 'c: symbolics',
@@ -154,13 +154,12 @@ components_to_labels = {
  # Tiny components, merge into something larger
  'linbox': 'c: packages: standard',
  'givaro': 'c: packages: standard',
- # No "c: " prefix for these:
- 'doctest': 'doctest coverage',
- 'doctests': 'doctest coverage',
- 'doctest coverage': 'doctest coverage',
- 'memleak': 'memleak',
- 'performance': 'performance',
- 'refactoring': 'refactoring',
+ 'doctest': 't: tests',
+ 'doctests': 't: tests',
+ 'doctest coverage': 't: tests',
+ 'memleak': 't: bug',
+ 'performance': 't: performance',
+ 'refactoring': 't: refactoring',
  # Suppress
  'misc': None}
 
@@ -198,10 +197,10 @@ label_colors = {
  'c: scripts': '0000b0',
  'c: spkg-check': '0000b0',
  'c: user interface': '0000b0',
- 'needs work': 'ffff00',
- 'needs info': 'ffff00',
- 'needs review': '7fff00',
- 'positive review': 'dfffc0',
+ 's: needs work': 'ffff00',
+ 's: needs info': 'ffff00',
+ 's: needs review': '7fff00',
+ 's: positive review': 'dfffc0',
  'help wanted': '008672',
  'p: blocker / 1': 'ff0000',
  'p: critical / 2': 'ff7700',
@@ -210,12 +209,11 @@ label_colors = {
  'p: trivial / 5': 'fff9e5',
  'wishlist item': 'e81ff9',
  'good first issue': '7057ff',
- 'bug': 'd73a4a',
- 'memleak': 'd73a4a',
- 'enhancement': '696969',
- 'performance': '696969',
- 'refactoring': '696969',
- 'doctest coverage': '696969',
+ 't: bug': 'd73a4a',
+ 't: enhancement': '696969',
+ 't: performance': '696969',
+ 't: refactoring': '696969',
+ 't: tests': '696969',
  'resolution': 'c6c6c6'}
 
 # values to be ignored on issue conversion

migrate.py

@@ -1593,9 +1593,9 @@ def map_tickettype(tickettype):
     if not tickettype:
         return None
     if tickettype == 'defect':
-        return 'bug'
+        return 't: bug'
     if tickettype == 'enhancement':
-        return 'enhancement'
+        return 't: enhancement'
     # if tickettype == 'clarification':
     #     return 'question'
     # if tickettype == 'task':
@@ -1650,7 +1650,7 @@ def map_status(status):
     "Return a pair: (status, label)"
     status = status.lower()
     if status in ['needs_review', 'needs_work', 'needs_info', 'positive_review']:
-        return 'open', status.replace('_', ' ')
+        return 'open', 's: ' + status.replace('_', ' ')
     elif status in ['', 'new', 'assigned', 'analyzed', 'reopened', 'open', 'needs_info_new']:
         return 'open', None
     elif status in ['closed'] :
@@ -1921,11 +1921,11 @@ 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 'invalid' in labels:
-        if any(x in labels for x in ['duplicate', 'invalid', 'wontfix', 'worksforme']):
+    if 'r: invalid' in labels:
+        if any(x in labels for x in ['r: duplicate', 'r: invalid', 'r: wontfix', 'r: 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.remove('r: invalid')
+    if any(x in labels for x in ['r: duplicate', 'r: invalid', 'r: wontfix', 'r: worksforme']):
         labels = sorted(set(labels).difference(priority_labels))
     return labels