ci(pre-commit.ci): 🎨 Auto format from pre-commit.com hooks

micropy/app/stubs.py

@@ -179,7 +179,7 @@ def _get_desc(name: str, cfg: dict):
         pyb.run_script(create_stubs, DevicePath(dev_path))
     except Exception as e:
         # TODO: Handle more usage cases
-        log.error(f"Failed to execute script: {str(e)}", exception=e)
+        log.error(f"Failed to execute script: {e!s}", exception=e)
         raise
     log.success("Done!")
     log.info("Copying stubs...")

micropy/exceptions.py

@@ -1,4 +1,5 @@
 """Micropy Exceptions."""
+
 from __future__ import annotations
 
 
@@ -21,7 +22,7 @@ class StubValidationError(StubError):
     """Raised when a stub fails validation."""
 
     def __init__(self, path, errors, *args, **kwargs):
-        msg = f"Stub at[{str(path)}] encountered" f" the following validation errors: {str(errors)}"
+        msg = f"Stub at[{path!s}] encountered" f" the following validation errors: {errors!s}"
         super().__init__(msg, *args, **kwargs)
 
     def __str__(self):

micropy/logger.py

@@ -254,7 +254,7 @@ def exception(self, error, **kwargs):
 
         """
         name = type(error).__name__
-        msg = f"{name}: {str(error)}"
+        msg = f"{name}: {error!s}"
         return self.echo(msg, log="exception", title_color="red", fg="red", accent="red", **kwargs)
 
     def success(self, msg, **kwargs):

micropy/project/modules/__init__.py

@@ -1,6 +1,5 @@
 """Project Modules."""
 
-
 from .modules import HookProxy, ProjectModule
 from .packages import DevPackagesModule, PackagesModule
 from .stubs import StubsModule

micropy/project/modules/templates.py

@@ -1,6 +1,5 @@
 """Project Templates Module."""
 
-
 from micropy.project.modules import ProjectModule
 from micropy.project.template import TemplateProvider
 

micropy/project/template.py

@@ -296,7 +296,7 @@ def render_to(self, name, parent_dir, *args, **kwargs):
 
         """
         template = self.get(name, **kwargs)
-        self.log.debug(f"Loaded: {str(template)}")
+        self.log.debug(f"Loaded: {template!s}")
         if self.run_checks:
             self.log.debug(f"Verifying {template} requirements...")
             template.run_checks()
@@ -305,7 +305,7 @@ def render_to(self, name, parent_dir, *args, **kwargs):
             self.log.debug(f"Create: {out_dir}")
             parent_dir.mkdir(exist_ok=True)
             out_dir.parent.mkdir(exist_ok=True, parents=True)
-            self.log.debug(f"Rendered: {name} to {str(out_dir)}")
+            self.log.debug(f"Rendered: {name} to {out_dir!s}")
             self.log.info(f"$[{name.capitalize()}] File Generated!")
             stream = template.render_stream()
             return stream.dump(str(out_dir))
