Merge branch 'refs/heads/main' into fix_dupe_lib_dir

# Conflicts:
#	create_requirement_images.py

Author: FoamyGuy

create_requirement_images.py

@@ -41,6 +41,9 @@
 with open("latest_bundle_data.json", "r", encoding="utf-8") as f:
     bundle_data = json.load(f)
 
+with open("latest_community_bundle_data.json", "r", encoding="utf-8") as f:
+    community_bundle_data = json.load(f)
+
 
 def asset_path(asset_name):
     """Return the location of a file shipped with the screenshot maker"""
@@ -163,7 +166,7 @@ def make_line(
             )
 
     def make_header(position, project_files, files_and_libs):
-        # pylint: disable=too-many-locals
+        # pylint: disable=too-many-locals, too-many-branches
         # Static files
         make_line(
             "CIRCUITPY",
@@ -198,8 +201,7 @@ def make_header(position, project_files, files_and_libs):
             icon=file_icon,
         )
 
-        # TODO: Add settings.toml if it's needed
-
+        # Add settings.toml if it's needed
         if settings_required(files_and_libs):
             make_line(
                 "settings.toml",
@@ -247,6 +249,10 @@ def make_header(position, project_files, files_and_libs):
 
         extra_rows = 0
         for i, file in enumerate(sorted(project_folders_to_draw.keys())):
+            if len(project_folders_to_draw[file]) > 0:
+                triangle_to_use = down_triangle
+            else:
+                triangle_to_use = right_triangle
             make_line(
                 file,
                 (
@@ -257,7 +263,7 @@ def make_header(position, project_files, files_and_libs):
                         * (begin_y_offset + i + len(project_files_to_draw) + extra_rows)
                     ),
                 ),
-                triangle_icon=down_triangle,
+                triangle_icon=triangle_to_use,
             )
             rows_added += 1
             for sub_file in sorted(project_folders_to_draw[file]):
@@ -318,9 +324,12 @@ def get_dependencies(libraries):
 
             if lib_name in bundle_data:
                 lib_obj = bundle_data[lib_name]
+                bundle_used = bundle_data
+            elif lib_name in community_bundle_data:
+                lib_obj = community_bundle_data[lib_name]
+                bundle_used = community_bundle_data
             else:
-                # Library isn't in bundle, so we don't know about its
-                # dependencies.
+                # handle lib that is not in any known bundle
                 if "." in lib_name:
                     file_list.add(lib_name)
                 else:
@@ -329,7 +338,7 @@ def get_dependencies(libraries):
 
             for dep_name in lib_obj["dependencies"]:
                 libraries_to_check.append(dep_name)
-                dep_obj = bundle_data[dep_name]
+                dep_obj = bundle_used[dep_name]
                 if dep_obj["package"]:
                     package_list.add(dep_name)
                 else:

get_imports.py

@@ -13,8 +13,16 @@
 import requests
 
 
