Skip to content

Commit 71a87c1

Browse files
authored
Fix packaging error after #163 (#211)
* Fix bad merge * Don't load packaging when loading micropip
1 parent 9f63157 commit 71a87c1

File tree

2 files changed

+1
-3
lines changed

2 files changed

+1
-3
lines changed

micropip/package_manager.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,10 @@
88
List,
99
)
1010

11-
from packaging.markers import default_environment
12-
1311
from . import _mock_package, package_index
1412
from ._compat import CompatibilityLayer, compatibility_layer
1513
from ._utils import get_files_in_distribution, get_root
14+
from ._vendored.packaging.src.packaging.markers import default_environment
1615
from .constants import FAQ_URLS
1716
from .freeze import freeze_lockfile
1817
from .logging import setup_logging

tests/conftest.py

-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ def selenium_standalone_micropip(selenium_standalone, wheel_path):
9191
selenium_standalone.run_js(
9292
f"""
9393
await pyodide.loadPackage("{base_url + wheel_file.name}");
94-
await pyodide.loadPackage(["packaging"]);
9594
pyodide.runPython("import micropip");
9695
"""
9796
)

0 commit comments

Comments
 (0)