Add tests

Author: ryanking13

micropip/_commands/install.py

@@ -124,11 +124,11 @@ async def install(
         )
 
     # uninstall packages that are installed
-    uninstall_packages = set([pkg.name for pkg in transaction.wheels]) | set(
+    packages_all = set([pkg.name for pkg in transaction.wheels]) | set(
         [pkg.name for pkg in transaction.pyodide_packages]
     )
 
-    uninstall(uninstall_packages, _ignore_missing=True)
+    uninstall(packages_all, ignore_missing=True)
 
     wheel_promises = []
     # Install built-in packages

micropip/_commands/uninstall.py

@@ -8,7 +8,7 @@
 from .._utils import get_files_in_distribution, get_root
 
 
-def uninstall(packages: str | Iterable[str], *, _ignore_missing: bool = False) -> None:
+def uninstall(packages: str | Iterable[str], *, ignore_missing: bool = False) -> None:
     """Uninstall the given packages.
 
     This function only supports uninstalling packages that are installed
@@ -37,7 +37,7 @@ def uninstall(packages: str | Iterable[str], *, _ignore_missing: bool = False) -
             dist = importlib.metadata.distribution(package)
             distributions.append(dist)
         except importlib.metadata.PackageNotFoundError:
-            if not _ignore_missing:  # TODO: Can we utilize log level here?
+            if not ignore_missing:  # TODO: Can we utilize log level here?
                 warnings.warn(
                     f"WARNING: Skipping '{package}' as it is not installed.",
                     stacklevel=1,

micropip/transaction.py

@@ -358,7 +358,7 @@ def eval_marker(e: dict[str, str]) -> bool:
             else:
                 return
 
-        if self.check_version_satisfied(req):
+        if not self.force_reinstall and self.check_version_satisfied(req):
             # Maybe while we were downloading pypi_json some other branch
             # installed the wheel?
             return

tests/conftest.py

@@ -108,10 +108,20 @@ def _mock_importlib_version(name: str) -> str:
     def _mock_importlib_distributions():
         return (Distribution.at(p) for p in wheel_base.glob("*.dist-info"))  # type: ignore[union-attr]
 
+    def _mock_importlib_distribution(name: str) -> Distribution:
+        for dist in _mock_importlib_distributions():
+            if dist.name == name:
+                return dist
+
+        raise PackageNotFoundError(name)
+
     monkeypatch.setattr(importlib.metadata, "version", _mock_importlib_version)
     monkeypatch.setattr(
         importlib.metadata, "distributions", _mock_importlib_distributions
     )
+    monkeypatch.setattr(
+        importlib.metadata, "distribution", _mock_importlib_distribution
+    )
 
 
 class Wildcard:

tests/test_install.py

@@ -360,3 +360,62 @@ async def run_test(selenium, url, wheel_name):
             ]
 
         run_test(selenium_standalone_micropip, url, SNOWBALL_WHEEL)
+
+
+@pytest.mark.asyncio
+async def test_reinstall_different_version(
+    mock_fetch: mock_fetch_cls,
+    mock_importlib,
+) -> None:
+    import importlib.metadata
+
+    dummy = "dummy"
+    version_old = "1.0.0"
+    version_new = "2.0.0"
+
+    mock_fetch.add_pkg_version(dummy, version_old)
+    mock_fetch.add_pkg_version(dummy, version_new)
+
+    await micropip.install(f"{dummy}=={version_old}")
+    assert micropip.list()[dummy].version == version_old
+    assert importlib.metadata.version(dummy) == version_old
+
+    await micropip.install(f"{dummy}=={version_new}")
+    assert micropip.list()[dummy].version == version_new
+    assert importlib.metadata.version(dummy) == version_new
+
+    await micropip.install(f"{dummy}=={version_old}")
+    assert micropip.list()[dummy].version == version_old
+    assert importlib.metadata.version(dummy) == version_old
+
+
+@pytest.mark.asyncio
+async def test_force_reinstall(
+    mock_fetch: mock_fetch_cls,
+    mock_importlib,
+) -> None:
+    import importlib.metadata
+
+    dummy = "dummy"
+    version_old = "1.0.0"
+
+    mock_fetch.add_pkg_version(dummy, version_old)
+
+    await micropip.install(f"{dummy}=={version_old}")
+    assert micropip.list()[dummy].version == version_old
+    assert importlib.metadata.version(dummy) == version_old
+
+    dist_path = importlib.metadata.distribution(dummy)._path  # type: ignore[attr-defined]
+    assert dist_path.exists()
+
+    # create a dummy file in the dist_info directory, then force reinstall
+    # the package. The dummy file should be removed.
+    dummy_file = dist_path / "dummy"
+    dummy_file.touch()
+    assert dummy_file.exists()
+
+    await micropip.install(f"{dummy}=={version_old}", force_reinstall=True)
+    assert micropip.list()[dummy].version == version_old
+    assert importlib.metadata.version(dummy) == version_old
+
+    assert not dummy_file.exists()

tests/test_transaction.py

@@ -63,6 +63,7 @@ def create_transaction(Transaction):
         ctx={},
         ctx_extras=[],
         fetch_kwargs={},
+        force_reinstall=False,
     )