Merge remote-tracking branch 'origin/main' into lockfile

Author: tobiasraabe

.github/workflows/publish-to-pypi.yml

@@ -22,7 +22,7 @@ jobs:
     - name: Build a binary wheel and a source tarball
       run: python3 -m build
     - name: Store the distribution packages
-      uses: actions/upload-artifact@v6
+      uses: actions/upload-artifact@v7
       with:
         name: python-package-distributions
         path: dist/
@@ -41,7 +41,7 @@ jobs:
 
     steps:
     - name: Download all the dists
-      uses: actions/download-artifact@v7
+      uses: actions/download-artifact@v8
       with:
         name: python-package-distributions
         path: dist/
@@ -62,7 +62,7 @@ jobs:
 
     steps:
     - name: Download all the dists
-      uses: actions/download-artifact@v7
+      uses: actions/download-artifact@v8
       with:
         name: python-package-distributions
         path: dist/

.pre-commit-config.yaml

@@ -25,12 +25,12 @@ repos:
     -   id: python-no-log-warn
     -   id: text-unicode-replacement-char
 -   repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.15.1
+    rev: v0.15.6
     hooks:
       - id: ruff-format
       - id: ruff-check
 -   repo: https://github.com/astral-sh/uv-pre-commit
-    rev: 0.10.3
+    rev: 0.10.10
     hooks:
       - id: uv-lock
 -   repo: https://github.com/executablebooks/mdformat
@@ -54,7 +54,7 @@ repos:
         ]
         files: (docs/.)
 -   repo: https://github.com/kynan/nbstripout
-    rev: 0.9.0
+    rev: 0.9.1
     hooks:
     -   id: nbstripout
         exclude: (docs)

src/_pytask/cache.py

@@ -13,27 +13,29 @@
 from typing import ParamSpec
 from typing import Protocol
 from typing import TypeVar
+from typing import cast
 
 from _pytask._hashlib import hash_value
 
+P = ParamSpec("P")
+R = TypeVar("R")
+
 if TYPE_CHECKING:
     from collections.abc import Callable
-    from typing import TypeAlias
 
     from ty_extensions import Intersection
 
-    Memoized: TypeAlias = "Intersection[Callable[P, R], HasCache]"
-
-P = ParamSpec("P")
-R = TypeVar("R")
-
 
 class HasCache(Protocol):
     """Protocol for objects that have a cache attribute."""
 
     cache: Cache
 
 
+if TYPE_CHECKING:
+    Memoized = Intersection[Callable[P, R], HasCache]
+
+
 @dataclass
 class CacheInfo:
     hits: int = 0
@@ -68,9 +70,10 @@ def wrapped(*args: P.args, **kwargs: P.kwargs) -> R:
 
             return value
 
-        wrapped.cache = self  # ty: ignore[unresolved-attribute]
+        wrapped_with_cache = cast("Memoized[P, R]", wrapped)
+        wrapped_with_cache.cache = self
 
-        return wrapped
+        return wrapped_with_cache
 
     def add(self, key: str, value: Any) -> None:
         self._cache[key] = value

src/_pytask/collect.py

@@ -352,6 +352,7 @@ def pytask_collect_task(
         )
 
         markers = get_all_marks(obj)
+        attributes: dict[str, Any]
 
         if isinstance(obj, TaskFunction):
             attributes = {
@@ -361,7 +362,11 @@ def pytask_collect_task(
                 "is_generator": obj.pytask_meta.is_generator,
             }
         else:
-            attributes = {"collection_id": None, "after": [], "is_generator": False}
+            attributes = {
+                "collection_id": None,
+                "after": [],
+                "is_generator": False,
+            }
 
         unwrapped = unwrap_task_function(obj)
         if isinstance(unwrapped, Function):

src/_pytask/config.py

@@ -66,7 +66,7 @@ def pytask_configure(pm: PluginManager, raw_config: dict[str, Any]) -> dict[str,
     """Configure pytask."""
     # Add all values by default so that many plugins do not need to copy over values.
     config = {"pm": pm, "markers": {}} | raw_config
-    config["markers"] = parse_markers(config["markers"])  # type: ignore[arg-type]
+    config["markers"] = parse_markers(config["markers"])
 
     pm.hook.pytask_parse_config(config=config)
     pm.hook.pytask_post_parse(config=config)

tests/test_collect_command.py

@@ -5,6 +5,7 @@
 import textwrap
 from dataclasses import dataclass
 from pathlib import Path
+from typing import TYPE_CHECKING
 
 import pytest
 
@@ -16,6 +17,9 @@
 from pytask import cli
 from tests.conftest import enter_directory
 
+if TYPE_CHECKING:
+    from _pytask.node_protocols import PTaskWithPath
+
 
 def test_collect_task(runner, tmp_path):
     source = """
@@ -315,7 +319,7 @@ def function(depends_on, produces): ...
 
 
 def test_print_collected_tasks_without_nodes(capsys):
-    dictionary = {
+    dictionary: dict[Path, list[PTaskWithPath]] = {
         Path("task_path.py"): [
             Task(
                 base_name="function",
@@ -337,7 +341,7 @@ def test_print_collected_tasks_without_nodes(capsys):
 
 
 def test_print_collected_tasks_with_nodes(capsys):
-    dictionary = {
+    dictionary: dict[Path, list[PTaskWithPath]] = {
         Path("task_path.py"): [
             Task(
                 base_name="function",
@@ -361,7 +365,7 @@ def test_print_collected_tasks_with_nodes(capsys):
 
 @pytest.mark.parametrize(("show_nodes", "expected_add"), [(False, "src"), (True, "..")])
 def test_find_common_ancestor_of_all_nodes(show_nodes, expected_add):
-    tasks = [
+    tasks: list[PTaskWithPath] = [
         Task(
             base_name="function",
             path=Path.cwd() / "src" / "task_path.py",