Skip to content

Commit

Permalink
ci(pre-commit.ci): 🎨 Auto format from pre-commit.com hooks
Browse files Browse the repository at this point in the history
  • Loading branch information
pre-commit-ci[bot] committed Jul 3, 2023
1 parent dd63825 commit eb69eff
Show file tree
Hide file tree
Showing 8 changed files with 20 additions and 18 deletions.
2 changes: 1 addition & 1 deletion micropy/app/stubs.py
Original file line number Diff line number Diff line change
Expand Up @@ -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...")
Expand Down
6 changes: 4 additions & 2 deletions micropy/exceptions.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
"""Micropy Exceptions."""
from __future__ import annotations

from typing import Optional


class MicropyException(Exception):
"""Generic MicroPy Exception."""
Expand All @@ -21,7 +23,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):
Expand Down Expand Up @@ -52,7 +54,7 @@ class RequirementNotFound(RequirementException):
class PyDeviceError(MicropyException):
"""Generic PyDevice exception."""

def __init__(self, message: str = None):
def __init__(self, message: Optional[str] = None):
super().__init__(message)
self.message = message

Expand Down
2 changes: 1 addition & 1 deletion micropy/logger.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
4 changes: 2 additions & 2 deletions micropy/project/modules/stubs.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import sys
from pathlib import Path
from typing import Any, List, Sequence, Union
from typing import Any, List, Optional, Sequence, Union

from boltons import setutils
from micropy.project.modules import ProjectModule
Expand All @@ -22,7 +22,7 @@ class StubsModule(ProjectModule):
PRIORITY: int = 9

def __init__(
self, stub_manager: StubManager, stubs: Sequence[DeviceStub] = None, **kwargs: Any
self, stub_manager: StubManager, stubs: Optional[Sequence[DeviceStub]] = None, **kwargs: Any
):
super().__init__(**kwargs)
self.stub_manager: StubManager = stub_manager
Expand Down
8 changes: 4 additions & 4 deletions micropy/project/template.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -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))
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions micropy/pyd/abc.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
import abc
from io import BytesIO, StringIO
from pathlib import Path
from typing import Any, AnyStr, Generic, NewType, Protocol, TypeVar
from typing import Any, AnyStr, Generic, NewType, Optional, Protocol, TypeVar

HostPath = NewType("HostPath", str)
DevicePath = NewType("DevicePath", str)


class StartHandler(Protocol):
def __call__(self, *, name: str = None, size: int | None = None) -> Any:
def __call__(self, *, name: Optional[str] = None, size: int | None = None) -> Any:
...


Expand Down
4 changes: 2 additions & 2 deletions micropy/pyd/backend_upydevice.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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 = (
Expand Down
8 changes: 4 additions & 4 deletions micropy/pyd/consumers.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from __future__ import annotations

from functools import partialmethod
from typing import Any, Callable, NamedTuple, cast
from typing import Any, Callable, NamedTuple, Optional, cast

from micropy.pyd.abc import (
EndHandler,
Expand All @@ -19,14 +19,14 @@ class ProgressStreamConsumer:

def __init__(
self,
on_description: Callable[
[str, dict[str, Any] | None], tuple[str, dict[str, Any] | None]
on_description: Optional[
Callable[[str, dict[str, Any] | None], tuple[str, dict[str, Any] | None]]
] = None,
**kwargs,
):
self._on_description = on_description or (lambda s, cfg: (s, cfg))

def on_start(self, *, name: str = None, size: int | None = None):
def on_start(self, *, name: Optional[str] = None, size: int | None = None):
bar_format = "{l_bar}{bar}| [{n_fmt}/{total_fmt} @ {rate_fmt}]"
tqdm_kwargs = {
"unit_scale": True,
Expand Down

0 comments on commit eb69eff

Please sign in to comment.