@@ -326,13 +326,13 @@ def update(self, name, root_dir, **kwargs):
 
         """
         template = self.get(name, **kwargs)
-        self.log.debug(f"Loaded: {str(template)}")
+        self.log.debug(f"Loaded: {template!s}")
         try:
             template.update(root_dir)
         except FileNotFoundError:
             self.log.debug("Template does not exist!")
             return self.render_to(name, root_dir, **kwargs)
-        self.log.debug(f"Updated: {str(template)}")
+        self.log.debug(f"Updated: {template!s}")
         return template
 
     @property

micropy/pyd/abc.py

@@ -10,80 +10,65 @@
 
 
 class StartHandler(Protocol):
-    def __call__(self, *, name: str = None, size: int | None = None) -> Any:
-        ...
+    def __call__(self, *, name: str = None, size: int | None = None) -> Any: ...
 
 
 class UpdateHandler(Protocol):
-    def __call__(self, *, size: int | None = None) -> Any:
-        ...
+    def __call__(self, *, size: int | None = None) -> Any: ...
 
 
 class EndHandler(Protocol):
-    def __call__(self) -> Any:
-        ...
+    def __call__(self) -> Any: ...
 
 
 class MessageHandler(Protocol):
-    def __call__(self, data: AnyStr) -> Any:
-        ...
+    def __call__(self, data: AnyStr) -> Any: ...
 
 
 class StreamConsumer(Protocol):
     @property
     @abc.abstractmethod
-    def on_start(self) -> StartHandler:
-        ...
+    def on_start(self) -> StartHandler: ...
 
     @property
     @abc.abstractmethod
-    def on_update(self) -> UpdateHandler:
-        ...
+    def on_update(self) -> UpdateHandler: ...
 
     @property
     @abc.abstractmethod
-    def on_end(self) -> EndHandler:
-        ...
+    def on_end(self) -> EndHandler: ...
 
 
 class MessageConsumer(Protocol):
     @property
     @abc.abstractmethod
-    def on_message(self) -> MessageHandler:
-        ...
+    def on_message(self) -> MessageHandler: ...
 
 
-class PyDeviceConsumer(MessageConsumer, StreamConsumer, Protocol):
-    ...
+class PyDeviceConsumer(MessageConsumer, StreamConsumer, Protocol): ...
 
 
 class MetaPyDeviceBackend(abc.ABC):
     location: str
 
     @abc.abstractmethod
-    def establish(self, target: str) -> MetaPyDeviceBackend:
-        ...
+    def establish(self, target: str) -> MetaPyDeviceBackend: ...
 
     @abc.abstractmethod
-    def connect(self) -> None:
-        ...
+    def connect(self) -> None: ...
 
     @abc.abstractmethod
-    def disconnect(self) -> None:
-        ...
+    def disconnect(self) -> None: ...
 
     @abc.abstractmethod
-    def reset(self) -> None:
-        ...
+    def reset(self) -> None: ...
 
     @abc.abstractmethod
-    def resolve_path(self, target_path: DevicePath | str | Path) -> DevicePath:
-        ...
+    def resolve_path(self, target_path: DevicePath | str | Path) -> DevicePath: ...
 
     @property
     @abc.abstractmethod
-    def connected(self) -> bool:
-        ...
+    def connected(self) -> bool: ...
 
     @abc.abstractmethod
     def push_file(
@@ -93,8 +78,7 @@ def push_file(
         *,
         consumer: PyDeviceConsumer | None,
         **kwargs,
-    ) -> None:
-        ...
+    ) -> None: ...
 
     @abc.abstractmethod
     def pull_file(
@@ -104,16 +88,13 @@ def pull_file(
         *,
         consumer: PyDeviceConsumer | None,
         **kwargs,
-    ) -> None:
-        ...
+    ) -> None: ...
 
     @abc.abstractmethod
-    def list_dir(self, path: DevicePath) -> list[DevicePath]:
-        ...
+    def list_dir(self, path: DevicePath) -> list[DevicePath]: ...
 
     @abc.abstractmethod
-    def remove(self, path: DevicePath) -> None:
-        ...
+    def remove(self, path: DevicePath) -> None: ...
 
     @abc.abstractmethod
     def copy_dir(
@@ -123,12 +104,10 @@ def copy_dir(
         *,
         consumer: PyDeviceConsumer | None,
         **kwargs,
-    ):
-        ...
+    ): ...
 
     @abc.abstractmethod
-    def eval(self, command: str, *, consumer: MessageConsumer | None = None):
-        ...
+    def eval(self, command: str, *, consumer: MessageConsumer | None = None): ...
 
     @abc.abstractmethod
     def eval_script(
@@ -137,8 +116,7 @@ def eval_script(
         target_path: DevicePath | None = None,
         *,
         consumer: PyDeviceConsumer | None = None,
-    ):
-        ...
+    ): ...
 
 
 AnyBackend = TypeVar("AnyBackend", bound=MetaPyDeviceBackend)
@@ -150,29 +128,23 @@ class MetaPyDevice(abc.ABC, Generic[AnyBackend]):
     message_consumer: MessageConsumer | None
 
     @abc.abstractmethod
-    def connect(self) -> None:
-        ...
+    def connect(self) -> None: ...
 
     @abc.abstractmethod
-    def disconnect(self) -> None:
-        ...
+    def disconnect(self) -> None: ...
 
     @abc.abstractmethod
-    def copy_to(self, source_path: HostPath, target_path: DevicePath) -> None:
-        ...
+    def copy_to(self, source_path: HostPath, target_path: DevicePath) -> None: ...
 
     @abc.abstractmethod
     def copy_from(
         self, source_path: DevicePath, target_path: HostPath, *, verify_integrity: bool = True
-    ) -> None:
-        ...
+    ) -> None: ...
 
     @abc.abstractmethod
-    def remove(self, target_path: DevicePath) -> None:
-        ...
+    def remove(self, target_path: DevicePath) -> None: ...
 
     @abc.abstractmethod
     def run_script(
         self, content: AnyStr | StringIO | BytesIO, target_path: DevicePath | None = None
-    ):
-        ...
+    ): ...

micropy/pyd/backend_rshell.py

@@ -22,8 +22,7 @@ class RShell:
         ASCII_XFER: bool
         QUIET: bool
 
-        def connect(self, port: str):
-            ...
+        def connect(self, port: str): ...
 
 
 try:

micropy/pyd/backend_upydevice.py

@@ -203,7 +203,7 @@ def write_file(
         target_path = self.resolve_path(target_path)
         self._pydevice.cmd("import gc")
         self._pydevice.cmd("import ubinascii")
-        self._pydevice.cmd(f"f = open('{str(target_path)}', 'wb')")
+        self._pydevice.cmd(f"f = open('{target_path!s}', 'wb')")
 
         content_iter = (
             iterutils.chunked_iter(contents, self.BUFFER_SIZE)
@@ -212,7 +212,7 @@ def write_file(
         )
 
         content_size = len(contents)
-        consumer.on_start(name=f"Writing {str(target_path)}", size=content_size)
+        consumer.on_start(name=f"Writing {target_path!s}", size=content_size)
 
         for chunk in content_iter:
             cmd = (

micropy/stubs/source.py

@@ -28,8 +28,7 @@
 
 class LocateStrategy(Protocol):
     @abc.abstractmethod
-    def prepare(self, location: PathStr) -> Union[PathStr, tuple[PathStr, Callable[..., Any]]]:
-        ...
+    def prepare(self, location: PathStr) -> Union[PathStr, tuple[PathStr, Callable[..., Any]]]: ...
 
 
 logger = Log.add_logger(__name__, show_title=False)

micropy/utils/stub.py

@@ -1,4 +1,5 @@
 """Micropy stub utils."""
+
 from __future__ import annotations
 
 import importlib.util

micropy/utils/types.py

@@ -13,5 +13,4 @@
 
 @runtime_checkable
 class SupportsLessThan(Protocol):
-    def __lt__(self, other: Any) -> bool:
-        ...
+    def __lt__(self, other: Any) -> bool: ...

tests/data/esp32_test_stub/stubs/machine.py

@@ -1,6 +1,7 @@
 """
 Module: 'machine' on esp8266 v1.9.4
 """
+
 # MCU: (sysname='esp8266', nodename='esp8266', release='2.2.0-dev(9422289)', version='v1.9.4-8-ga9a3caad0 on 2018-05-11', machine='ESP module with ESP8266')
 # Stubber: 1.1.2
 

tests/data/esp8266_test_stub/stubs/machine.py

@@ -1,6 +1,7 @@
 """
 Module: 'machine' on esp8266 v1.9.4
 """
+
 # MCU: (sysname='esp8266', nodename='esp8266', release='2.2.0-dev(9422289)', version='v1.9.4-8-ga9a3caad0 on 2018-05-11', machine='ESP module with ESP8266')
 # Stubber: 1.1.2
 

tests/test_stubs/esp32_test_stub/stubs/machine.py

@@ -1,6 +1,7 @@
 """
 Module: 'machine' on esp8266 v1.9.4
 """
+
 # MCU: (sysname='esp8266', nodename='esp8266', release='2.2.0-dev(9422289)', version='v1.9.4-8-ga9a3caad0 on 2018-05-11', machine='ESP module with ESP8266')
 # Stubber: 1.1.2
 

tests/test_stubs/esp8266_test_stub/stubs/machine.py

@@ -1,6 +1,7 @@
 """
 Module: 'machine' on esp8266 v1.9.4
 """
+
 # MCU: (sysname='esp8266', nodename='esp8266', release='2.2.0-dev(9422289)', version='v1.9.4-8-ga9a3caad0 on 2018-05-11', machine='ESP module with ESP8266')
 # Stubber: 1.1.2