shepherd-data 2025.6.4__tar.gz → 2025.10.1__tar.gz

{shepherd_data-2025.6.4 → shepherd_data-2025.10.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: shepherd_data
-Version: 2025.6.4
+Version: 2025.10.1
 Summary: Programming- and CLI-Interface for the h5-dataformat of the Shepherd-Testbed
 Author-email: Ingmar Splitt <ingmar.splitt@tu-dresden.de>
 Maintainer-email: Ingmar Splitt <ingmar.splitt@tu-dresden.de>
@@ -22,6 +22,7 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Natural Language :: English
@@ -34,7 +35,7 @@ Requires-Dist: numpy
 Requires-Dist: pandas>=2.0.0
 Requires-Dist: pyYAML
 Requires-Dist: scipy
-Requires-Dist: shepherd-core[inventory]>=2025.06.4
+Requires-Dist: shepherd-core[inventory]>=2025.09.1
 Requires-Dist: tqdm
 Provides-Extra: elf
 Requires-Dist: shepherd-core[elf]; extra == "elf"
@@ -46,6 +47,8 @@ Requires-Dist: shepherd-core[test]; extra == "test"
 Requires-Dist: pytest; extra == "test"
 Requires-Dist: pytest-click; extra == "test"
 Requires-Dist: coverage; extra == "test"
+Provides-Extra: all
+Requires-Dist: shepherd-data[dev,elf,test]; extra == "all"
 
 # Shepherd-Data-Tool
 

{shepherd_data-2025.6.4 → shepherd_data-2025.10.1}/pyproject.toml

@@ -22,6 +22,7 @@ classifiers = [
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
     "License :: OSI Approved :: MIT License",
     "Operating System :: OS Independent",
     "Natural Language :: English",
@@ -36,7 +37,7 @@ dependencies = [
     "pandas>=2.0.0",  # full-version, v2 is OK
     "pyYAML",
     "scipy",   # full-version
-    "shepherd-core[inventory]>=2025.06.4",  # libs are strongly coupled
+    "shepherd-core[inventory]>=2025.09.1",  # libs are strongly coupled
     "tqdm",    # full-version
 ]
 
@@ -56,6 +57,7 @@ test = [
     "pytest-click",
     "coverage",
 ]
+all = ["shepherd-data[elf,dev,test]"]
 
 [project.urls]
 Documentation = "https://github.com/nes-lab/shepherd-tools/blob/main/README.md"

{shepherd_data-2025.6.4 → shepherd_data-2025.10.1}/shepherd_data/__init__.py

@@ -11,7 +11,7 @@ from shepherd_core import Writer
 
 from .reader import Reader
 
-__version__ = "2025.06.4"
+__version__ = "2025.10.1"
 
 __all__ = [
     "Reader",

{shepherd_data-2025.6.4 → shepherd_data-2025.10.1}/shepherd_data/cli.py

@@ -7,13 +7,11 @@ from datetime import datetime
 from pathlib import Path
 
 import click
-import pydantic
+from shepherd_core.logger import set_log_verbose_level
 
 from shepherd_core import get_verbose_level
 from shepherd_core import local_tz
-from shepherd_core.logger import set_log_verbose_level
 
-from . import __version__
 from .reader import Reader
 
 logger = logging.getLogger("SHPData.cli")
@@ -57,17 +55,22 @@ def cli(ctx: click.Context, *, verbose: bool) -> None:
 @cli.command(short_help="Print version-info (combine with -v for more)")
 def version() -> None:
     """Print version-info (combine with -v for more)."""
-    logger.info("Shepherd-Data v%s", __version__)
+    from importlib import metadata  # noqa: PLC0415
+
     logger.debug("Python v%s", sys.version)
-    logger.debug("Click v%s", click.__version__)
-    logger.debug("Pydantic v%s", pydantic.__version__)
+    logger.info("Shepherd-Data v%s", metadata.version("shepherd_data"))
+    logger.debug("Shepherd-Core v%s", metadata.version("shepherd_core"))
+    logger.debug("h5py v%s", metadata.version("h5py"))
+    logger.debug("numpy v%s", metadata.version("numpy"))
+    logger.debug("Click v%s", metadata.version("click"))
+    logger.debug("Pydantic v%s", metadata.version("pydantic"))
 
 
 @cli.command(short_help="Validates a file or directory containing shepherd-recordings")
 @click.argument("in_data", type=click.Path(exists=True, resolve_path=True))
 @click.option(
     "--recurse",
-    "-a",
+    "-R",
     is_flag=True,
     help="Also consider files in sub-folders",
 )
@@ -105,7 +108,7 @@ def validate(in_data: Path, *, recurse: bool = False) -> None:
     "-e",
     default=None,
     type=click.FLOAT,
-    help="End-point in seconds, will be max if omitted",
+    help="End-point in seconds, will be maximum if omitted",
 )
 @click.option(
     "--ds-factor",
@@ -128,7 +131,7 @@ def validate(in_data: Path, *, recurse: bool = False) -> None:
 )
 @click.option(
     "--recurse",
-    "-a",
+    "-R",
     is_flag=True,
     help="Also consider files in sub-folders",
 )
@@ -172,7 +175,7 @@ def extract(
 )
 @click.option(
     "--recurse",
-    "-a",
+    "-R",
     is_flag=True,
     help="Also consider files in sub-folders",
 )
@@ -222,7 +225,7 @@ def extract_meta(
 @click.argument("in_data", type=click.Path(exists=True, resolve_path=True))
 @click.option(
     "--recurse",
-    "-a",
+    "-R",
     is_flag=True,
     help="Also consider files in sub-folders",
 )
@@ -247,7 +250,7 @@ def extract_uart(in_data: Path, *, recurse: bool = False) -> None:
 @click.argument("in_data", type=click.Path(exists=True, resolve_path=True))
 @click.option(
     "--recurse",
-    "-a",
+    "-R",
     is_flag=True,
     help="Also consider files in sub-folders",
 )
@@ -293,7 +296,7 @@ def decode_uart(in_data: Path, *, recurse: bool = False) -> None:
 )  # TODO: also configure decimal point
 @click.option(
     "--recurse",
-    "-a",
+    "-R",
     is_flag=True,
     help="Also consider files in sub-folders",
 )
@@ -342,11 +345,11 @@ def extract_gpio(in_data: Path, separator: str, *, recurse: bool = False) -> Non
     "-e",
     default=None,
     type=click.FLOAT,
-    help="End-point in seconds, will be max if omitted",
+    help="End-point in seconds, will be maximum if omitted",
 )
 @click.option(
     "--recurse",
-    "-a",
+    "-R",
     is_flag=True,
     help="Also consider files in sub-folders",
 )
@@ -394,7 +397,7 @@ def downsample(
     "-e",
     default=None,
     type=click.FLOAT,
-    help="End-point in seconds, will be max if omitted",
+    help="End-point in seconds, will be maximum if omitted",
 )
 @click.option(
     "--width",
@@ -424,10 +427,11 @@ def downsample(
 )
 @click.option(
     "--recurse",
-    "-a",
+    "-R",
     is_flag=True,
     help="Also consider files in sub-folders",
 )
+# TODO: allow SVG-output
 def plot(
     in_data: Path,
     start: float | None,

{shepherd_data-2025.6.4 → shepherd_data-2025.10.1}/shepherd_data/ivonne.py

@@ -19,11 +19,10 @@ from types import TracebackType
 
 import numpy as np
 import pandas as pd
+from shepherd_core.writer import Writer as CoreWriter
 from tqdm import trange
 from typing_extensions import Self
 
-from shepherd_core.writer import Writer as CoreWriter
-
 from .mppt import MPPTracker
 from .mppt import OptimalTracker
 from .mppt import iv_model

{shepherd_data-2025.6.4 → shepherd_data-2025.10.1}/shepherd_data/reader.py

@@ -9,14 +9,14 @@ from pathlib import Path
 import h5py
 import numpy as np
 from matplotlib import pyplot as plt
+from shepherd_core.data_models import EnergyDType
+from shepherd_core.logger import get_verbose_level
+from shepherd_core.logger import log
 from tqdm import trange
 
 from shepherd_core import Reader as CoreReader
 from shepherd_core import Writer as CoreWriter
 from shepherd_core import local_tz
-from shepherd_core.data_models import EnergyDType
-from shepherd_core.logger import get_verbose_level
-from shepherd_core.logger import log
 
 # import samplerate  # noqa: ERA001, TODO: just a test-fn for now
 
@@ -185,19 +185,23 @@ class Reader(CoreReader):
         :param is_time: time is not really down-sampled, but decimated
         :return: resampled h5-dataset or numpy-array
         """
-        from scipy import signal  # here due to massive delay
+        # import only when needed, due to massive delay
+        from scipy import signal  # noqa: PLC0415
 
         if self.get_datatype() == EnergyDType.ivsurface:
             self._logger.warning("Downsampling-Function was not written for IVSurfaces")
         ds_factor = max(1, math.floor(ds_factor))
-
-        if isinstance(end_n, (int, float)):
-            _end_n = min(data_src.shape[0], round(end_n))
+        if not isinstance(start_n, int):
+            raise TypeError("start_n must be an integer")
+        if isinstance(end_n, int):
+            end_n = min(data_src.shape[0], end_n)
+        elif isinstance(end_n, float):
+            raise TypeError("end_n must be an integer")
         else:
-            _end_n = data_src.shape[0]
+            end_n = data_src.shape[0]
 
-        start_n = min(_end_n, round(start_n))
-        data_len = _end_n - start_n  # TODO: one-off to calculation below ?
+        start_n = min(end_n, start_n)
+        data_len = end_n - start_n  # TODO: one-off to calculation below ?
         if data_len == 0:
             self._logger.warning("downsampling failed because of data_len = 0")
             return data_dst
@@ -380,13 +384,17 @@ class Reader(CoreReader):
         if self.get_datatype() == EnergyDType.ivsurface:
             self._logger.warning("Resampling-Function was not written for IVSurfaces")
             return data_dst
-        if isinstance(end_n, (int, float)):
-            _end_n = min(data_src.shape[0], round(end_n))
+        if not isinstance(start_n, int):
+            raise TypeError("start_n must be an integer")
+        if isinstance(end_n, int):
+            end_n = min(data_src.shape[0], end_n)
+        elif isinstance(end_n, float):
+            raise TypeError("end_n must be an integer")
         else:
-            _end_n = data_src.shape[0]
+            end_n = data_src.shape[0]
 
-        start_n = min(_end_n, round(start_n))
-        data_len = _end_n - start_n
+        start_n = min(end_n, start_n)
+        data_len = end_n - start_n
         if data_len == 0:
             self._logger.warning("resampling failed because of data_len = 0")
             return data_dst

{shepherd_data-2025.6.4 → shepherd_data-2025.10.1}/shepherd_data.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: shepherd_data
-Version: 2025.6.4
+Version: 2025.10.1
 Summary: Programming- and CLI-Interface for the h5-dataformat of the Shepherd-Testbed
 Author-email: Ingmar Splitt <ingmar.splitt@tu-dresden.de>
 Maintainer-email: Ingmar Splitt <ingmar.splitt@tu-dresden.de>
@@ -22,6 +22,7 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Natural Language :: English
@@ -34,7 +35,7 @@ Requires-Dist: numpy
 Requires-Dist: pandas>=2.0.0
 Requires-Dist: pyYAML
 Requires-Dist: scipy
-Requires-Dist: shepherd-core[inventory]>=2025.06.4
+Requires-Dist: shepherd-core[inventory]>=2025.09.1
 Requires-Dist: tqdm
 Provides-Extra: elf
 Requires-Dist: shepherd-core[elf]; extra == "elf"
@@ -46,6 +47,8 @@ Requires-Dist: shepherd-core[test]; extra == "test"
 Requires-Dist: pytest; extra == "test"
 Requires-Dist: pytest-click; extra == "test"
 Requires-Dist: coverage; extra == "test"
+Provides-Extra: all
+Requires-Dist: shepherd-data[dev,elf,test]; extra == "all"
 
 # Shepherd-Data-Tool
 

{shepherd_data-2025.6.4 → shepherd_data-2025.10.1}/shepherd_data.egg-info/requires.txt

@@ -5,9 +5,12 @@ numpy
 pandas>=2.0.0
 pyYAML
 scipy
-shepherd-core[inventory]>=2025.06.4
+shepherd-core[inventory]>=2025.09.1
 tqdm
 
+[all]
+shepherd-data[dev,elf,test]
+
 [dev]
 shepherd-core[dev]
 pandas-stubs

{shepherd_data-2025.6.4 → shepherd_data-2025.10.1}/tests/test_cli.py

@@ -1,5 +1,4 @@
 from click.testing import CliRunner
-
 from shepherd_data.cli import cli
 
 

{shepherd_data-2025.6.4 → shepherd_data-2025.10.1}/tests/test_cli_downsample.py

@@ -1,7 +1,6 @@
 from pathlib import Path
 
 from click.testing import CliRunner
-
 from shepherd_data.cli import cli
 
 

{shepherd_data-2025.6.4 → shepherd_data-2025.10.1}/tests/test_cli_extract.py

@@ -1,7 +1,6 @@
 from pathlib import Path
 
 from click.testing import CliRunner
-
 from shepherd_data.cli import cli
 
 

{shepherd_data-2025.6.4 → shepherd_data-2025.10.1}/tests/test_cli_extract_gpio.py

@@ -1,7 +1,6 @@
 from pathlib import Path
 
 from click.testing import CliRunner
-
 from shepherd_data.cli import cli
 
 

{shepherd_data-2025.6.4 → shepherd_data-2025.10.1}/tests/test_cli_extract_meta.py

@@ -1,7 +1,6 @@
 from pathlib import Path
 
 from click.testing import CliRunner
-
 from shepherd_data.cli import cli
 
 

{shepherd_data-2025.6.4 → shepherd_data-2025.10.1}/tests/test_cli_extract_uart.py

@@ -1,7 +1,6 @@
 from pathlib import Path
 
 from click.testing import CliRunner
-
 from shepherd_data.cli import cli
 
 

{shepherd_data-2025.6.4 → shepherd_data-2025.10.1}/tests/test_cli_plot.py

@@ -1,7 +1,6 @@
 from pathlib import Path
 
 from click.testing import CliRunner
-
 from shepherd_data.cli import cli
 
 from .conftest import generate_h5_file

{shepherd_data-2025.6.4 → shepherd_data-2025.10.1}/tests/test_cli_validate.py

@@ -1,7 +1,6 @@
 from pathlib import Path
 
 from click.testing import CliRunner
-
 from shepherd_data.cli import cli
 
 

{shepherd_data-2025.6.4 → shepherd_data-2025.10.1}/tests/test_cli_version.py

@@ -1,7 +1,6 @@
 from pathlib import Path
 
 from click.testing import CliRunner
-
 from shepherd_data.cli import cli
 
 

{shepherd_data-2025.6.4 → shepherd_data-2025.10.1}/tests/test_examples.py

@@ -14,6 +14,7 @@ def example_path() -> Path:
 
 
 examples = [
+    # could be automatic discovery, but this allows ordered exec
     "convert_ivonne.py",
     "extract_logs.py",
     "generate_sawtooth.py",