Skip to content

Commit b733321

Browse files
committed
Merge branch 'development' of https://github.com/danielhrisca/asammdf into development
2 parents 34670f7 + 9a5a8cd commit b733321

19 files changed

+45
-40
lines changed

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
repos:
22
- repo: https://github.com/psf/black-pre-commit-mirror
3-
rev: 24.10.0
3+
rev: 25.1.0
44
hooks:
55
- id: black
66
- repo: https://github.com/astral-sh/ruff-pre-commit

pyproject.toml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@ dependencies = [
4949
decode = ["faust-cchardet==2.1.19", "chardet"]
5050
export = ["pyarrow", "h5py", "hdf5storage>=0.1.19", "python-snappy", "polars"]
5151
testing = ["h5py", "pyarrow", "python-can", "scipy"]
52-
export_matlab_v5 = ["scipy"]
52+
export-matlab-v5 = ["scipy"]
5353
gui = ["natsort", "PySide6", "pyqtgraph", "pyqtlet2[PySide6]", "packaging"]
5454
encryption = ["cryptography", "keyring"]
55-
symbolic_math = ["sympy"]
55+
symbolic-math = ["sympy"]
5656
filesystem = ["fsspec"]
5757

5858
[project.scripts]
@@ -71,10 +71,13 @@ wheel.py-api = "cp39"
7171

7272
[tool.black]
7373
line-length = 120
74-
required-version = "24"
74+
required-version = "25"
7575
target-version = ['py39']
7676
force-exclude = '''
77-
(.*/src/asammdf/gui/ui)|(.*/ext)
77+
(
78+
^/ext |
79+
^/src/asammdf/gui/ui |
80+
)
7881
'''
7982

8083
[tool.coverage]

requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
# Development dependencies
2-
--editable .[decode,encryption,export,export_matlab_v5,filesystem,gui,symbolic_math]
2+
--editable .[decode,encryption,export,export-matlab-v5,filesystem,gui,symbolic-math]
33
--requirement benchmarks/requirements.txt
44
--requirement ci/requirements.txt
55
--requirement doc/requirements.txt
66
--requirement test/requirements.txt
77
--requirement types-requirements.txt
8-
black~=24.1 # Aligned with .pre-commit-config.yaml
8+
black~=25.1 # Aligned with .pre-commit-config.yaml
99
build
1010
mypy~=1.14
1111
pre-commit

run_black_and_ruff.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
pip install --upgrade black~=24.1 ruff~=0.8.0 && ^
1+
pip install --upgrade black~=25.1 ruff~=0.8.0 && ^
22
black --config pyproject.toml . asammdf.spec && ^
33
ruff check --fix

src/asammdf/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
""" asammdf is a parser and editor for ASAM MDF files """
1+
"""asammdf is a parser and editor for ASAM MDF files"""
22

33
import logging
44

src/asammdf/blocks/mdf_v2.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
""" ASAM MDF version 2 file format module """
1+
"""ASAM MDF version 2 file format module"""
22

33
from os import PathLike
44
from typing import Optional, Union

src/asammdf/blocks/mdf_v3.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
""" ASAM MDF version 3 file format module """
1+
"""ASAM MDF version 3 file format module"""
22

33
from collections import defaultdict
44
from collections.abc import Callable, Iterable, Iterator, Sequence

src/asammdf/blocks/v2_v3_blocks.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
""" classes that implement the blocks for MDF versions 2 and 3 """
1+
"""classes that implement the blocks for MDF versions 2 and 3"""
22

33
from collections.abc import Iterator, Sequence
44
from datetime import datetime, timedelta, timezone

src/asammdf/blocks/v2_v3_constants.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
""" MDF v2 and v3 constants """
1+
"""MDF v2 and v3 constants"""
22

33
from collections.abc import Callable
44
import struct

src/asammdf/blocks/v4_constants.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
""" MDF v4 constants """
1+
"""MDF v4 constants"""
22

33
import re
44
import struct

0 commit comments

Comments
 (0)