From 76a9abc949d019daece5ebe0bd3a49d58ce033e4 Mon Sep 17 00:00:00 2001 From: James Bourbeau Date: Mon, 14 Nov 2022 15:07:42 -0600 Subject: [PATCH 1/2] Revert importlib.metadata workaround --- dask/compatibility.py | 8 +++----- dask/tests/test_cli.py | 12 +++++------- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/dask/compatibility.py b/dask/compatibility.py index 3d970649a24..e1013277f17 100644 --- a/dask/compatibility.py +++ b/dask/compatibility.py @@ -1,8 +1,6 @@ +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]))) @@ -18,9 +16,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 index 46c611bf911..2adab2b77da 100644 --- a/dask/tests/test_cli.py +++ b/dask/tests/test_cli.py @@ -1,10 +1,8 @@ +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 - import click import pytest from click.testing import CliRunner @@ -64,13 +62,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 +90,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", From ada61bc9d5a471f463082456f78685002f77078f Mon Sep 17 00:00:00 2001 From: James Bourbeau Date: Mon, 14 Nov 2022 15:07:52 -0600 Subject: [PATCH 2/2] test-upstream