Merge pull request #331 from tekktrik/dev/improve-update-check

Improve library update check for Adafruit Bundle libraries

Author: dhalbert

adabot/circuitpython_libraries.py

@@ -23,7 +23,7 @@
 from adabot.lib import common_funcs
 from adabot.lib import assign_hacktober_label as hacktober
 from adabot.lib import blinka_funcs
-from adabot.lib import community_bundle_announcer
+from adabot.lib import bundle_announcer
 from adabot import circuitpython_library_download_stats as dl_stats
 
 GH_INTERFACE = pygithub.Github(os.environ.get("ADABOT_GITHUB_ACCESS_TOKEN"))
@@ -124,8 +124,6 @@ def run_library_checks(validators, kw_args, error_depth):
     repo_needs_work = []
     since = datetime.datetime.now() - datetime.timedelta(days=7)
     repos_by_error = {}
-    new_libs = {}
-    updated_libs = {}
 
     validator = cirpy_lib_vals.LibraryValidator(
         validators, bundle_submodules, latest_pylint, **kw_args
@@ -172,14 +170,6 @@ def run_library_checks(validators, kw_args, error_depth):
                     logger.info(", ".join(validator.output_file_data))
                     validator.output_file_data.clear()
 
-        # get a list of new & updated libraries for the last week
-        if repo["name"] != "Adafruit_CircuitPython_Bundle":
-            check_releases = common_funcs.is_new_or_updated(repo)
-            if check_releases == "new":
-                new_libs[repo["name"]] = repo["html_url"]
-            elif check_releases == "updated":
-                updated_libs[repo["name"]] = repo["html_url"]
-
     logger.info("")
     logger.info("State of CircuitPython + Libraries + Blinka")
 
@@ -332,21 +322,23 @@ def run_library_checks(validators, kw_args, error_depth):
         )
         logger.info("*This is normal for CI runs from PRs*")
 
+    new_libs, updated_libs = bundle_announcer.get_adafruit_bundle_updates()
+
     logger.info("")
     logger.info("#### Library updates in the last seven days:")
     if len(new_libs) != 0:
         logger.info("* **New Libraries**")
-        for title, link in new_libs.items():
+        for title, link in new_libs:
             logger.info("  * [%s](%s)", title, link)
     if len(updated_libs) != 0:
         logger.info("* **Updated Libraries**")
-        for title, link in updated_libs.items():
+        for title, link in updated_libs:
             logger.info("  * [%s](%s)", title, link)
 
     (
         new_community_libs,
         updated_community_libs,
-    ) = community_bundle_announcer.get_community_bundle_updates()
+    ) = bundle_announcer.get_community_bundle_updates()
     if len(new_community_libs) != 0:
         logger.info("* **New Community Libraries**")
         for title, link in new_community_libs:

adabot/lib/community_bundle_announcer.py renamed to adabot/lib/bundle_announcer.py

@@ -26,16 +26,25 @@
 
 
 def get_community_bundle_updates() -> Tuple[Set[RepoResult], Set[RepoResult]]:
+    """Get new and updated libraries in the Community Bundle"""
+    return get_bundle_updates("adafruit/CircuitPython_Community_Bundle")
+
+
+def get_adafruit_bundle_updates() -> Tuple[Set[RepoResult], Set[RepoResult]]:
+    """Get new and updated libraries in the Adafruit Bundle"""
+    return get_bundle_updates("adafruit/Adafruit_CircuitPython_Bundle")
+
+
+# pylint: disable=too-many-locals
+def get_bundle_updates(full_repo_name: str) -> Tuple[Set[RepoResult], Set[RepoResult]]:
     """
     Get the updates to the Community Bundle.
 
     Returns new and updated libraries
     """
     while True:
         try:
-            repository = GH_INTERFACE.get_repo(
-                "adafruit/CircuitPython_Community_Bundle"
-            )
+            repository = GH_INTERFACE.get_repo(full_repo_name)
             seven_days_ago = datetime.datetime.now() - datetime.timedelta(days=7)
             recent_releases = [
                 release
@@ -81,8 +90,18 @@ def get_community_bundle_updates() -> Tuple[Set[RepoResult], Set[RepoResult]]:
 
 
 if __name__ == "__main__":
-    results = get_community_bundle_updates()
-    for new_lib in results[0]:
-        print(f"New libraries: {new_lib[0]} { {new_lib[1]} }")
-    for updated_lib in results[1]:
-        print(f"New libraries: {updated_lib[0]} { {updated_lib[1]} }")
+    adafruit_results = get_adafruit_bundle_updates()
+    community_results = get_community_bundle_updates()
+    for new_adafruit_lib in adafruit_results[0]:
+        print(f"New libraries: {new_adafruit_lib[0]} { {new_adafruit_lib[1]} }")
+    for updated_adafruit_lib in adafruit_results[1]:
+        print(
+            f"Updated libraries: {updated_adafruit_lib[0]} { {updated_adafruit_lib[1]} }"
+        )
+    print("-----")
+    for new_community_lib in community_results[0]:
+        print(f"New libraries: {new_community_lib[0]} { {new_community_lib[1]} }")
+    for updated_community_lib in community_results[1]:
+        print(
+            f"Updated libraries: {updated_community_lib[0]} { {updated_community_lib[1]} }"
+        )