bump black, fix issues

examples/utils/__init__.py

@@ -1,4 +1,5 @@
 """Utilities for yapapi example scripts."""
+
 import argparse
 import asyncio
 import tempfile

pyproject.toml

@@ -48,7 +48,7 @@ sphinx-rtd-theme = { version = "^1.0.0", optional = true}
 docs = ['sphinx', 'sphinx-autodoc-typehints', 'sphinx-rtd-theme']
 
 [tool.poetry.group.dev.dependencies]
-black = "^23.1.0"
+black = "^24.4.2"
 factory-boy = "^3.2.0"
 isort = "^5.10.1"
 liccheck = "^0.4.7"

tests/engine/test_engine.py

@@ -1,4 +1,5 @@
 """Unit tests for `yapapi.engine` module."""
+
 from unittest.mock import Mock
 
 import pytest

tests/goth_tests/___test_resubscription.py

@@ -1,4 +1,5 @@
 """Test if subscription expiration is handled correctly by Golem."""
+
 import logging
 import os
 import time

tests/goth_tests/assertions.py

@@ -6,6 +6,7 @@
 the string "Agreement confirmed by provider P", for any name P, then
 eventually it will also print a line containing "Accepted invoice from P".
 """
+
 import logging
 import re
 from typing import Set

tests/goth_tests/test_agreement_termination/test_agreement_termination.py

@@ -1,4 +1,5 @@
 """A goth test scenario for agreement termination."""
+
 import logging
 import os
 import re

tests/goth_tests/test_mid_agreement_payments/test_mid_agreement_payments.py

@@ -1,4 +1,5 @@
 """A goth test scenario for mid-agreement payments."""
+
 import logging
 import os
 import re

tests/goth_tests/test_multiactivity_agreement/test_multiactivity_agreement.py

@@ -1,4 +1,5 @@
 """A goth test scenario for multi-activity agreements."""
+
 import logging
 import os
 import re

tests/goth_tests/test_recycle_ip/test_recycle_ip.py

@@ -1,4 +1,5 @@
 """An integration test scenario that runs the SSH example requestor app."""
+
 import asyncio
 import logging
 import os

tests/goth_tests/test_run_custom_usage_counter.py

@@ -1,4 +1,5 @@
 """An integration test scenario that runs custom usage counter example requestor app."""
+
 import logging
 import os
 import re

tests/goth_tests/test_run_scan.py

@@ -1,4 +1,5 @@
 """An integration test scenario that runs the `scan` example."""
+
 import asyncio
 import logging
 import os

tests/goth_tests/test_run_simple_service.py

@@ -1,4 +1,5 @@
 """An integration test scenario that runs the Simple Service example requestor app."""
+
 import logging
 import os
 import time

tests/goth_tests/test_run_ssh.py

@@ -1,4 +1,5 @@
 """An integration test scenario that runs the SSH example requestor app."""
+
 import asyncio
 import logging
 import os

tests/goth_tests/test_run_webapp.py

@@ -1,4 +1,5 @@
 """An integration test scenario that runs the `webapp` example."""
+
 import asyncio
 import logging
 import os

tests/test_log.py

@@ -1,4 +1,5 @@
 """Unit tests for the `yapapi.log` module."""
+
 import logging
 import os
 import sys

tests/test_payment_platforms.py

@@ -1,4 +1,5 @@
 """Unit tests for code that selects payment platforms based on driver/network specification."""
+
 from unittest import mock
 
 import pytest

yapapi/__init__.py

@@ -1,4 +1,5 @@
 """Golem Python API."""
+
 import asyncio
 import sys
 from pathlib import Path

yapapi/contrib/service/http_proxy.py

@@ -8,6 +8,7 @@
 `webapp <https://github.com/golemfactory/yapapi/tree/master/examples/webapp>`_ examples in the
 yapapi repository.
 """
+
 import abc
 import asyncio
 import logging

yapapi/contrib/service/socket_proxy.py

@@ -7,6 +7,7 @@
 `ssh <https://github.com/golemfactory/yapapi/tree/master/examples/ssh>`_ example in the
 yapapi repository.
 """
+
 import abc
 import asyncio
 import itertools

yapapi/contrib/strategy/provider_filter.py

@@ -4,6 +4,7 @@
 a simple boolean condition, while preserving correct scoring of the remaining offers by the
 base strategy.
 """
+
 import inspect
 from typing import Awaitable, Callable, Union
 

yapapi/ctx.py

@@ -28,8 +28,7 @@ class ExecOptions:
 
 
 class WorkContextEmitter(Protocol):
-    def __call__(self, event_class: Type[ActivityEventType], **kwargs) -> ActivityEventType:
-        ...
+    def __call__(self, event_class: Type[ActivityEventType], **kwargs) -> ActivityEventType: ...
 
 
 class WorkContext:

yapapi/engine.py

@@ -143,9 +143,11 @@ def __init__(
         self._payment_token: str = (
             payment_token.lower()
             if payment_token
-            else MAINNET_TOKEN_NAME
-            if self._payment_network in MAINNET_NETWORKS
-            else TESTNET_TOKEN_NAME
+            else (
+                MAINNET_TOKEN_NAME
+                if self._payment_network in MAINNET_NETWORKS
+                else TESTNET_TOKEN_NAME
+            )
         )
         self._stream_output = stream_output
 

yapapi/executor/__init__.py

@@ -1,4 +1,5 @@
 """An implementation of the new Golem's task executor."""
+
 import asyncio
 import sys
 from asyncio import CancelledError

yapapi/executor/task.py

@@ -34,8 +34,9 @@ class TaskStatus(Enum):
 
 
 class TaskEmitter(Protocol):
-    def __call__(self, event_class: Type[events.TaskEventType], **kwargs) -> events.TaskEventType:
-        ...
+    def __call__(
+        self, event_class: Type[events.TaskEventType], **kwargs
+    ) -> events.TaskEventType: ...
 
 
 class Task(Generic[TaskData, TaskResult]):

yapapi/log.py

@@ -41,6 +41,7 @@
     )
 ```
 """
+
 import inspect
 import logging
 import os

yapapi/props/com.py

@@ -1,4 +1,5 @@
 """Payment-related properties."""
+
 import abc
 import enum
 from typing import Any, Dict, List

yapapi/services/cluster.py

@@ -1,4 +1,5 @@
 """Implementation of high-level services API."""
+
 import itertools
 from contextlib import AsyncExitStack
 from datetime import datetime, timedelta, timezone

yapapi/services/service.py

@@ -436,13 +436,15 @@ def serialize(self) -> "ServiceSerialization":
             "activity_id": self._ctx._activity.id if self._ctx else None,
             "agreement_id": self._ctx._agreement.id if self._ctx else None,
             "state": self.state.value,
-            "network_node": {
-                "network_id": self._network_node.network.network_id,
-                "node_id": self._network_node.node_id,
-                "ip": self._network_node.ip,
-            }
-            if self._network_node
-            else None,
+            "network_node": (
+                {
+                    "network_id": self._network_node.network.network_id,
+                    "node_id": self._network_node.node_id,
+                    "ip": self._network_node.ip,
+                }
+                if self._network_node
+                else None
+            ),
         }
 
 

yapapi/utils.py

@@ -1,4 +1,5 @@
 """Utility functions and classes used within yapapi."""
+
 import asyncio
 import enum
 import functools