Merge remote-tracking branch 'origin/add-datacatalog-name' into add-datacatalog-name

Author: tobiasraabe

src/_pytask/collect.py

@@ -7,7 +7,6 @@
 import os
 import sys
 import time
-import warnings
 from contextlib import suppress
 from pathlib import Path
 from typing import TYPE_CHECKING
@@ -30,10 +29,11 @@
 from _pytask.mark import MarkGenerator
 from _pytask.mark_utils import get_all_marks
 from _pytask.mark_utils import has_mark
-from _pytask.node_protocols import PNode, warn_about_upcoming_attributes_field_on_nodes
+from _pytask.node_protocols import PNode
 from _pytask.node_protocols import PPathNode
 from _pytask.node_protocols import PProvisionalNode
 from _pytask.node_protocols import PTask
+from _pytask.node_protocols import warn_about_upcoming_attributes_field_on_nodes
 from _pytask.nodes import DirectoryNode
 from _pytask.nodes import PathNode
 from _pytask.nodes import PythonNode

src/_pytask/console.py

@@ -12,7 +12,6 @@
 from typing import Any
 from typing import Callable
 from typing import Literal
-import warnings
 
 from rich.console import Console
 from rich.console import RenderableType
@@ -26,10 +25,11 @@
 from rich.tree import Tree
 
 from _pytask.data_catalog_utils import DATA_CATALOG_NAME_FIELD
-from _pytask.node_protocols import PNode, warn_about_upcoming_attributes_field_on_nodes
+from _pytask.node_protocols import PNode
 from _pytask.node_protocols import PPathNode
 from _pytask.node_protocols import PProvisionalNode
 from _pytask.node_protocols import PTaskWithPath
+from _pytask.node_protocols import warn_about_upcoming_attributes_field_on_nodes
 from _pytask.path import shorten_path
 
 if TYPE_CHECKING:
@@ -149,7 +149,9 @@ def format_node_name(
     """Format the name of a node."""
     if isinstance(node, PPathNode):
         if node.name != node.path.as_posix():
-            if data_catalog_name := getattr(node, "attributes", {}).get(DATA_CATALOG_NAME_FIELD):
+            if data_catalog_name := getattr(node, "attributes", {}).get(
+                DATA_CATALOG_NAME_FIELD
+            ):
                 return Text(f"{data_catalog_name}::{node.name}")
             warn_about_upcoming_attributes_field_on_nodes()
             return Text(node.name)

src/_pytask/data_catalog.py

@@ -20,9 +20,10 @@
 from _pytask.data_catalog_utils import DATA_CATALOG_NAME_FIELD
 from _pytask.exceptions import NodeNotCollectedError
 from _pytask.models import NodeInfo
-from _pytask.node_protocols import PNode, warn_about_upcoming_attributes_field_on_nodes
+from _pytask.node_protocols import PNode
 from _pytask.node_protocols import PPathNode
 from _pytask.node_protocols import PProvisionalNode
+from _pytask.node_protocols import warn_about_upcoming_attributes_field_on_nodes
 from _pytask.nodes import PickleNode
 from _pytask.pluginmanager import storage
 from _pytask.session import Session

src/_pytask/node_protocols.py

@@ -1,11 +1,11 @@
 from __future__ import annotations
 
+import warnings
 from typing import TYPE_CHECKING
 from typing import Any
 from typing import Callable
 from typing import Protocol
 from typing import runtime_checkable
-import warnings
 
 if TYPE_CHECKING:
     from pathlib import Path