diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 26443abcf..030861e28 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,6 +1,6 @@ repos: - repo: https://github.com/psf/black-pre-commit-mirror - rev: 24.10.0 + rev: 25.1.0 hooks: - id: black - repo: https://github.com/astral-sh/ruff-pre-commit diff --git a/pyproject.toml b/pyproject.toml index 0983940b9..ff9e02631 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -71,7 +71,7 @@ wheel.py-api = "cp39" [tool.black] line-length = 120 -required-version = "24" +required-version = "25" target-version = ['py39'] force-exclude = ''' (.*/src/asammdf/gui/ui)|(.*/ext) diff --git a/requirements.txt b/requirements.txt index 69295477d..c6994325e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,7 @@ --requirement doc/requirements.txt --requirement test/requirements.txt --requirement types-requirements.txt -black~=24.1 # Aligned with .pre-commit-config.yaml +black~=25.1 # Aligned with .pre-commit-config.yaml build mypy~=1.14 pre-commit diff --git a/run_black_and_ruff.bat b/run_black_and_ruff.bat index a8b3cdfe8..23b60e0d2 100644 --- a/run_black_and_ruff.bat +++ b/run_black_and_ruff.bat @@ -1,3 +1,3 @@ -pip install --upgrade black~=24.1 ruff~=0.8.0 && ^ +pip install --upgrade black~=25.1 ruff~=0.8.0 && ^ black --config pyproject.toml . asammdf.spec && ^ ruff check --fix diff --git a/src/asammdf/__init__.py b/src/asammdf/__init__.py index c90aa1e65..c316fcdb3 100644 --- a/src/asammdf/__init__.py +++ b/src/asammdf/__init__.py @@ -1,4 +1,4 @@ -""" asammdf is a parser and editor for ASAM MDF files """ +"""asammdf is a parser and editor for ASAM MDF files""" import logging diff --git a/src/asammdf/blocks/mdf_v2.py b/src/asammdf/blocks/mdf_v2.py index a33ed71be..02d115a76 100644 --- a/src/asammdf/blocks/mdf_v2.py +++ b/src/asammdf/blocks/mdf_v2.py @@ -1,4 +1,4 @@ -""" ASAM MDF version 2 file format module """ +"""ASAM MDF version 2 file format module""" from os import PathLike from typing import Optional, Union diff --git a/src/asammdf/blocks/mdf_v3.py b/src/asammdf/blocks/mdf_v3.py index 888e50715..d51741bfd 100644 --- a/src/asammdf/blocks/mdf_v3.py +++ b/src/asammdf/blocks/mdf_v3.py @@ -1,4 +1,4 @@ -""" ASAM MDF version 3 file format module """ +"""ASAM MDF version 3 file format module""" from collections import defaultdict from collections.abc import Callable, Iterable, Iterator, Sequence diff --git a/src/asammdf/blocks/v2_v3_blocks.py b/src/asammdf/blocks/v2_v3_blocks.py index de684496a..796de78a0 100644 --- a/src/asammdf/blocks/v2_v3_blocks.py +++ b/src/asammdf/blocks/v2_v3_blocks.py @@ -1,4 +1,4 @@ -""" classes that implement the blocks for MDF versions 2 and 3 """ +"""classes that implement the blocks for MDF versions 2 and 3""" from collections.abc import Iterator, Sequence from datetime import datetime, timedelta, timezone diff --git a/src/asammdf/blocks/v2_v3_constants.py b/src/asammdf/blocks/v2_v3_constants.py index a9bc42e14..70afeef4b 100644 --- a/src/asammdf/blocks/v2_v3_constants.py +++ b/src/asammdf/blocks/v2_v3_constants.py @@ -1,4 +1,4 @@ -""" MDF v2 and v3 constants """ +"""MDF v2 and v3 constants""" from collections.abc import Callable import struct diff --git a/src/asammdf/blocks/v4_constants.py b/src/asammdf/blocks/v4_constants.py index e80052f85..3eebc153d 100644 --- a/src/asammdf/blocks/v4_constants.py +++ b/src/asammdf/blocks/v4_constants.py @@ -1,4 +1,4 @@ -""" MDF v4 constants """ +"""MDF v4 constants""" import re import struct diff --git a/src/asammdf/gui/widgets/tree.py b/src/asammdf/gui/widgets/tree.py index f87f272d9..caa0f0bfe 100644 --- a/src/asammdf/gui/widgets/tree.py +++ b/src/asammdf/gui/widgets/tree.py @@ -415,7 +415,7 @@ def __init__( self.setHeaderHidden(False) self.setColumnCount(5) - self.setHeaderLabels(["Name", "Value", "Unit", "\u290a", "\u21A8"]) + self.setHeaderLabels(["Name", "Value", "Unit", "\u290a", "\u21a8"]) self.setDragEnabled(True) self.setExpandsOnDoubleClick(False) diff --git a/src/asammdf/mdf.py b/src/asammdf/mdf.py index fa4c2e866..88edef430 100644 --- a/src/asammdf/mdf.py +++ b/src/asammdf/mdf.py @@ -1,4 +1,4 @@ -""" common MDF file format module """ +"""common MDF file format module""" from __future__ import annotations diff --git a/src/asammdf/signal.py b/src/asammdf/signal.py index a7b8a7ecd..9930dc4b6 100644 --- a/src/asammdf/signal.py +++ b/src/asammdf/signal.py @@ -1,4 +1,4 @@ -""" asammdf *Signal* class module for time correct signal processing """ +"""asammdf *Signal* class module for time correct signal processing""" from collections.abc import Iterator import logging diff --git a/src/asammdf/tool.py b/src/asammdf/tool.py index 7415556f5..79d011134 100644 --- a/src/asammdf/tool.py +++ b/src/asammdf/tool.py @@ -1,4 +1,4 @@ -""" asammdf tool module """ +"""asammdf tool module""" from .version import __version__ as v__ diff --git a/src/asammdf/version.py b/src/asammdf/version.py index a7f59830a..cab65423f 100644 --- a/src/asammdf/version.py +++ b/src/asammdf/version.py @@ -1,3 +1,3 @@ -""" asammdf version module """ +"""asammdf version module""" __version__ = "8.1.0.dev6" diff --git a/test/test_cantp.py b/test/test_cantp.py index 37276a6a8..323db1c0f 100644 --- a/test/test_cantp.py +++ b/test/test_cantp.py @@ -10,10 +10,10 @@ class TestCANTP(unittest.TestCase): payload = np.vstack( [ - np.frombuffer(b"\x10\x0B\x52\x49\x47\x20\x20\x39", dtype="uint8"), # Initial part + np.frombuffer(b"\x10\x0b\x52\x49\x47\x20\x20\x39", dtype="uint8"), # Initial part np.frombuffer(b"\x30\xff\x00\x4c\x40\x00\xd5\x54", dtype="uint8"), # Flow control np.frombuffer(b"\x21\x30\x30\x30\x38\x33\x00\x00", dtype="uint8"), # Final (second) part - np.frombuffer(b"\x10\x0B\x52\x49\x47\x20\x20\x39", dtype="uint8"), # Initial part of next frame... + np.frombuffer(b"\x10\x0b\x52\x49\x47\x20\x20\x39", dtype="uint8"), # Initial part of next frame... ] ) ts = np.array([0.112, 0.113, 0.116, 0.201]) diff --git a/test/test_endianess.py b/test/test_endianess.py index e2de2f57e..9a4786130 100644 --- a/test/test_endianess.py +++ b/test/test_endianess.py @@ -47,17 +47,17 @@ def test_mixed(self): def test_not_aligned_mdf_v3(self): t = np.arange(15, dtype="