Merge pull request #173 from slaclab/pre-release

v2.3.0 release candidate

releaseGen.py

@@ -525,12 +525,19 @@ def pushRelease(cfg, relName, relData, ver, tagAttach, prev):
 
     print("\nLogging into github....\n")
 
-    if args.token is None:
-        print("Enter your github token. If you do no have one you can generate it here:");
-        print("    https://github.com/settings/tokens");
-        token = input("\nGithub token: ");
-    else:
+    if args.token is not None:
+        print("Using github token from command line arg.")
         token = args.token
+    else:
+        token = os.environ.get('GITHUB_TOKEN')
+
+        if token is None:
+            print("Enter your github token. If you do no have one you can generate it here:");
+            print("    https://github.com/settings/tokens");
+            print("You may set it in your environment as GITHUB_TOKEN")
+            token = input("\nGithub token: ");
+        else:
+            print("Using github token from user's environment.")
 
     gh = github.Github(token)
     remRepo = gh.get_repo(f'slaclab/{project}')

releaseNotes.py

@@ -71,6 +71,13 @@ def getReleaseNotes(locRepo, remRepo, tagRange, noSort=False):
             else:
                 entry['Jira'] = None
 
+            entry['Labels'] = None
+            for lbl in req.get_labels():
+                if entry['Labels'] is None:
+                    entry['Labels'] = lbl.name
+                else:
+                    entry['Labels'] += ', ' + lbl.name
+
             if 'release candidate' not in req.title.lower():
                 records.append(entry)
 
@@ -94,7 +101,7 @@ def getReleaseNotes(locRepo, remRepo, tagRange, noSort=False):
 
         md += '\n|||\n|---:|:---|\n'
 
-        for i in ['Author','Date','Pull','Branch','Jira']:
+        for i in ['Author','Date','Pull','Branch','Jira','Labels']:
             if i in entry and entry[i] is not None:
                 md += f'|**{i}:**|{entry[i]}|\n'
 
@@ -117,6 +124,7 @@ def getReleaseNotes(locRepo, remRepo, tagRange, noSort=False):
     import pyperclip
     from getpass import getpass
     import re
+    import os
 
     import git   # https://gitpython.readthedocs.io/en/stable/tutorial.html
     from github import Github # https://pygithub.readthedocs.io/en/latest/introduction.html
@@ -174,7 +182,17 @@ def getReleaseNotes(locRepo, remRepo, tagRange, noSort=False):
     project = re.compile(r'slaclab/(?P<name>.*?).git').search(url).group('name')
 
     # Connect to the Git server
-    token = input("Enter your github token: ")
+    token = os.environ.get('GITHUB_TOKEN')
+
+    if token is None:
+        print("Enter your github token. If you do no have one you can generate it here:");
+        print("    https://github.com/settings/tokens");
+        print("You may set it in your environment as GITHUB_TOKEN")
+        token = input("\nGithub token: ");
+
+    else:
+        print("Using github token from user's environment.")
+
     github = Github(token)
 
     # Get the repo information