Merge pull request #240 from sommersoft/report_order

Update CircuitPython Report Order & Emergency Fix

Author: kattni

adabot/circuitpython_libraries.py

@@ -242,10 +242,7 @@ def run_library_checks(validators, kw_args, error_depth):
     )
     for pull_request in sorted_prs:
         logger.info("    * %s", pull_request)
-    print_issue_overview(lib_insights)
-    logger.info("* https://circuitpython.org/contributing")
-    logger.info("  * %s open issues", len(lib_insights["open_issues"]))
-    logger.info("  * %s good first issues", lib_insights["good_first_issues"])
+
     open_pr_days = [
         int(pr_sort_re.search(pull_request).group(1))
         for pull_request in lib_insights["open_prs"]
@@ -258,6 +255,14 @@ def run_library_checks(validators, kw_args, error_depth):
             max(open_pr_days),
             max((min(open_pr_days), 1)),  # ensure the minumum is '1'
         )
+
+    print_issue_overview(lib_insights)
+
+    logger.info("  * %s open issues", len(lib_insights["open_issues"]))
+    logger.info("  * %s good first issues", lib_insights["good_first_issues"])
+
+    logger.info("* https://circuitpython.org/contributing")
+
     logger.info("Library updates in the last seven days:")
     if len(new_libs) != 0:
         logger.info("**New Libraries**")

adabot/lib/circuitpython_library_validators.py

@@ -236,13 +236,9 @@ def rtd_yml_base(self):
         if self._rtd_yaml_base is None:
             rtd_yml_dl_url = (
                 "https://raw.githubusercontent.com/adafruit/cookiecutter-adafruit-"
-                "circuitpython/main/%7B%25%20if%20cookiecutter.library_prefix"
-                "%20%25%7D%7B%7B%20cookiecutter.library_prefix%20%7C%20capitalize"
-                "%20%7D%7D_CircuitPython%7B%25%20else%20%25%7DCircuitPython_Org%7B"
-                "%25%20endif%20%25%7D_%7B%7B%20cookiecutter.library_name%7Creplace"
-                "(%22%20%22%2C%20%22_%22)%7D%7D/%7B%25%20if%20cookiecutter.sphinx"
-                "_docs%20in%20%5B'y'%2C%20'yes'%5D%20%25%7D.readthedocs.yml%7B%25"
-                "%20endif%20%25%7D"
+                "circuitpython/main/%7B%7B%20cookiecutter%20and%20'tmp_repo'%20%7D"
+                "%7D/%7B%25%20if%20cookiecutter.sphinx_docs%20in%20%5B'y'%2C%20'yes'"
+                "%5D%20%25%7D.readthedocs.yml%7B%25%20endif%20%25%7D"
             )
             rtd_yml = requests.get(rtd_yml_dl_url)
             if rtd_yml.ok:

adabot/update_cp_org_libraries.py

@@ -238,9 +238,9 @@ def main(
         # get the contributors and reviewers for the last week
         get_contribs, get_revs, get_merge_count = get_contributors(repo)
         if get_contribs:
-            contributors.add(get_contribs)
+            contributors.update(get_contribs)
         if get_revs:
-            reviewers.add(get_revs)
+            reviewers.update(get_revs)
         merged_pr_count_total += get_merge_count
 
         if repo_name in DO_NOT_VALIDATE:

tests/integration/test_update_cp_org_libraries.py

@@ -36,10 +36,23 @@ def mock_list_repos(*args, **kwargs):
     ]
 
 
+# pylint: disable=unused-argument
+def mock_get_contribs(*args):
+    """Function to monkeypatch `update_cp_org_libraries.get_contributors()` to ensure
+    proper testing of usage. Monkeypatched `list_repos` will likely not produce results.
+    """
+    contribs = ["test_user1", "test_user2"]
+    reviewers = ["test_reviewer1", "test_reviewer2"]
+    merged_pr_count = 4
+
+    return contribs, reviewers, merged_pr_count
+
+
 def test_update_cp_org_libraries(monkeypatch):
     """Test main function of 'circuitpyton_libraries.py', without writing an output file."""
 
     monkeypatch.setattr(common_funcs, "list_repos", mock_list_repos)
+    monkeypatch.setattr(update_cp_org_libraries, "get_contributors", mock_get_contribs)
 
     update_cp_org_libraries.main()
 
@@ -49,6 +62,7 @@ def test_update_cp_org_libraries_output_file(monkeypatch, tmp_path, capsys):
     """Test main funciton of 'update_cp_org_libraries.py', with writing an output file."""
 
     monkeypatch.setattr(common_funcs, "list_repos", mock_list_repos)
+    monkeypatch.setattr(update_cp_org_libraries, "get_contributors", mock_get_contribs)
 
     tmp_output_file = tmp_path / "output_test.txt"