Merge branch 'development' of https://github.com/danielhrisca/asammdf …

…into test/plot

.github/workflows/main.yml

@@ -12,7 +12,7 @@ jobs:
     strategy:
       matrix:
         os: [ windows-latest, ubuntu-22.04, macos-latest ]
-        python-version: [ "3.9", "3.10", "3.11", "3.12" ]
+        python-version: [ "3.9", "3.10", "3.11", "3.12", "3.13" ]
       fail-fast: false
 
     steps:

benchmarks/bench.py

@@ -829,7 +829,7 @@ def main(text_output, fmt):
     output.append("    * {} groups".format(v4_groups))
     output.append("    * {} channels\n\n".format(v4_channels))
 
-    OPEN, SAVE, GET, CONVERT, MERGE, FILTER, CUT = 1, 1, 1, 1, 1, 0, 0
+    OPEN, SAVE, GET, CONVERT, MERGE, FILTER, CUT = 1, 1, 1, 1, 1, 1, 1
 
     tests = (
         open_mdf3,
@@ -941,9 +941,9 @@ def main(text_output, fmt):
 
     tests = (
         filter_asam,
-        filter_reader4,
-        filter_reader4_compression,
-        filter_reader4_nodata,
+        # filter_reader4,
+        # filter_reader4_compression,
+        # filter_reader4_nodata,
     )
 
     if tests and FILTER:

pyproject.toml

@@ -1,5 +1,5 @@
 [build-system]
-requires = ["numpy", "setuptools", "wheel"]
+requires = ["numpy<2.0", "setuptools", "wheel"]
 build-backend = "setuptools.build_meta"
 
 [tool.black]
@@ -19,7 +19,7 @@ test-requires = "pytest"
 test-command = "pytest {project}/test"
 build-frontend = "build"
 archs = ["auto64"]  # only build for 64bit architectures
-skip = ["pp*", "*_ppc64le", "*-musllinux*", "*_s390x", "cp313*"]   # skip pypy and irrelevant architectures
+skip = ["pp*", "*_ppc64le", "*-musllinux*", "*_s390x"]   # skip pypy and irrelevant architectures
 
 [tool.ruff]
 target-version = "py39"

setup.py

@@ -78,6 +78,7 @@ def _get_ext_modules():
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",
         "Programming Language :: Python :: 3.12",
+        "Programming Language :: Python :: 3.13",
     ],
     # Supported python versions
     python_requires=">=3.9",
@@ -111,7 +112,7 @@ def _get_ext_modules():
         "gui": [
             "lxml>=4.9.2",
             "natsort",
-            "PySide6==6.7.3",
+            "PySide6",
             "pyqtgraph",
             "pyqtlet2",
             "packaging",

src/asammdf/blocks/mdf_v4.py

@@ -350,6 +350,8 @@ def __init__(
 
         progress = kwargs.get("progress", None)
 
+        self._column_storage = False
+
         if name:
             if is_file_like(name):
                 self._file = name
@@ -400,12 +402,13 @@ def __init__(
             self.header = HeaderBlock()
             self.identification = FileIdentificationBlock(version=version)
             self.version = version
-            self.name = Path("__new__.mf4")
 
-        if self.version >= "4.20":
-            self._column_storage = kwargs.get("column_storage", True)
-        else:
-            self._column_storage = False
+            if self.version >= "4.20":
+                self._column_storage = kwargs.get("column_storage", True)
+            else:
+                self._column_storage = False
+
+            self.name = Path("__new__.mf4")
 
         self._parent = None
 
@@ -479,6 +482,11 @@ def _read(self, mapped: bool = False, progress=None) -> None:
         version = self.identification["version_str"]
         self.version = version.decode("utf-8").strip(" \n\t\r\0")
 
+        if self.version >= "4.20":
+            self._column_storage = self._kwargs.get("column_storage", True)
+        else:
+            self._column_storage = False
+
         if self.version >= "4.10":
             # Check for finalization past version 4.10
             finalisation_flags = self._check_finalised()

src/asammdf/gui/widgets/batch.py

@@ -967,6 +967,7 @@ def raster_search(self, event):
                 mdf,
                 show_add_window=False,
                 show_pattern=False,
+                show_apply=True,
                 parent=self,
                 return_names=True,
             )

tox.ini

@@ -5,9 +5,9 @@
 
 [tox]
 isolated_build = true
-envlist = py39, py310, py311, py312, style, doc
+envlist = py39, py310, py311, py312, py313, style, doc
 
-[testenv:{py39,py310,py311,py312}]
+[testenv:{py39,py310,py311,py312,py313}]
 deps =
     -rtest/requirements.txt
     coverage
@@ -42,6 +42,7 @@ python =
     3.10: py310
     3.11: py311
     3.12: py312
+    3.13: py313
 
 [pytest]
 python_classes =