build_bundles: Ignore more packages that exist only on pypi

…and sort the existing list and use 'normalized' names

The implementation of normalize_dist_name is taken from pipkin.

Author: jepler

circuitpython_build_tools/scripts/build_bundles.py

@@ -40,14 +40,22 @@
 import pkg_resources
 
 BLINKA_LIBRARIES = [
-    "adafruit-blinka",
-    "adafruit-blinka-bleio",
-    "adafruit-blinka-displayio",
-    "adafruit-blinka-pyportal",
-    "adafruit-python-extended-bus",
+    "adafruit_blinka",
+    "adafruit_blinka_bleio",
+    "adafruit_blinka_displayio",
+    "adafruit_blinka_pyportal",
+    "adafruit_circuitpython_busdevice",
+    "adafruit_python_extended_bus",
+    "numpy",
+    "pillow",
+    "pyasn1",
     "pyserial",
+    "scipy",
 ]
 
+def normalize_dist_name(name: str) -> str:
+    return name.lower().replace("-", "_")
+
 def add_file(bundle, src_file, zip_name):
     bundle.write(src_file, zip_name)
     file_size = os.stat(src_file).st_size
@@ -93,6 +101,7 @@ def get_bundle_requirements(directory, package_list):
                     if any(operators in line for operators in [">", "<", "="]):
                         # Remove everything after any pip style version specifiers
                         line = re.split("[<|>|=|]", line)[0]
+                    line = normalize_dist_name(line)
                     if line not in dependencies and line in package_list:
                         dependencies.append(package_list[line]["module_name"])
                     elif line not in pypi_reqs and line not in BLINKA_LIBRARIES: