Skip to content

Commit d01e022

Browse files
committed
bug(job_modules): should be case insensitive
and now they are. as of this fix see pep https://peps.python.org/pep-0508/
1 parent 35494a0 commit d01e022

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

dcp/api/job_modules.py

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,22 @@
11
"""
22
Converts Job modules (Pyodide core packages) for Pyodide worktime.
33
4-
Author: Severn Lortie <[email protected]>
4+
Author:
5+
Severn Lortie <[email protected]>
6+
Will Pringle <[email protected]>
7+
58
Date: Aug 2024
69
"""
710

811
from ..resources import pyodide_lock_repodata_json as repodata
912

1013
def pyodide_full_module_dependencies(modules):
14+
"""Generates a list of every required pip package."""
1115
dependencies = []
1216

17+
# PIP packages are case insensitive, see pep-0508
18+
modules = list(map(lambda x: x.lower(), modules))
19+
1320
for module in modules:
1421
if not module in repodata['packages']:
1522
raise Exception('Usage of unsupported module "${module}". "${module}" is currently not supported by the Pyodide Worktime.')
@@ -25,12 +32,14 @@ def pyodide_full_module_dependencies(modules):
2532

2633
# TODO: do we need this?
2734
def convert_modules_to_requires(modules):
35+
"""Convert pip module package names to dcp package names."""
2836
dcp_packages = []
2937
for pyodide_module in modules:
3038
dcp_packages.append(f"pyodide-{pyodide_module}/pyodide-{pyodide_module}.js")
3139
return dcp_packages
3240

3341
def convert_module_names_to_import_names(modules):
42+
"""Converts pip module package name to import names."""
3443
imports = []
3544
for module in modules:
3645
imports.extend(repodata['packages'][module]['imports']) # 1 or more unique imports per module

dcp/resources/__init__.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616
file_dirn = os.path.dirname(__file__)
1717
file_path = os.path.join(file_dirn, 'pyodide-lock.json')
1818

19-
print(file_path)
20-
2119
with open(file_path, 'r') as file:
2220
pyodide_lock_repodata_json = json.load(file)
2321

0 commit comments

Comments
 (0)