From 7152cea01d9aefd08f80c5cb791d3978e80d9486 Mon Sep 17 00:00:00 2001 From: Nicholas Bollweg Date: Mon, 2 May 2022 14:33:40 -0500 Subject: [PATCH] also lowercase when normalizing micropip package names (#2445) --- packages/micropip/src/micropip/package.py | 2 +- packages/micropip/test_micropip.py | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/packages/micropip/src/micropip/package.py b/packages/micropip/src/micropip/package.py index e8a424932..72573df10 100644 --- a/packages/micropip/src/micropip/package.py +++ b/packages/micropip/src/micropip/package.py @@ -33,7 +33,7 @@ def _format_table(headers: list[str], table: list[Iterable]) -> str: def normalize_package_name(pkgname: str): - return re.sub(r"[^\w\d.]+", "_", pkgname, re.UNICODE) + return re.sub(r"[^\w\d.]+", "_", pkgname, re.UNICODE).lower() @dataclass diff --git a/packages/micropip/test_micropip.py b/packages/micropip/test_micropip.py index cec93189e..5d4d70381 100644 --- a/packages/micropip/test_micropip.py +++ b/packages/micropip/test_micropip.py @@ -405,10 +405,9 @@ def test_list_wheel_name_mismatch(monkeypatch): pytest.importorskip("packaging") from micropip import _micropip - dummy_pkg_name = "dummy-dummy" - dummy_url = ( - f"https://dummy.com/{dummy_pkg_name.replace('-', '_')}-1.0.0-py3-none-any.whl" - ) + dummy_pkg_name = "dummy-Dummy" + normalized_pkg_name = dummy_pkg_name.replace("-", "_").lower() + dummy_url = f"https://dummy.com/{normalized_pkg_name}-1.0.0-py3-none-any.whl" _mock_fetch_bytes = mock_fetch_bytes(dummy_pkg_name, f"Name: {dummy_pkg_name}") monkeypatch.setattr(_micropip, "fetch_bytes", _mock_fetch_bytes)