Remove old deprecations

johnslavik · johnslavik · commit 02cf71f19c3c · 2025-11-29T16:39:58.000+01:00
Breaking change
diff --git a/docs/guide/contributors/workflow.md b/docs/guide/contributors/workflow.md
@@ -57,10 +57,6 @@ Deprecated code should also be marked as legacy code. We use [Yore](https://pawa
 Examples:
 
 ```python title="Remove function when we bump to 2.0"
-# YORE: Bump 2: Remove block.
-def deprecated_function():
-    ...
-```
 
 ```python title="Simplify imports when Python 3.15 is EOL"
 # YORE: EOL 3.15: Replace block with line 4.
diff --git a/docs/reference/api/agents.md b/docs/reference/api/agents.md
@@ -70,8 +70,4 @@ Griffe is able to analyze code both statically and dynamically.
 
 ::: griffe.safe_get_value
 
-<!-- YORE: Bump 2: Remove line. -->
-## **Deprecated API**
 
-<!-- YORE: Bump 2: Remove line. -->
-::: griffe.ExportedName
diff --git a/docs/reference/api/git.md b/docs/reference/api/git.md
diff --git a/duties.py b/duties.py
@@ -291,8 +291,6 @@ def check_api(ctx: Context, *cli_args: str) -> None:
             color=True,
             extensions=[
                 "griffe_inherited_docstrings",
-                # YORE: Bump 2: Remove line.
-                "scripts/griffe_exts.py",
                 "unpack_typeddict",
             ],
         ).add_args(*cli_args),
diff --git a/mkdocs.yml b/mkdocs.yml
@@ -110,8 +110,6 @@ nav:
       - Parsers: reference/api/docstrings/parsers.md
     - Exceptions: reference/api/exceptions.md
     - Expressions: reference/api/expressions.md
-    # YORE: Bump 2: Remove line.
-    - Git utilities: reference/api/git.md
     - Loggers: reference/api/loggers.md
     - Helpers: reference/api/helpers.md
 - Changelog: changelog.md
@@ -231,8 +229,6 @@ plugins:
           docstring_section_style: list
           extensions:
           - griffe_inherited_docstrings
-          # YORE: Bump 2: Remove line.
-          - scripts/griffe_exts.py
           - unpack_typeddict
           heading_level: 2
           inherited_members: true
diff --git a/scripts/griffe_exts.py b/scripts/griffe_exts.py
diff --git a/src/griffe/__init__.py b/src/griffe/__init__.py
@@ -182,8 +182,7 @@
 )
 from griffe._internal.agents.nodes.docstrings import get_docstring
 
-# YORE: Bump 2: Replace `ExportedName, ` with `` within line.
-from griffe._internal.agents.nodes.exports import ExportedName, get__all__, safe_get__all__
+from griffe._internal.agents.nodes.exports import get__all__, safe_get__all__
 from griffe._internal.agents.nodes.imports import relative_to_absolute
 from griffe._internal.agents.nodes.parameters import ParametersType, get_parameters
 from griffe._internal.agents.nodes.runtime import ObjectNode
@@ -383,28 +382,8 @@
     vtree,
 )
 
-# YORE: Bump 2: Remove block.
-_deprecated_names = (
-    "assert_git_repo",
-    "get_latest_tag",
-    "get_repo_root",
-    "tmp_worktree",
-)
-
-
-# YORE: Bump 2: Remove block.
-def __getattr__(name: str) -> Any:
-    if name in _deprecated_names:
-        from griffe._internal import git  # noqa: PLC0415
 
-        warnings.warn(
-            f"The `{name}` function is deprecated and will become unavailable in the next major version.",
-            DeprecationWarning,
-            stacklevel=2,
-        )
-        return getattr(git, f"_{name}")
 
-    raise AttributeError(f"module '{__name__}' has no attribute '{name}'")
 
 
 # Regenerate this list with the following Python snippet:
@@ -468,8 +447,6 @@ def __getattr__(name: str) -> Any:
     "DocstringWarn",
     "DocstringYield",
     "ExplanationStyle",
-    # YORE: Bump 2: Remove line.
-    "ExportedName",
     "Expr",
     "ExprAttribute",
     "ExprBinOp",
diff --git a/src/griffe/_internal/agents/nodes/exports.py b/src/griffe/_internal/agents/nodes/exports.py
@@ -16,18 +16,6 @@
     from griffe._internal.models import Module
 
 
-# YORE: Bump 2: Remove block.
-@dataclass
-class ExportedName:
-    """Deprecated. An intermediate class to store names.
-
-    The [`get__all__`][griffe.get__all__] function now returns instances of [`ExprName`][griffe.ExprName] instead.
-    """
-
-    name: str
-    """The exported name."""
-    parent: Module
-    """The parent module."""
 
 
 def _extract_attribute(node: ast.Attribute, parent: Module) -> list[str | ExprName]:
diff --git a/src/griffe/_internal/docstrings/auto.py b/src/griffe/_internal/docstrings/auto.py
@@ -121,8 +121,6 @@ def infer_docstring_style(
     style_order: list[Parser] | list[DocstringStyle] | None = None,
     default: Parser | DocstringStyle | None = None,
     per_style_options: PerStyleOptions | None = None,
-    # YORE: Bump 2: Remove line.
-    **options: Any,
 ) -> tuple[Parser | None, list[DocstringSection] | None]:
     """Infer the parser to use for the docstring.
 
@@ -149,14 +147,7 @@ def infer_docstring_style(
     """
     from griffe._internal.docstrings.parsers import parsers  # noqa: PLC0415
 
-    # YORE: Bump 2: Replace block with `per_style_options = per_style_options or {}`.
-    if options:
-        if per_style_options:
-            raise ValueError("Cannot use both `options` and `per_style_options`.")
-        warn("`**options` is deprecated. Use `per_style_options` instead.", DeprecationWarning, stacklevel=2)
-        per_style_options = {"google": options, "numpy": options, "sphinx": options}  # type: ignore[assignment]
-    elif not per_style_options:
-        per_style_options = {}
+    per_style_options = per_style_options or {}
 
     style_order = [Parser(style) if isinstance(style, str) else style for style in style_order or _default_style_order]
 
@@ -203,8 +194,6 @@ def parse_auto(
     style_order: list[Parser] | list[DocstringStyle] | None = None,
     default: Parser | DocstringStyle | None = None,
     per_style_options: PerStyleOptions | None = None,
-    # YORE: Bump 2: Remove line.
-    **options: Any,
 ) -> list[DocstringSection]:
     """Parse a docstring by automatically detecting the style it uses.
 
@@ -224,14 +213,7 @@ def parse_auto(
     """
     from griffe._internal.docstrings.parsers import parse  # noqa: PLC0415
 
-    # YORE: Bump 2: Replace block with `per_style_options = per_style_options or {}`.
-    if options:
-        if per_style_options:
-            raise ValueError("Cannot use both `options` and `per_style_options`.")
-        warn("`**options` are deprecated. Use `per_style_options` instead.", DeprecationWarning, stacklevel=2)
-        per_style_options = {"google": options, "numpy": options, "sphinx": options}  # type: ignore[assignment]
-    elif not per_style_options:
-        per_style_options = {}
+    per_style_options = per_style_options or {}
 
     style, sections = infer_docstring_style(
         docstring,
diff --git a/src/griffe/_internal/docstrings/google.py b/src/griffe/_internal/docstrings/google.py
@@ -892,8 +892,6 @@ def parse_google(
     warn_unknown_params: bool = True,
     warn_missing_types: bool = True,
     warnings: bool = True,
-    # YORE: Bump 2: Remove line.
-    **options: Any,
 ) -> list[DocstringSection]:
     """Parse a Google-style docstring.
 
@@ -932,9 +930,6 @@ def parse_google(
     in_code_block = False
     lines = docstring.lines
 
-    # YORE: Bump 2: Remove block.
-    if options:
-        warn("Passing additional options is deprecated, these options are ignored.", DeprecationWarning, stacklevel=2)
 
     options = {
         "ignore_init_summary": ignore_init_summary,
diff --git a/src/griffe/_internal/docstrings/numpy.py b/src/griffe/_internal/docstrings/numpy.py
@@ -916,8 +916,6 @@ def parse_numpy(
     warn_unknown_params: bool = True,
     warn_missing_types: bool = True,
     warnings: bool = True,
-    # YORE: Bump 2: Remove line.
-    **options: Any,
 ) -> list[DocstringSection]:
     """Parse a Numpydoc-style docstring.
 
@@ -943,9 +941,6 @@ def parse_numpy(
     in_code_block = False
     lines = docstring.lines
 
-    # YORE: Bump 2: Remove block.
-    if options:
-        warn("Passing additional options is deprecated, these options are ignored.", DeprecationWarning, stacklevel=2)
 
     options = {
         "trim_doctest_flags": trim_doctest_flags,
diff --git a/src/griffe/_internal/docstrings/sphinx.py b/src/griffe/_internal/docstrings/sphinx.py
@@ -98,8 +98,6 @@ def parse_sphinx(
     *,
     warn_unknown_params: bool = True,
     warnings: bool = True,
-    # YORE: Bump 2: Remove line.
-    **options: Any,
 ) -> list[DocstringSection]:
     """Parse a Sphinx-style docstring.
 
@@ -114,9 +112,6 @@ def parse_sphinx(
     """
     parsed_values = _ParsedValues()
 
-    # YORE: Bump 2: Remove block.
-    if options:
-        warn("Passing additional options is deprecated, these options are ignored.", DeprecationWarning, stacklevel=2)
 
     options = {
         "warn_unknown_params": warn_unknown_params,
diff --git a/src/griffe/_internal/encoders.py b/src/griffe/_internal/encoders.py
@@ -202,11 +202,7 @@ def _load_module(obj_dict: dict[str, Any]) -> Module:
         runtime=obj_dict.get("runtime", True),
         analysis=obj_dict.get("analysis"),
     )
-    # YORE: Bump 2: Replace line with `members = obj_dict.get("members", {}).values()`.
-    members = obj_dict.get("members", [])
-    # YORE: Bump 2: Remove block.
-    if isinstance(members, dict):
-        members = members.values()
+    members = obj_dict.get("members", {}).values()
 
     for module_member in members:
         module.set_member(module_member.name, module_member)
@@ -234,11 +230,7 @@ def _load_class(obj_dict: dict[str, Any]) -> Class:
         runtime=obj_dict.get("runtime", True),
         analysis=obj_dict.get("analysis"),
     )
-    # YORE: Bump 2: Replace line with `members = obj_dict.get("members", {}).values()`.
-    members = obj_dict.get("members", [])
-    # YORE: Bump 2: Remove block.
-    if isinstance(members, dict):
-        members = members.values()
+    members = obj_dict.get("members", {}).values()
 
     for class_member in members:
         class_.set_member(class_member.name, class_member)
diff --git a/src/griffe/_internal/extensions/base.py b/src/griffe/_internal/extensions/base.py
@@ -28,37 +28,6 @@
     from griffe._internal.models import Alias, Attribute, Class, Function, Module, Object, TypeAlias
 
 
-# YORE: Bump 2: Remove block.
-class _ExtensionMetaclass(type):
-    """Metaclass for Griffe extensions."""
-
-    def __new__(cls, name: str, bases: tuple[type, ...], attrs: dict[str, Any]) -> _ExtensionMetaclass:
-        if "on_package_loaded" in attrs:
-            warnings.warn(
-                "The `on_package_loaded` event is deprecated and renamed to `on_package`.",
-                DeprecationWarning,
-                stacklevel=2,
-            )
-        if "on_alias" in attrs:
-            parameters = inspect.signature(attrs["on_alias"]).parameters
-            if "node" in parameters or "agent" in parameters:
-                attrs["__old_on_alias"] = True
-                warnings.warn(
-                    "The `on_alias` event is now a load event and receives the `alias` and `loader` parameters. "
-                    "It doesn't receive the `node` or `agent` parameters anymore. "
-                    "Please use the new `on_alias` signature, or rename your hook to `on_alias_instance`.",
-                    DeprecationWarning,
-                    stacklevel=1,
-                )
-        if "on_wildcard_expansion" in attrs:
-            warnings.warn(
-                "The `on_wildcard_expansion` event is deprecated. "
-                "Instead, hook onto the `on_alias` event "
-                "and check for aliases' `wildcard_imported` boolean attribute.",
-                DeprecationWarning,
-                stacklevel=2,
-            )
-        return super().__new__(cls, name, bases, attrs)
 
 
 class Extension(metaclass=_ExtensionMetaclass):
@@ -469,9 +438,6 @@ def on_package(self, *, pkg: Module, loader: GriffeLoader, **kwargs: Any) -> Non
             loader: The loader currently in use.
             **kwargs: For forward-compatibility.
         """
-        # YORE: Bump 2: Remove block.
-        if hasattr(self, "on_package_loaded"):
-            self.on_package_loaded(pkg=pkg, loader=loader, **kwargs)
 
 
 LoadableExtensionType = Union[str, dict[str, Any], Extension, type[Extension]]
@@ -510,12 +476,7 @@ def call(self, event: str, **kwargs: Any) -> None:
             **kwargs: Arguments passed to the hook.
         """
         for extension in self._extensions:
-            # YORE: Bump 2: Replace block with line 5.
-            if event == "on_alias" and getattr(extension, "__old_on_alias", False):
-                with suppress(TypeError):
-                    getattr(extension, event)(**kwargs)
-            else:
-                getattr(extension, event, self._noop)(**kwargs)
+            getattr(extension, event, self._noop)(**kwargs)
 
 
 builtin_extensions: set[str] = {
diff --git a/src/griffe/_internal/loader.py b/src/griffe/_internal/loader.py
@@ -446,8 +446,6 @@ def expand_wildcards(
 
                 # Everything went right (supposedly), we add the alias as a member of the current object.
                 obj.set_member(new_member.name, alias)
-                # YORE: Bump 2: Remove line.
-                self.extensions.call("on_wildcard_expansion", alias=alias, loader=self)
 
     def resolve_module_aliases(
         self,
diff --git a/tests/test_api.py b/tests/test_api.py
@@ -21,8 +21,6 @@ def _fixture_loader() -> griffe.GriffeLoader:
     loader = griffe.GriffeLoader(
         extensions=griffe.load_extensions(
             "griffe_inherited_docstrings",
-            # YORE: Bump 2: Remove line.
-            "scripts/griffe_exts.py",
             "unpack_typeddict",
         ),
     )
diff --git a/tests/test_extensions/test_base.py b/tests/test_extensions/test_base.py
