Skip to content

Commit 97895d2

Browse files
authored
Merge pull request #90 from adafruit/ignore-more-package-names
build_bundles: Ignore more packages that exist only on pypi
2 parents 3552198 + 38931db commit 97895d2

File tree

1 file changed

+13
-5
lines changed

1 file changed

+13
-5
lines changed

circuitpython_build_tools/scripts/build_bundles.py

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,21 @@
4040
import pkg_resources
4141

4242
BLINKA_LIBRARIES = [
43-
"adafruit-blinka",
44-
"adafruit-blinka-bleio",
45-
"adafruit-blinka-displayio",
46-
"adafruit-blinka-pyportal",
47-
"adafruit-python-extended-bus",
43+
"adafruit_blinka",
44+
"adafruit_blinka_bleio",
45+
"adafruit_blinka_displayio",
46+
"adafruit_blinka_pyportal",
47+
"adafruit_python_extended_bus",
48+
"numpy",
49+
"pillow",
50+
"pyasn1",
4851
"pyserial",
52+
"scipy",
4953
]
5054

55+
def normalize_dist_name(name: str) -> str:
56+
return name.lower().replace("-", "_")
57+
5158
def add_file(bundle, src_file, zip_name):
5259
bundle.write(src_file, zip_name)
5360
file_size = os.stat(src_file).st_size
@@ -93,6 +100,7 @@ def get_bundle_requirements(directory, package_list):
93100
if any(operators in line for operators in [">", "<", "="]):
94101
# Remove everything after any pip style version specifiers
95102
line = re.split("[<|>|=|]", line)[0]
103+
line = normalize_dist_name(line)
96104
if line not in dependencies and line in package_list:
97105
dependencies.append(package_list[line]["module_name"])
98106
elif line not in pypi_reqs and line not in BLINKA_LIBRARIES:

0 commit comments

Comments
 (0)