Ensure compatibility with click v8.2. (#676)

Author: tobiasraabe

.pre-commit-config.yaml

@@ -1,3 +1,6 @@
+ci:
+    skip: [type-checking]
+
 repos:
 -   repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v5.0.0
@@ -64,3 +67,10 @@ repos:
     -   id: check-hooks-apply
     -   id: check-useless-excludes
     # -   id: identity  # Prints all files passed to pre-commits. Debugging.
+-   repo: local
+    hooks:
+    -   id: type-checking
+        name: type-checking
+        entry: uv run --group typing mypy
+        language: system
+        pass_filenames: false

docs/source/changes.md

@@ -5,6 +5,12 @@ chronological order. Releases follow [semantic versioning](https://semver.org/)
 releases are available on [PyPI](https://pypi.org/project/pytask) and
 [Anaconda.org](https://anaconda.org/conda-forge/pytask).
 
+## 0.5.4 - 2025-xx-xx
+
+- {pull}`676` ensures compatibility with click >8.2.0.
+- {pull}`680` uses uv everywhere.
+- {pull}`684` adds tests for lowest and highest dependency resolutions.
+
 ## 0.5.3 - 2025-05-16
 
 - {pull}`650` allows to identify from which data catalog a node is coming from. Thanks

docs/source/how_to_guides/functional_interface.ipynb

@@ -22,7 +22,7 @@ classifiers = [
 dynamic = ["version"]
 dependencies = [
     "attrs>=21.3.0",
-    "click>=8.1.8,<8.2.0",
+    "click>=8.1.8,!=8.2.0",
     "click-default-group>=1.2.4",
     "networkx>=2.4.0",
     "optree>=0.9.0",
@@ -51,6 +51,7 @@ dev = ["pygraphviz>=1.11;platform_system=='Linux'"]
 docs = [
     "furo>=2024.8.6",
     "ipython>=8.13.2",
+    "ipywidgets>=8.1.6",
     "matplotlib>=3.5.0",
     "myst-parser>=3.0.0",
     "myst-nb>=1.2.0",

pyproject.toml

@@ -2,10 +2,10 @@
 
 from __future__ import annotations
 
+import importlib.metadata
 from typing import Any
 
 import click
-from packaging.version import parse as parse_version
 
 from _pytask.click import ColoredGroup
 from _pytask.pluginmanager import storage
@@ -16,7 +16,7 @@
 }
 
 
-if parse_version(click.__version__) >= parse_version("8"):  # pragma: no cover
+if importlib.metadata.version("click") >= "8":  # pragma: no cover
     _VERSION_OPTION_KWARGS = {"package_name": "pytask"}
 else:  # pragma: no cover
     _VERSION_OPTION_KWARGS = {}

src/_pytask/cli.py

@@ -2,22 +2,24 @@
 
 from __future__ import annotations
 
+import importlib.metadata
 import inspect
 from enum import Enum
 from gettext import gettext as _
 from gettext import ngettext
 from typing import TYPE_CHECKING
 from typing import Any
 from typing import ClassVar
+from typing import TypeVar
 
 import click
 from click import Choice
 from click import Command
 from click import Context
 from click import Parameter
-from click.parser import split_opt
 from click_default_group import DefaultGroup
 from rich.highlighter import RegexHighlighter
+from rich.padding import Padding
 from rich.panel import Panel
 from rich.table import Table
 from rich.text import Text
@@ -27,40 +29,59 @@
 from _pytask.console import create_panel_title
 
 if TYPE_CHECKING:
+    from collections.abc import Iterable
     from collections.abc import Sequence
 
 
 __all__ = ["ColoredCommand", "ColoredGroup", "EnumChoice"]
 
 
-class EnumChoice(Choice):
-    """An enum-based choice type.
+if importlib.metadata.version("click") < "8.2":
+    from click.parser import split_opt
 
-    The implementation is copied from https://github.com/pallets/click/pull/2210 and
-    related discussion can be found in https://github.com/pallets/click/issues/605.
+    class EnumChoice(Choice):
+        """An enum-based choice type.
 
-    In contrast to using :class:`click.Choice`, using this type ensures that the error
-    message does not show the enum members.
+        The implementation is copied from https://github.com/pallets/click/pull/2210 and
+        related discussion can be found in https://github.com/pallets/click/issues/605.
 
-    In contrast to the proposed implementation in the PR, this implementation does not
-    use the members than rather the values of the enum.
+        In contrast to using :class:`click.Choice`, using this type ensures that the
+        error message does not show the enum members.
 
-    """
+        In contrast to the proposed implementation in the PR, this implementation does
+        not use the members than rather the values of the enum.
 
-    def __init__(self, enum_type: type[Enum], case_sensitive: bool = True) -> None:
-        super().__init__(
-            choices=[element.value for element in enum_type],
-            case_sensitive=case_sensitive,
-        )
-        self.enum_type = enum_type
+        """
+
+        def __init__(self, enum_type: type[Enum], case_sensitive: bool = True) -> None:
+            super().__init__(
+                choices=[element.value for element in enum_type],
+                case_sensitive=case_sensitive,
+            )
+            self.enum_type = enum_type
+
+        def convert(
+            self, value: Any, param: Parameter | None, ctx: Context | None
+        ) -> Any:
+            if isinstance(value, Enum):
+                value = value.value
+            value = super().convert(value=value, param=param, ctx=ctx)
+            if value is None:
+                return None
+            return self.enum_type(value)
+
+else:
+    from click.parser import (  # type: ignore[attr-defined, no-redef]
+        _split_opt as split_opt,
+    )
+
+    ParamTypeValue = TypeVar("ParamTypeValue")
 
-    def convert(self, value: Any, param: Parameter | None, ctx: Context | None) -> Any:
-        if isinstance(value, Enum):
-            value = value.value
-        value = super().convert(value=value, param=param, ctx=ctx)
-        if value is None:
-            return None
-        return self.enum_type(value)
+    class EnumChoice(Choice):  # type: ignore[no-redef]
+        def __init__(
+            self, choices: Iterable[ParamTypeValue], case_sensitive: bool = False
+        ) -> None:
+            super().__init__(choices=choices, case_sensitive=case_sensitive)  # type: ignore[arg-type]
 
 
 class _OptionHighlighter(RegexHighlighter):
@@ -119,7 +140,10 @@ def format_help(
         _print_options(self, ctx)
 
         console.print(
-            "[bold #FF0000]♥[/] [#f2f2f2]https://pytask-dev.readthedocs.io[/]",
+            Padding(
+                "[bold #FF0000]♥[/] [#f2f2f2]https://pytask-dev.readthedocs.io[/]",
+                (0, 3, 0, 0),
+            ),
             justify="right",
         )
 
@@ -197,7 +221,10 @@ def format_help(
         _print_options(self, ctx)
 
         console.print(
-            "[bold #FF0000]♥[/] [#f2f2f2]https://pytask-dev.readthedocs.io[/]",
+            Padding(
+                "[bold #FF0000]♥[/] [#f2f2f2]https://pytask-dev.readthedocs.io[/]",
+                (0, 3, 0, 0),
+            ),
             justify="right",
         )