From 755339bf650169705388afd2a6c32cdb7e09b753 Mon Sep 17 00:00:00 2001 From: Ran Benita Date: Wed, 30 Sep 2026 15:54:49 +0300 Subject: [PATCH] Restore `pluggy._manager.DistFacade` - used by conda Let's keep this import until conda can update to the new `list_plugin_distributions` method. Fix #748 --- src/pluggy/_compat.py | 13 ++++++------- src/pluggy/_manager.py | 3 +-- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/pluggy/_compat.py b/src/pluggy/_compat.py index 3761cc3d..a5324b00 100644 --- a/src/pluggy/_compat.py +++ b/src/pluggy/_compat.py @@ -1,14 +1,13 @@ -""" -Compatibility layer for legacy setuptools/pkg_resources API. - -This module provides backward compatibility wrappers around modern -importlib.metadata, allowing gradual migration away from setuptools. -""" +"""Compatibility helpers.""" from __future__ import annotations -import importlib.metadata from typing import Any +from typing import TYPE_CHECKING + + +if TYPE_CHECKING: + import importlib.metadata class DistFacade: diff --git a/src/pluggy/_manager.py b/src/pluggy/_manager.py index 1d7984a9..33009344 100644 --- a/src/pluggy/_manager.py +++ b/src/pluggy/_manager.py @@ -15,6 +15,7 @@ from . import _tracing from ._callers import _multicall +from ._compat import DistFacade from ._hooks import _HookImplFunction from ._hooks import _Namespace from ._hooks import _Plugin @@ -31,8 +32,6 @@ if TYPE_CHECKING: import importlib.metadata - from ._compat import DistFacade - _BeforeTrace: TypeAlias = Callable[[str, Sequence[HookImpl], Mapping[str, Any]], None] _AfterTrace: TypeAlias = Callable[