Fix packaging error after #163 (#211)

* Fix bad merge * Don't load packaging when loading micropip
pyodide · Feb 20, 2025 · 71a87c1 · 71a87c1
1 parent 9f63157
commit 71a87c1
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/micropip/package_manager.py b/micropip/package_manager.py
@@ -8,11 +8,10 @@
     List,
 )
 
-from packaging.markers import default_environment
-
 from . import _mock_package, package_index
 from ._compat import CompatibilityLayer, compatibility_layer
 from ._utils import get_files_in_distribution, get_root
+from ._vendored.packaging.src.packaging.markers import default_environment
 from .constants import FAQ_URLS
 from .freeze import freeze_lockfile
 from .logging import setup_logging

diff --git a/tests/conftest.py b/tests/conftest.py
@@ -91,7 +91,6 @@ def selenium_standalone_micropip(selenium_standalone, wheel_path):
         selenium_standalone.run_js(
             f"""
             await pyodide.loadPackage("{base_url + wheel_file.name}");
-            await pyodide.loadPackage(["packaging"]);
             pyodide.runPython("import micropip");
             """
         )