Merge pull request #65 from makermelissa/master

Add library versions to JSON
adafruit · Mar 24, 2021 · 248bc56 · 248bc56
2 parents 3b529b4 + ffa8fe9
commit 248bc56
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/circuitpython_build_tools/build.py b/circuitpython_build_tools/build.py
@@ -135,7 +135,12 @@ def get_package_info(library_path, package_folder_prefix):
         package_info["module_name"] = py_files[0].relative_to(library_path).name[:-3]
     else:
         package_info["module_name"] = None
-
+
+    try:
+        package_info["version"] = version_string(library_path, valid_semver=True)
+    except ValueError as e:
+        package_info["version"] = version_string(library_path)
+
     return package_info
 
 def library(library_path, output_directory, package_folder_prefix,

diff --git a/circuitpython_build_tools/scripts/build_bundles.py b/circuitpython_build_tools/scripts/build_bundles.py
@@ -97,10 +97,12 @@ def build_bundle_json(libs, bundle_version, output_filename, package_folder_pref
         library = {}
         package_info = build.get_package_info(library_path, package_folder_prefix)
         module_name = get_module_name(library_path)
-        library["package"] = package_info["is_package"]
-        library["path"] = "lib/" + package_info["module_name"]
-        library["dependencies"] = get_bundle_requirements(library_path)
-        library_submodules[module_name] = library
+        if package_info["module_name"] is not None:
+            library["package"] = package_info["is_package"]
+            library["version"] = package_info["version"]
+            library["path"] = "lib/" + package_info["module_name"]
+            library["dependencies"] = get_bundle_requirements(library_path)
+            library_submodules[module_name] = library
     out_file = open(output_filename, "w")
     json.dump(library_submodules, out_file)
     out_file.close()