-BUNDLE_DATA = "latest_bundle_data.json"
-BUNDLE_TAG = "latest_bundle_tag.json"
+ADAFRUIT_BUNDLE_DATA = "latest_bundle_data.json"
+ADAFRUIT_BUNDLE_TAG = "latest_bundle_tag.json"
+
+COMMUNITY_BUNDLE_DATA = "latest_community_bundle_data.json"
+COMMUNITY_BUNDLE_TAG = "latest_community_bundle_tag.json"
+
+ADAFRUIT_BUNDLE_S3_URL = "https://adafruit-circuit-python.s3.amazonaws.com/bundles/adafruit/adafruit-circuitpython-bundle-{tag}.json"  # pylint: disable=line-too-long
+COMMUNITY_BUNDLE_S3_URL = "https://adafruit-circuit-python.s3.amazonaws.com/bundles/community/circuitpython-community-bundle-{tag}.json"  # pylint: disable=line-too-long
+
+SUBDIRECTORY_FILECOUNT_LIMIT = 10
 
 LEARN_GUIDE_REPO = os.environ.get(
     "LEARN_GUIDE_REPO", "../Adafruit_Learning_System_Guides/"
@@ -36,18 +44,14 @@
 SHOWN_FILETYPES_EXAMPLE = [s for s in SHOWN_FILETYPES if s != "py"]
 
 
-def get_bundle(tag):
-    """Download the given bundle's data to BUNDLE_DATA"""
-    url = f"https://adafruit-circuit-python.s3.amazonaws.com/bundles/adafruit/adafruit-circuitpython-bundle-{tag}.json"  # pylint: disable=line-too-long
-    print(f"get bundle metadata from {url}")
-    r = requests.get(url)
-    with open(BUNDLE_DATA, "wb") as bundle_file:
+def get_bundle(bundle_url, bundle_data_file):
+    """Download the Adafruit and Community bundles data"""
+    print(f"get bundle metadata from {bundle_url}")
+    r = requests.get(bundle_url)
+    with open(bundle_data_file, "wb") as bundle_file:
         bundle_file.write(r.content)
 
 
-LATEST_BUNDLE_VERSION = ""
-
-
 def get_latest_release_from_url(url):
     """
     Find the tag name of the latest release by using HTTP HEAD and decoding the redirect.
@@ -65,44 +69,40 @@ def get_latest_release_from_url(url):
     return tag
 
 
-def get_latest_tag():
+def get_latest_tag(repo_url):
     """
     Find the value of the latest tag for the Adafruit CircuitPython library
     bundle.
     :return: The most recent tag value for the project.
     """
-    global LATEST_BUNDLE_VERSION  # pylint: disable=global-statement
-    if LATEST_BUNDLE_VERSION == "":
-        LATEST_BUNDLE_VERSION = get_latest_release_from_url(
-            "https://github.com/adafruit/Adafruit_CircuitPython_Bundle/releases/latest"
-        )
-    return LATEST_BUNDLE_VERSION
+
+    return get_latest_release_from_url(repo_url)
 
 
-def ensure_latest_bundle():
+def ensure_latest_bundle(bundle_url, bundle_s3_url, bundle_tag_file, bundle_data_file):
     """
     Ensure that there's a copy of the latest library bundle available so circup
     can check the metadata contained therein.
     """
     print("Checking for library updates.")
-    tag = get_latest_tag()
+    tag = get_latest_tag(bundle_url)
     old_tag = "0"
-    if os.path.isfile(BUNDLE_TAG):
-        with open(BUNDLE_TAG, encoding="utf-8") as data:
+    if os.path.isfile(bundle_tag_file):
+        with open(bundle_tag_file, encoding="utf-8") as data:
             try:
                 old_tag = json.load(data)["tag"]
             except json.decoder.JSONDecodeError as _:
                 # Sometimes (why?) the JSON file becomes corrupt. In which case
                 # log it and carry on as if setting up for first time.
-                print(f"Could not parse {BUNDLE_TAG:r}")
+                print(f"Could not parse {bundle_tag_file:r}")
     if tag > old_tag:
         print(f"New version available {tag}.")
         try:
-            get_bundle(tag)
-            with open(BUNDLE_TAG, "w", encoding="utf-8") as data:
+            get_bundle(bundle_s3_url.replace("{tag}", tag), bundle_data_file)
+            with open(bundle_tag_file, "w", encoding="utf-8") as data:
                 json.dump({"tag": tag}, data)
         except requests.exceptions.HTTPError as _:
-            # See #20 for reason this this
+            # See #20 for reason this
             print(
                 (
                     "There was a problem downloading the bundle. "
@@ -114,11 +114,25 @@ def ensure_latest_bundle():
         print(f"Current library bundle up to date {tag}")
 
 
-ensure_latest_bundle()
+ensure_latest_bundle(
+    "https://github.com/adafruit/Adafruit_CircuitPython_Bundle/releases/latest",
+    ADAFRUIT_BUNDLE_S3_URL,
+    ADAFRUIT_BUNDLE_TAG,
+    ADAFRUIT_BUNDLE_DATA,
+)
+ensure_latest_bundle(
+    "https://github.com/adafruit/CircuitPython_Community_Bundle/releases/latest",
+    COMMUNITY_BUNDLE_S3_URL,
+    COMMUNITY_BUNDLE_TAG,
+    COMMUNITY_BUNDLE_DATA,
+)
 
-with open("latest_bundle_data.json", "r", encoding="utf-8") as f:
+with open(ADAFRUIT_BUNDLE_DATA, "r", encoding="utf-8") as f:
     bundle_data = json.load(f)
 
+with open(COMMUNITY_BUNDLE_DATA, "r", encoding="utf-8") as f:
+    community_bundle_data = json.load(f)
+
 
 def get_files_for_project(project_name):
     """Get the set of files for a learn project"""
@@ -141,8 +155,9 @@ def get_files_for_project(project_name):
             if cur_tuple[0].split("/")[-1] == _dir:
                 for _sub_dir in cur_tuple[1]:
                     dir_tuple = (dir_tuple[0], dir_tuple[1] + (_sub_dir,))
-                for _sub_file in cur_tuple[2]:
-                    dir_tuple = (dir_tuple[0], dir_tuple[1] + (_sub_file,))
+                if len(cur_tuple[2]) < SUBDIRECTORY_FILECOUNT_LIMIT:
+                    for _sub_file in cur_tuple[2]:
+                        dir_tuple = (dir_tuple[0], dir_tuple[1] + (_sub_file,))
 
         # e.g. ("dir_name", ("file_1.txt", "file_2.txt"))
         found_files.add(dir_tuple)
@@ -161,7 +176,7 @@ def get_libs_for_project(project_name):
 
             for cur_import in found_imports:
                 cur_lib = cur_import.name.split(".")[0]
-                if cur_lib in bundle_data:
+                if cur_lib in bundle_data or cur_lib in community_bundle_data:
                     found_libs.add(cur_lib)
 
     return found_libs