Merge pull request #250 from sommersoft/fix_hacktober

Fix Hacktoberfest Labelling & CircuitPython.org Contributing JSON Source

Author: kattni

adabot/lib/assign_hacktober_label.py

@@ -154,6 +154,7 @@ def assign_hacktoberfest(repo, issues=None, remove_labels=False, dry_run=False):
                 update_issue = True
 
         if update_issue:
+            label_names.append("Hacktober")
             params = {"labels": label_names}
             if not dry_run:
                 result = github.patch(

adabot/update_cp_org_libraries.py

@@ -171,9 +171,9 @@ def main(
     logger.info("Run Date: %s", run_time.strftime("%d %B %Y, %I:%M%p"))
 
     if output_file:
+        logger.info(" - Report output will be saved to: %s", output_file)
         file_handler = logging.FileHandler(output_file)
         logger.addHandler(file_handler)
-        logger.info(" - Report output will be saved to: %s", output_file)
 
     if cache_http:
         cpy_vals.github.setup_cache(cache_ttl)

tests/integration/test_update_cp_org_libraries.py

@@ -22,6 +22,8 @@
 
 """Integration tests for 'adabot/update_cp_org_libraries.py'"""
 
+import json
+
 import pytest  # pylint: disable=unused-import
 
 from adabot.lib import common_funcs
@@ -31,9 +33,45 @@
 # pylint: disable=unused-argument
 def mock_list_repos(*args, **kwargs):
     """Function to monkeypatch `common_funcs.list_repos()` for a shorter set of repos."""
-    return [
-        github_requests.get("/repos/adafruit/Adafruit_CircuitPython_TestRepo").json()
-    ]
+    repos = []
+    result = github_requests.get(
+        "/search/repositories",
+        params={
+            "q": "Adafruit_CircuitPython user:adafruit archived:false fork:true",
+            "per_page": 100,
+            "sort": "updated",
+            "order": "asc",
+        },
+    )
+
+    if result.ok:
+        repos.extend(
+            repo
+            for repo in result.json()["items"]
+            if (
+                repo["owner"]["login"] == "adafruit"
+                and (
+                    repo["name"].startswith("Adafruit_CircuitPython")
+                    or repo["name"] == "circuitpython"
+                )
+            )
+        )
+
+    repo_names = [repo["name"] for repo in repos]
+
+    if kwargs.get("include_repos", False):
+        for repo in kwargs["include_repos"]:
+            if repo not in repo_names:
+                add_repo = github_requests.get("/repos/adafruit/" + repo)
+                if add_repo.ok:
+                    repos.append(add_repo.json())
+                else:
+                    print("list_repos(): Failed to retrieve '{}'".format(repo))
+
+    if len(repos) > 5:
+        repos = repos[:5]
+
+    return repos
 
 
 # pylint: disable=unused-argument
@@ -54,7 +92,7 @@ def test_update_cp_org_libraries(monkeypatch):
     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()
+    update_cp_org_libraries.main(loglevel="INFO")
 
 
 # pylint: disable=invalid-name
@@ -66,8 +104,8 @@ def test_update_cp_org_libraries_output_file(monkeypatch, tmp_path, capsys):
 
     tmp_output_file = tmp_path / "output_test.txt"
 
-    update_cp_org_libraries.main(output_file=tmp_output_file)
+    update_cp_org_libraries.main(loglevel="INFO", output_file=tmp_output_file)
 
-    captured = capsys.readouterr()
+    output = tmp_output_file.read_text()
 
-    assert tmp_output_file.read_text() == captured.out
+    assert json.loads(output)