Fix merge conflicts

PrefectHQ · Jun 17, 2024 · d4dbd4f · d4dbd4f
1 parent e3cca0e
commit d4dbd4f
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 20 deletions.
diff --git a/compat-tests b/compat-tests
diff --git a/src/integrations/prefect-dask/tests/conftest.py b/src/integrations/prefect-dask/tests/conftest.py
@@ -52,9 +52,3 @@ def event_loop(request):
     # Workaround for failures in pytest_asyncio 0.17;
     # see https://github.com/pytest-dev/pytest-asyncio/issues/257
     policy.set_event_loop(loop)
-
-
-@pytest.fixture(autouse=True)
-def fetch_state_result():
-    with temporary_settings(updates={PREFECT_ASYNC_FETCH_STATE_RESULT: True}):
-        yield
diff --git a/src/prefect/flows.py b/src/prefect/flows.py
@@ -1184,22 +1184,25 @@ def __call__(self: "Flow[P, NoReturn]", *args: P.args, **kwargs: P.kwargs) -> No
     @overload
     def __call__(
         self: "Flow[P, Coroutine[Any, Any, T]]", *args: P.args, **kwargs: P.kwargs
-    ) -> Awaitable[T]: ...
+    ) -> Awaitable[T]:
+        ...
 
     @overload
     def __call__(
         self: "Flow[P, T]",
         *args: P.args,
         **kwargs: P.kwargs,
-    ) -> T: ...
+    ) -> T:
+        ...
 
     @overload
     def __call__(
         self: "Flow[P, T]",
         *args: P.args,
         return_state: Literal[True],
         **kwargs: P.kwargs,
-    ) -> State[T]: ...
+    ) -> State[T]:
+        ...
 
     def __call__(
         self,
@@ -1337,7 +1340,8 @@ async def visualize(self, *args, **kwargs):
 
 
 @overload
-def flow(__fn: Callable[P, R]) -> Flow[P, R]: ...
+def flow(__fn: Callable[P, R]) -> Flow[P, R]:
+    ...
 
 
 @overload
@@ -1368,7 +1372,8 @@ def flow(
     ] = None,
     on_crashed: Optional[List[Callable[[FlowSchema, FlowRun, State], None]]] = None,
     on_running: Optional[List[Callable[[FlowSchema, FlowRun, State], None]]] = None,
-) -> Callable[[Callable[P, R]], Flow[P, R]]: ...
+) -> Callable[[Callable[P, R]], Flow[P, R]]:
+    ...
 
 
 def flow(

diff --git a/src/prefect/tasks.py b/src/prefect/tasks.py
@@ -764,15 +764,17 @@ def __call__(
         self: "Task[P, T]",
         *args: P.args,
         **kwargs: P.kwargs,
-    ) -> T: ...
+    ) -> T:
+        ...
 
     @overload
     def __call__(
         self: "Task[P, T]",
         *args: P.args,
         return_state: Literal[True],
         **kwargs: P.kwargs,
-    ) -> State[T]: ...
+    ) -> State[T]:
+        ...
 
     def __call__(
         self,
@@ -825,7 +827,8 @@ def submit(
         self: "Task[P, T]",
         *args: P.args,
         **kwargs: P.kwargs,
-    ) -> PrefectFuture: ...
+    ) -> PrefectFuture:
+        ...
 
     @overload
     def submit(
@@ -834,7 +837,8 @@ def submit(
         wait_for: Optional[Iterable[PrefectFuture]] = None,
         *args: P.args,
         **kwargs: P.kwargs,
-    ) -> State[T]: ...
+    ) -> State[T]:
+        ...
 
     def submit(
         self,
@@ -973,15 +977,17 @@ def map(
         self: "Task[P, T]",
         *args: P.args,
         **kwargs: P.kwargs,
-    ) -> List[PrefectFuture]: ...
+    ) -> List[PrefectFuture]:
+        ...
 
     @overload
     def map(
         self: "Task[P, T]",
         return_state: Literal[True],
         *args: P.args,
         **kwargs: P.kwargs,
-    ) -> List[State[T]]: ...
+    ) -> List[State[T]]:
+        ...
 
     def map(
         self,
@@ -1297,7 +1303,8 @@ def serve(self) -> "Task":
 
 
 @overload
-def task(__fn: Callable[P, R]) -> Task[P, R]: ...
+def task(__fn: Callable[P, R]) -> Task[P, R]:
+    ...
 
 
 @overload
@@ -1333,7 +1340,8 @@ def task(
     on_failure: Optional[List[Callable[["Task", TaskRun, State], None]]] = None,
     retry_condition_fn: Optional[Callable[["Task", TaskRun, State], bool]] = None,
     viz_return_value: Any = None,
-) -> Callable[[Callable[P, R]], Task[P, R]]: ...
+) -> Callable[[Callable[P, R]], Task[P, R]]:
+    ...
 
 
 def task(