Resolve importlib-related failures in upstream CI (#9604)

charlesbluca · web-flow · commit f0165c31fcb7 · 2022-10-28T09:52:22.000-05:00
diff --git a/dask/compatibility.py b/dask/compatibility.py
@@ -1,6 +1,8 @@
-import importlib.metadata
 import sys
 
+# FIXME importing importlib.metadata fails when running the entire test suite with UPSTREAM_DEV=1
+from importlib import metadata as importlib_metadata
+
 from packaging.version import parse as parse_version
 
 _PY_VERSION = parse_version(".".join(map(str, sys.version_info[:3])))
@@ -16,9 +18,9 @@ def entry_points(group=None):
     This compatibility utility can be removed once Python 3.10 is the minimum.
     """
     if _PY_VERSION >= parse_version("3.10"):
-        return importlib.metadata.entry_points(group=group)
+        return importlib_metadata.entry_points(group=group)
     else:
-        eps = importlib.metadata.entry_points()
+        eps = importlib_metadata.entry_points()
         if group:
             return eps.get(group, [])
         return eps
diff --git a/dask/tests/test_cli.py b/dask/tests/test_cli.py
@@ -2,11 +2,13 @@
 
 click = pytest.importorskip("click")
 
-import importlib.metadata
 import json
 import platform
 import sys
 
+# FIXME importing importlib.metadata fails when running the entire test suite with UPSTREAM_DEV=1
+from importlib import metadata as importlib_metadata
+
 from click.testing import CliRunner
 
 import dask
@@ -64,13 +66,13 @@ def good_command_2():
 def test_register_command_ep():
     from dask.cli import _register_command_ep
 
-    bad_ep = importlib.metadata.EntryPoint(
+    bad_ep = importlib_metadata.EntryPoint(
         name="bad",
         value="dask.tests.test_cli:bad_command",
         group="dask_cli",
     )
 
-    good_ep = importlib.metadata.EntryPoint(
+    good_ep = importlib_metadata.EntryPoint(
         name="good",
         value="dask.tests.test_cli:good_command",
         group="dask_cli",
@@ -92,13 +94,13 @@ def dummy_cli_2():
 def test_repeated_name_registration_warn():
     from dask.cli import _register_command_ep
 
-    one = importlib.metadata.EntryPoint(
+    one = importlib_metadata.EntryPoint(
         name="one",
         value="dask.tests.test_cli:good_command",
         group="dask_cli",
     )
 
-    two = importlib.metadata.EntryPoint(
+    two = importlib_metadata.EntryPoint(
         name="two",
         value="dask.tests.test_cli:good_command_2",
         group="dask_cli",
