A reactive notebook for Python — run reproducible experiments, query with SQL, execute as a script, deploy as an app, and version with git. Stored as pure Python. All in a modern, AI-native editor.
Python artificial-intelligencedagdata-sciencedata-visualizationdataflowdeveloper-toolsmachine-learningnotebookspipelinepythonreactivesqlweb-app
fix: better parsing for pep dependencies in pyodide (#7670)
Myles Scolnickb3fd85341e26
diff --git a/marimo/_pyodide/pyodide_session.py b/marimo/_pyodide/pyodide_session.pyindex b4b5171b26..a2802ed071 100644--- a/marimo/_pyodide/pyodide_session.py+++ b/marimo/_pyodide/pyodide_session.py@@ -178,11 +178,40 @@ class PyodideSession:script_deps = reader.dependenciesdef strip_version(dep: str) -> str:- try:- return re.split(r"==|>=|<=|~=", dep)[0]- except Exception:+ """+ Strip version specifiers from a dependency string.+ Handles PEP 440 version specifiers, extras, and URLs.+ """+ if not dep or not isinstance(dep, str):+ return dep if isinstance(dep, str) else ""++ # Strip whitespace+ dep = dep.strip()+ if not dep:return dep+ # Handle URL dependencies (package @ <url>) - leave as-is+ # PEP 508 allows various URL schemes: http, https, git+https, git+ssh, file, ftp, etc.+ if "@" in dep:+ _, rhs = dep.split("@", 1)+ rhs = rhs.strip()+ # Check for URL scheme pattern (e.g., https://, git+https://, file://)+ if re.match(r"^[a-zA-Z][a-zA-Z0-9+.\-]*://", rhs):+ return dep++ # Handle environment markers (package>=1.0; python_version>='3.8')+ if ";" in dep:+ dep = dep.split(";")[0].strip()++ # Split on PEP 440 version specifiers: ==, !=, <=, >=, <, >, ~=, ===+ # Must check multi-char operators first to avoid partial matches+ parts = re.split(+ r"\s*(?:===|==|!=|<=|>=|~=|<|>)\s*", dep, maxsplit=1+ )++ # Return the package name (first part), preserving extras like 'package[extra]'+ return parts[0].strip() if parts else dep+if len(script_deps) > 0:return [strip_version(dep) for dep in script_deps]except Exception as e:@@ -192,10 +221,13 @@ class PyodideSession:import pyodide.code # type: ignore# Get imports from code- module_names: list[str] = pyodide.code.find_imports(code) # type: ignore- if not isinstance(module_names, list):+ imports = pyodide.code.find_imports(code) # type: ignore+ if not isinstance(imports, list):return []+ # Pyodide find_imports is aggressive and grabs nested imports+ # so we filter them out+ module_names: set[str] = {mod.split(".")[0] for mod in imports}# Convert module names to package namespackage_manager = MicropipPackageManager()return [diff --git a/tests/_pyodide/test_pyodide_session.py b/tests/_pyodide/test_pyodide_session.pyindex d280738625..dfc0585304 100644--- a/tests/_pyodide/test_pyodide_session.py+++ b/tests/_pyodide/test_pyodide_session.py@@ -93,7 +93,7 @@ def mock_pyodide() -> Generator[MagicMock, None, None]:mock = MagicMock(spec=ModuleType)mock.code = MagicMock(spec=ModuleType)mock.code.find_imports = MagicMock(- return_value=["numpy", "pandas", "sklearn"]+ return_value=["numpy", "pandas", "sklearn", "matplotlib.pyplot"])# Save original module if it exists@@ -198,13 +198,16 @@ async def test_pyodide_session_find_packages("""import numpy as npimport pandas as pd+ import matplotlib.pyplot as pltfrom sklearn.linear_model import LinearRegression""")packages = pyodide_session.find_packages(code)# sklearn gets converted to scikit-learn- assert sorted(packages) == sorted(["numpy", "pandas", "scikit-learn"])+ assert sorted(packages) == sorted(+ ["numpy", "pandas", "scikit-learn", "matplotlib"]+ )mock_pyodide.code.find_imports.assert_called_once_with(code)@@ -233,6 +236,106 @@ async def test_pyodide_session_find_packages_with_script_metadata(mock_pyodide.code.find_imports.assert_not_called()+async def test_complex_find_packages(pyodide_session: PyodideSession) -> None:+ code = dedent(+ """+ # /// script+ # requires-python = ">=3.12"+ # dependencies = [+ # "plotly[express]==6.5.0",+ # "polars==1.36.1",+ # ]+ # ///++ import marimo++ app = marimo.App()+++ @app.cell+ def _():+ import marimo as mo+ return (mo,)+ """+ )+ packages = pyodide_session.find_packages(code)+ assert sorted(packages) == sorted(["plotly[express]", "polars"])+++async def test_strip_version_resilience(+ pyodide_session: PyodideSession,+) -> None:+ """Test strip_version function handles various PEP 440 version specifiers and edge cases."""+ code_templates = [+ # Basic version specifiers+ ('dependencies = ["package==1.0.0"]', ["package"]),+ ('dependencies = ["package>=1.0.0"]', ["package"]),+ ('dependencies = ["package<=2.0.0"]', ["package"]),+ ('dependencies = ["package~=1.4"]', ["package"]),+ ('dependencies = ["package!=1.5.0"]', ["package"]),+ ('dependencies = ["package>1.0"]', ["package"]),+ ('dependencies = ["package<2.0"]', ["package"]),+ ('dependencies = ["package===1.0.0"]', ["package"]),+ # With extras+ ('dependencies = ["package[extra]==1.0.0"]', ["package[extra]"]),+ (+ 'dependencies = ["package[extra1,extra2]>=1.0.0"]',+ ["package[extra1,extra2]"],+ ),+ # With whitespace+ ('dependencies = ["package >= 1.0.0"]', ["package"]),+ ('dependencies = [" package==1.0.0 "]', ["package"]),+ # With environment markers+ (+ 'dependencies = ["package>=1.0.0; python_version>=\\"3.8\\""]',+ ["package"],+ ),+ (+ 'dependencies = ["package[extra]>=1.0; sys_platform==\\"linux\\""]',+ ["package[extra]"],+ ),+ # URL dependencies - left as-is+ (+ 'dependencies = ["package @ https://github.com/user/repo.git"]',+ ["package @ https://github.com/user/repo.git"],+ ),+ (+ 'dependencies = ["package @ git+https://github.com/user/repo.git"]',+ ["package @ git+https://github.com/user/repo.git"],+ ),+ (+ 'dependencies = ["package @ git+ssh://[email protected]/user/repo.git"]',+ ["package @ git+ssh://[email protected]/user/repo.git"],+ ),+ (+ 'dependencies = ["package @ file:///path/to/local/package"]',+ ["package @ file:///path/to/local/package"],+ ),+ # Multiple packages with various specifiers+ (+ 'dependencies = ["foo==1.0", "bar>=2.0", "baz~=3.0", "qux[extra]>=4.0"]',+ ["foo", "bar", "baz", "qux[extra]"],+ ),+ # No version specifier+ ('dependencies = ["package"]', ["package"]),+ ]++ for deps_str, expected in code_templates:+ code = dedent(+ f"""+ # /// script+ # {deps_str}+ # ///++ import marimo+ """+ )+ packages = pyodide_session.find_packages(code)+ assert sorted(packages) == sorted(expected), (+ f"Failed for {deps_str}: expected {expected}, got {packages}"+ )++async def test_pyodide_session_put_input(pyodide_session: PyodideSession,) -> None: