punchboot 2.3.0__tar.gz → 2.7.0__tar.gz

{punchboot-2.3.0 → punchboot-2.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: punchboot
-Version: 2.3.0
+Version: 2.7.0
 Summary: Punchboot tools
 Home-page: https://github.com/jonasblixt/punchboot
 Author: Jonas Blixt
@@ -11,16 +11,28 @@ Classifier: Intended Audience :: Developers
 Classifier: Topic :: Software Development :: Embedded Systems
 Classifier: License :: OSI Approved :: BSD License
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
-Requires-Python: >=3.8
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
+Classifier: Programming Language :: Python :: 3.15
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: semver<4,>=3
 Requires-Dist: click<9,>=8
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 ![PB Logo](doc/pb_logo.png)
 

{punchboot-2.3.0 → punchboot-2.7.0}/punchboot.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: punchboot
-Version: 2.3.0
+Version: 2.7.0
 Summary: Punchboot tools
 Home-page: https://github.com/jonasblixt/punchboot
 Author: Jonas Blixt
@@ -11,16 +11,28 @@ Classifier: Intended Audience :: Developers
 Classifier: Topic :: Software Development :: Embedded Systems
 Classifier: License :: OSI Approved :: BSD License
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
-Requires-Python: >=3.8
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
+Classifier: Programming Language :: Python :: 3.15
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: semver<4,>=3
 Requires-Dist: click<9,>=8
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 ![PB Logo](doc/pb_logo.png)
 

{punchboot-2.3.0 → punchboot-2.7.0}/pyproject.toml

@@ -5,7 +5,7 @@ extend-exclude = [
     "doc",
     "scripts/**",
 ]
-target-version = "py38"
+target-version = "py310"
 
 [tool.ruff.lint]
 # See: https://docs.astral.sh/ruff/rules/ for details
@@ -13,12 +13,10 @@ select = ["ALL"]
 ignore = [
     "COM812",   # Conflicts with the formatter
     "ISC001",   # Conflicts with the formatter
-    "ANN101",   # "missing-type-self"
     "PLE0605",  # ruff does not handle += in __all__
     "FBT",      # don't care for these at the moment
+    "CPY001",   # Copyright notices are not used in the python sources
     "PT001",    # https://github.com/astral-sh/ruff/issues/8796#issuecomment-1825907715
-    "PT004",    # https://github.com/astral-sh/ruff/issues/8796#issuecomment-1825907715
-    "PT005",    # https://github.com/astral-sh/ruff/issues/8796#issuecomment-1825907715
     "PT023",    # https://github.com/astral-sh/ruff/issues/8796#issuecomment-1825907715
 ]
 
@@ -39,11 +37,12 @@ warn_return_any = true
 exclude = [
     "^build.*",
     "^doc.*",
-    "^scripts/menuconfig\\.py$"
+    "^scripts/menuconfig\\.py$",
+    "^scripts/olddefconfig\\.py$"
 ]
 
 [tool.cibuildwheel]
-skip = ["*-musl*", "pp*", "*linux_i686", "*win32*"]
+skip = ["*-musl*", "pp*", "*linux_i686", "*win32*", "cp3??t-*"]
 
 [tool.cibuildwheel.linux]
 before-all = "yum install -y libusbx-devel"

{punchboot-2.3.0 → punchboot-2.7.0}/setup.py

@@ -67,11 +67,12 @@ setup(
         "Topic :: Software Development :: Embedded Systems",
         "License :: OSI Approved :: BSD License",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.8",
-        "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",
         "Programming Language :: Python :: 3.12",
+        "Programming Language :: Python :: 3.13",
+        "Programming Language :: Python :: 3.14",
+        "Programming Language :: Python :: 3.15",
     ],
     url="https://github.com/jonasblixt/punchboot",
     packages=["punchboot"],
@@ -81,7 +82,7 @@ setup(
     package_data={
         "punchboot": ["py.typed"],
     },
-    python_requires=">=3.8",
+    python_requires=">=3.10",
     entry_points={"console_scripts": ["punchboot=punchboot.__main__:cli"]},
     ext_modules=[
         Extension(

{punchboot-2.3.0 → punchboot-2.7.0}/src/lib/bpak.c

@@ -11,7 +11,7 @@
 #include <string.h>
 
 /* BPAK_META_ALIGN is a power-of-2 */
-#define BPAK_META_ALIGN_SIZE(_x) (((_x) + ((BPAK_META_ALIGN)-1)) & ~((BPAK_META_ALIGN)-1))
+#define BPAK_META_ALIGN_SIZE(_x) (((_x) + ((BPAK_META_ALIGN) - 1)) & ~((BPAK_META_ALIGN) - 1))
 
 static int bpak_get_meta_int(struct bpak_header *hdr,
                              bpak_id_t id,

{punchboot-2.3.0 → punchboot-2.7.0}/tools/punchboot/punchboot/__init__.py

@@ -6,7 +6,7 @@ from _punchboot import (  # type: ignore[import-not-found] # noqa: F401
     CommandError,
     Error,
     GenericError,
-    IOError,
+    IOError,  # noqa: A004
     KeyRevokedError,
     MemError,
     NoMemoryError,
@@ -17,7 +17,7 @@ from _punchboot import (  # type: ignore[import-not-found] # noqa: F401
     PartVerifyError,
     SignatureError,
     StreamNotInitializedError,
-    TimeoutError,
+    TimeoutError,  # noqa: A004
     TransferError,
 )
 
@@ -48,13 +48,13 @@ _pb_exceptions = [
 ]
 
 __all__ = [
-    "Session",
+    "SLC",
     "Partition",
     "PartitionFlags",
-    "SLC",
+    "Session",
     "library_version",
+    "list_usb_devices",
     "pb_id",
     "wait_for_device",
-    "list_usb_devices",
 ]
 __all__ += _pb_exceptions

{punchboot-2.3.0 → punchboot-2.7.0}/tools/punchboot/punchboot/__main__.py

@@ -9,9 +9,10 @@ import os
 import pathlib
 import sys
 import uuid
+from collections.abc import Callable, Iterable
 from functools import update_wrapper
 from importlib.metadata import version
-from typing import Any, Callable, Iterable, List, Optional, TypeVar, Union
+from typing import Any, TypeVar
 
 import click
 from click.shell_completion import CompletionItem
@@ -37,8 +38,8 @@ def _completion_helper_init_session() -> Session:
     """
     cmd_line = os.environ["COMP_WORDS"].split()[1:]
     opts, _ = getopt.getopt(cmd_line, "t:u:s:", ["transport=", "device-uuid=", "socket="])
-    skt_path: Optional[str] = None
-    dev_uuid: Optional[uuid.UUID] = None
+    skt_path: str | None = None
+    dev_uuid: uuid.UUID | None = None
     for o, a in opts:
         if o in ("-s", "--socket"):
             skt_path = a
@@ -62,19 +63,19 @@ def _get_board_name(uu: uuid.UUID) -> str:
 
 def _dev_completion_helper(
     _ctx: click.Context, _param: click.Option, _incomplete: str
-) -> List[CompletionItem]:
+) -> list[CompletionItem]:
     """Completion handler for USB attached devices."""
     return [CompletionItem(str(uu), help=_get_board_name(uu)) for uu in list_usb_devices()]
 
 
 def _get_part_completion_helper(
     *, filt_write: bool = False, filt_read: bool = False, filt_boot: bool = False
-) -> Callable[[click.Context, click.Parameter, str], List[CompletionItem]]:
+) -> Callable[[click.Context, click.Parameter, str], list[CompletionItem]]:
     """Construct a completion handler for partitions with given filtering."""
 
     def _part_completion_helper(
         _ctx: click.Context, _param: click.Parameter, _incomplete: str
-    ) -> List[CompletionItem]:
+    ) -> list[CompletionItem]:
         """Completion handler for partitions."""
         with contextlib.suppress(Exception):
             s: Session = _completion_helper_init_session()
@@ -103,7 +104,7 @@ def pb_session(f: TFunc) -> TFunc:
 
     @click.pass_context
     def new_func(ctx: click.Context, *args: Any, **kwargs: Any) -> Any:  # noqa: ANN401
-        device_uuid: Optional[uuid.UUID] = ctx.obj["device-uuid"]
+        device_uuid: uuid.UUID | None = ctx.obj["device-uuid"]
         socket: str = ctx.obj["socket"]
         transport: str = ctx.obj["transport"]
         try:
@@ -270,7 +271,7 @@ def auth_password(
 @click.pass_context
 def auth_token(_ctx: click.Context, s: Session, token: pathlib.Path, key_id: str) -> None:
     """DSA token  authentication."""
-    key_id_p: Union[int, str] = 0
+    key_id_p: int | str = 0
 
     try:
         key_id_p = int(key_id, 0)
@@ -308,7 +309,9 @@ def part_list(_ctx: click.Context, s: Session) -> None:
             False,
             False,
         )
-        return "".join(flag if is_set else "-" for flag, is_set in zip(flags, part_param))
+        return "".join(
+            flag if is_set else "-" for flag, is_set in zip(flags, part_param, strict=False)
+        )
 
     def _size_helper(part: Partition) -> str:
         part_bytes = (part.last_block - part.first_block + 1) * part.block_size
@@ -444,12 +447,12 @@ def board_command(
     _ctx: click.Context,
     s: Session,
     command: str,
-    args: Optional[str],
+    args: str | None,
     out_fmt: str,
-    args_from_file: Optional[pathlib.Path],
+    args_from_file: pathlib.Path | None,
 ) -> None:
     """Execute a board specific command."""
-    board_command: Union[int, str] = 0
+    board_command: int | str = 0
     board_args: bytes = b""
 
     try:
@@ -527,7 +530,7 @@ def boot_bpak(
     _ctx: click.Context,
     s: Session,
     file: pathlib.Path,
-    pretend_part: Optional[uuid.UUID],
+    pretend_part: uuid.UUID | None,
     verbose: bool,
 ) -> None:
     """Load a bpak file into ram and run it."""
@@ -638,7 +641,7 @@ def slc_eol(_ctx: click.Context, s: Session, force: bool) -> None:
 @click.pass_context
 def slc_revoke_key(_ctx: click.Context, s: Session, key_id: str, force: bool) -> None:
     """Revoke a key."""
-    revoke_key_id: Union[int, str] = 0
+    revoke_key_id: int | str = 0
     try:
         revoke_key_id = int(key_id, 0)
     except ValueError:

{punchboot-2.3.0 → punchboot-2.7.0}/tools/punchboot/punchboot/partition.py

@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-import uuid  # noqa: TCH003
+import uuid  # noqa: TC003
 from dataclasses import dataclass
 from enum import Flag
 

{punchboot-2.3.0 → punchboot-2.7.0}/tools/punchboot/punchboot/session.py

@@ -9,7 +9,7 @@ import hashlib
 import io
 import pathlib
 import uuid
-from typing import IO, TYPE_CHECKING, Callable, Optional, Tuple, Union
+from typing import IO, TYPE_CHECKING
 
 import _punchboot  # type: ignore[import-not-found]
 import semver  # type: ignore[import-not-found]
@@ -19,7 +19,7 @@ from .partition import Partition, PartitionFlags
 from .slc import SLC
 
 if TYPE_CHECKING:
-    from collections.abc import Sequence
+    from collections.abc import Callable, Sequence
 
 
 def _has_fileno(file: IO[bytes]) -> bool:
@@ -34,7 +34,7 @@ def _has_fileno(file: IO[bytes]) -> bool:
     return True
 
 
-PartUUIDType = Union[uuid.UUID, str]
+PartUUIDType = uuid.UUID | str
 
 
 def _partuuid_to_uuid(uu: PartUUIDType) -> uuid.UUID:
@@ -54,8 +54,8 @@ class Session:
 
     def __init__(
         self,
-        device_uuid: Optional[Union[uuid.UUID, str]] = None,
-        socket_path: Optional[Union[pathlib.Path, str]] = None,
+        device_uuid: uuid.UUID | str | None = None,
+        socket_path: pathlib.Path | str | None = None,
     ) -> None:
         """Initialize the punchboot session.
 
@@ -101,7 +101,7 @@ class Session:
         self.pb_s.auth_set_password(password)
 
     def authenticate_dsa_token(
-        self, token: Union[pathlib.Path, bytes], key_id: Union[str, int]
+        self, token: pathlib.Path | bytes, key_id: str | int
     ) -> None:
         """Authenticate session using a DSA token.
 
@@ -134,7 +134,7 @@ class Session:
             for p in self.pb_s.part_get_partitions()
         ]
 
-    def part_verify(self, file: Union[pathlib.Path, IO[bytes], bytes], part: PartUUIDType) -> None:
+    def part_verify(self, file: pathlib.Path | IO[bytes] | bytes, part: PartUUIDType) -> None:
         """Verify the contents of a partition.
 
         Keyword arguments:
@@ -178,6 +178,7 @@ class Session:
             bpak_header_valid = valid_bpak_magic(file)
             data_length = len(file)
         elif _has_fileno(file):
+            file.seek(0)
             data_length = _chunk_reader(file)
         else:
             msg = "File is not a supported type"
@@ -185,7 +186,7 @@ class Session:
 
         self.pb_s.part_verify(uu.bytes, hash_ctx.digest(), data_length, bpak_header_valid)
 
-    def part_write(self, file: Union[pathlib.Path, IO[bytes]], part: PartUUIDType) -> None:
+    def part_write(self, file: pathlib.Path | IO[bytes], part: PartUUIDType) -> None:
         """Write data to a partition.
 
         Keyword arguments:
@@ -202,7 +203,7 @@ class Session:
             msg = "File is not a supported type"
             raise TypeError(msg)
 
-    def part_read(self, file: Union[pathlib.Path, IO[bytes]], part: PartUUIDType) -> None:
+    def part_read(self, file: pathlib.Path | IO[bytes], part: PartUUIDType) -> None:
         """Read data from a partition to a file.
 
         Keyword arguments:
@@ -222,7 +223,7 @@ class Session:
     def part_erase(
         self,
         part_uu: PartUUIDType,
-        progress_cb: Optional[Callable[[int, int], None]] = None,
+        progress_cb: Callable[[int, int], None] | None = None,
     ) -> None:
         """Erase partition.
 
@@ -282,7 +283,7 @@ class Session:
         uu: uuid.UUID = _partuuid_to_uuid(part)
         self.pb_s.part_table_install(uu.bytes, variant)
 
-    def boot_set_boot_part(self, part: Optional[PartUUIDType]) -> None:
+    def boot_set_boot_part(self, part: PartUUIDType | None) -> None:
         """Set active boot partition.
 
         Keyword arguments:
@@ -308,7 +309,7 @@ class Session:
         else:
             self.pb_s.boot_set_boot_part(None)
 
-    def boot_status(self) -> Tuple[uuid.UUID, str]:
+    def boot_status(self) -> tuple[uuid.UUID, str]:
         """Boot status.
 
         Reads the currently active boot partition.
@@ -364,8 +365,7 @@ class Session:
     def device_get_punchboot_version(self) -> semver.Version:
         """Read the punchboot version."""
         ver_str: str = self.pb_s.device_get_punchboot_version()
-        if ver_str.startswith("v"):
-            ver_str = ver_str[1:]
+        ver_str = ver_str.removeprefix("v")
         return semver.Version.parse(ver_str)
 
     def device_get_uuid(self) -> uuid.UUID:
@@ -376,7 +376,7 @@ class Session:
         """Read the device's board name."""
         return str(self.pb_s.device_get_boardname())
 
-    def board_run_command(self, cmd: Union[str, int], args: bytes = b"") -> bytes:
+    def board_run_command(self, cmd: str | int, args: bytes = b"") -> bytes:
         """Execute a board specific command.
 
         Keyword arguments:
@@ -439,7 +439,7 @@ class Session:
         """Read Security Life Cycle (SLC)."""
         return SLC(self.pb_s.slc_get_lifecycle())
 
-    def slc_revoke_key(self, key_id: Union[int, str]) -> None:
+    def slc_revoke_key(self, key_id: int | str) -> None:
         """Revokey key.
 
         Keyword arguments:

{punchboot-2.3.0 → punchboot-2.7.0}/tools/punchboot/python_wrapper.c

@@ -25,14 +25,14 @@
 static int log_cb(struct pb_context *ctx, int level, const char *fmt, ...)
 {
     static PyObject *logger = NULL;
-    static PyObject *log_msg = NULL;
+    PyObject *log_msg;
     char msg_buf[1024];
     int rc;
     (void)ctx;
     (void)level;
 
     if (logger == NULL) {
-        PyObject *logging = PyImport_ImportModuleNoBlock("logging");
+        PyObject *logging = PyImport_ImportModule("logging");
         if (logging == NULL) {
             PyErr_SetString(PyExc_ImportError, "Could not import module 'logging'");
             return -1;