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

shepherd_data-2026.2.1/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2022-2025, Networked Embedded Systems Lab, TU Dresden, Ingmar Splitt
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

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

@@ -1,9 +1,10 @@
 Metadata-Version: 2.4
-Name: shepherd_data
-Version: 2025.10.1
+Name: shepherd-data
+Version: 2026.2.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>
+License-Expression: MIT
 Project-URL: Documentation, https://github.com/nes-lab/shepherd-tools/blob/main/README.md
 Project-URL: Issues, https://pypi.org/project/shepherd-data/issues
 Project-URL: Source, https://pypi.org/project/shepherd-data/
@@ -23,11 +24,11 @@ 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
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
+License-File: LICENSE
 Requires-Dist: click
 Requires-Dist: h5py
 Requires-Dist: matplotlib
@@ -35,7 +36,7 @@ Requires-Dist: numpy
 Requires-Dist: pandas>=2.0.0
 Requires-Dist: pyYAML
 Requires-Dist: scipy
-Requires-Dist: shepherd-core[inventory]>=2025.09.1
+Requires-Dist: shepherd-core[inventory]==2026.02.1
 Requires-Dist: tqdm
 Provides-Extra: elf
 Requires-Dist: shepherd-core[elf]; extra == "elf"
@@ -49,6 +50,7 @@ Requires-Dist: pytest-click; extra == "test"
 Requires-Dist: coverage; extra == "test"
 Provides-Extra: all
 Requires-Dist: shepherd-data[dev,elf,test]; extra == "all"
+Dynamic: license-file
 
 # Shepherd-Data-Tool
 

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

@@ -1,5 +1,5 @@
 [project]
-name = "shepherd_data"
+name = "shepherd-data"
 description = "Programming- and CLI-Interface for the h5-dataformat of the Shepherd-Testbed"
 keywords = ["testbed", "beaglebone", "pru", "batteryless", "energyharvesting", "solar"]
 
@@ -10,7 +10,8 @@ maintainers = [
     {name = "Ingmar Splitt", email = "ingmar.splitt@tu-dresden.de"},
 ]
 
-license = {file = "LICENSE"}
+license = "MIT"
+license-files = ["LICENSE"] # can't be in parent dir
 dynamic = ["version"]
 
 classifiers = [
@@ -23,7 +24,6 @@ classifiers = [
     "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",
 ]
@@ -37,7 +37,7 @@ dependencies = [
     "pandas>=2.0.0",  # full-version, v2 is OK
     "pyYAML",
     "scipy",   # full-version
-    "shepherd-core[inventory]>=2025.09.1",  # libs are strongly coupled
+    "shepherd-core[inventory]==2026.02.1",  # libs are strongly coupled
     "tqdm",    # full-version
 ]
 
@@ -48,7 +48,7 @@ elf = [
 
 dev = [
     "shepherd-core[dev]",
-    "pandas-stubs",  # for pyright with pandas
+    "pandas-stubs",  # for type-checkers
 ]
 
 test = [
@@ -99,12 +99,3 @@ addopts = "-vvv --stepwise" # opts: verbose result for each tests
 
 [tool.coverage.run]
 source = ["shepherd_data"]
-
-[tool.mypy]
-python_version = 3.10
-ignore_missing_imports = true
-disable_error_code = ["call-arg", ]
-exclude = [
-    "build/",
-    ".egg-info/",
-]

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

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

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

@@ -58,12 +58,9 @@ def version() -> None:
     from importlib import metadata  # noqa: PLC0415
 
     logger.debug("Python v%s", sys.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"))
+    logger.info("shepherd-data v%s", metadata.version("shepherd_data"))
+    for package in ["shepherd_core", "h5py", "numpy", "click", "pydantic"]:
+        logger.debug("%s v%s", package, metadata.version(package))
 
 
 @cli.command(short_help="Validates a file or directory containing shepherd-recordings")
@@ -376,8 +373,8 @@ def downsample(
                 else:
                     ds_list = [5, 25, 100, 500, 2_500, 10_000, 50_000, 250_000, 1_000_000]
 
-                for _factor in ds_list:
-                    path_file = shpr.cut_and_downsample_to_file(start, end, _factor)
+                for factor_ in ds_list:
+                    path_file = shpr.cut_and_downsample_to_file(start, end, factor_)
                     logger.info("Created %s", path_file.name)
         except (TypeError, ValueError):  # noqa: PERF203
             logger.exception("ERROR: Will skip file. It caused an exception.")

{shepherd_data-2025.10.1 → shepherd_data-2026.2.1}/shepherd_data/mppt.py

@@ -15,9 +15,12 @@ from shepherd_core import Calc_t
 def iv_model(voltages: Calc_t, coeffs: pd.Series) -> Calc_t:
     """Calculate simple diode based model (equivalent circuit diagram) of a solar panel IV curve.
 
-    :param voltages: Load voltage of the solar panel
-    :param coeffs: three generic coefficients
-    :return: Solar current at given load voltage
+    Args:
+        voltages: Load voltage of the solar panel
+        coeffs: three generic coefficients
+
+    Returns:
+        Solar current at given load voltage
     """
     currents = float(coeffs["a"]) - float(coeffs["b"]) * (
         np.exp(float(coeffs["c"]) * voltages) - 1.0
@@ -75,8 +78,11 @@ class OpenCircuitTracker(MPPTracker):
     def process(self, coeffs: pd.DataFrame) -> pd.DataFrame:
         """Apply harvesting model to input data.
 
-        :param coeffs: ivonne coefficients
-        :return: ivtrace-data
+        Args:
+            coeffs: ivonne coefficients
+
+        Returns:
+             ivtrace-data
         """
         coeffs["icurve"] = coeffs.apply(lambda x: iv_model(self.v_proto, x), axis=1)
         if "voc" not in coeffs.columns:

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

@@ -133,45 +133,45 @@ class Reader(CoreReader):
         show: bool = True,
     ) -> int:
         """Print warning messages from log in data-group."""
-        _count = self.count_errors_in_log(group_name, min_level)
-        if (_count < 1) or ("level" not in self.h5file[group_name]):
+        count = self.count_errors_in_log(group_name, min_level)
+        if (count < 1) or ("level" not in self.h5file[group_name]):
             return 0
         if not show:
-            return _count
+            return count
         self._logger.warning(
             "%s caught %d messages with level>=%d -> first %d are:",
             self.get_hostname(),
-            _count,
+            count,
             min_level,
             limit,
         )
         for idx, time_ns in enumerate(self.h5file[group_name]["time"][:]):
-            _level = self.h5file[group_name]["level"][idx]
-            if _level < min_level:
+            level_ = self.h5file[group_name]["level"][idx]
+            if level_ < min_level:
                 continue
-            _msg = self.h5file[group_name]["message"][idx]
-            _timestamp = datetime.fromtimestamp(time_ns / 1e9, local_tz())
-            if _level < 30:
-                self._logger.info("    %s: %s", _timestamp, _msg)
-            elif _level < 40:
-                self._logger.warning("    %s: %s", _timestamp, _msg)
+            msg_ = self.h5file[group_name]["message"][idx]
+            timestamp_ = datetime.fromtimestamp(time_ns / 1e9, local_tz())
+            if level_ < 30:
+                self._logger.info("    %s: %s", timestamp_, msg_)
+            elif level_ < 40:
+                self._logger.warning("    %s: %s", timestamp_, msg_)
             else:
-                self._logger.error("    %s: %s", _timestamp, _msg)
+                self._logger.error("    %s: %s", timestamp_, msg_)
             limit -= 1
             if limit < 1:
                 break
-        return _count
+        return count
 
     def downsample(
         self,
         data_src: h5py.Dataset | np.ndarray,
-        data_dst: None | h5py.Dataset | np.ndarray,
+        data_dst: h5py.Dataset | np.ndarray | None,
         start_n: int = 0,
         end_n: int | None = None,
         ds_factor: float = 5,
         *,
         is_time: bool = False,
-    ) -> None | h5py.Dataset | np.ndarray:
+    ) -> h5py.Dataset | np.ndarray | None:
         """Sample down iv-data.
 
         Warning: only valid for IV-Stream, not IV-Curves,
@@ -233,7 +233,7 @@ class Reader(CoreReader):
             slice_ds, f_state = signal.sosfilt(filter_, slice_ds, zi=f_state)
 
         output_pos = 0
-        for _iter in trange(
+        for iter_ in trange(
             0,
             iterations,
             desc=f"downsampling {data_src.name if isinstance(data_src, h5py.Dataset) else ''}",
@@ -241,12 +241,12 @@ class Reader(CoreReader):
             disable=iterations < 8,
         ):
             slice_ds = data_src[
-                start_n + _iter * chunk_size_inp : start_n + (_iter + 1) * chunk_size_inp
+                start_n + iter_ * chunk_size_inp : start_n + (iter_ + 1) * chunk_size_inp
             ]
             if not is_time and ds_factor > 1:
                 slice_ds, f_state = signal.sosfilt(filter_, slice_ds, zi=f_state)
             slice_ds = slice_ds[::ds_factor]
-            slice_len = min(dest_len - _iter * chunk_size_out, chunk_size_out, len(slice_ds))
+            slice_len = min(dest_len - iter_ * chunk_size_out, chunk_size_out, len(slice_ds))
             data_dst[output_pos : output_pos + slice_len] = slice_ds[:slice_len]
             # workaround to allow processing last slice (often smaller than expected),
             # wanted: [_iter * chunk_size_out : (_iter + 1) * chunk_size_out]
@@ -363,13 +363,13 @@ class Reader(CoreReader):
     def resample(
         self,
         data_src: h5py.Dataset | np.ndarray,
-        data_dst: None | h5py.Dataset | np.ndarray,
+        data_dst: h5py.Dataset | np.ndarray | None,
         start_n: int = 0,
         end_n: int | None = None,
         samplerate_dst: float = 1000,
         *,
         is_time: bool = False,
-    ) -> None | h5py.Dataset | np.ndarray:
+    ) -> h5py.Dataset | np.ndarray | None:
         """Up- or down-sample the original trace-data.
 
         :param data_src: original iv-data
@@ -518,7 +518,7 @@ class Reader(CoreReader):
             "end_s": end_s,
         }
         if relative_timestamp:
-            data["time"] = data["time"] - self._cal.time.raw_to_si(self.ds_time[0])
+            data["time"] -= self._cal.time.raw_to_si(self.ds_time[0])
         return data
 
     @staticmethod

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

@@ -1,9 +1,10 @@
 Metadata-Version: 2.4
-Name: shepherd_data
-Version: 2025.10.1
+Name: shepherd-data
+Version: 2026.2.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>
+License-Expression: MIT
 Project-URL: Documentation, https://github.com/nes-lab/shepherd-tools/blob/main/README.md
 Project-URL: Issues, https://pypi.org/project/shepherd-data/issues
 Project-URL: Source, https://pypi.org/project/shepherd-data/
@@ -23,11 +24,11 @@ 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
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
+License-File: LICENSE
 Requires-Dist: click
 Requires-Dist: h5py
 Requires-Dist: matplotlib
@@ -35,7 +36,7 @@ Requires-Dist: numpy
 Requires-Dist: pandas>=2.0.0
 Requires-Dist: pyYAML
 Requires-Dist: scipy
-Requires-Dist: shepherd-core[inventory]>=2025.09.1
+Requires-Dist: shepherd-core[inventory]==2026.02.1
 Requires-Dist: tqdm
 Provides-Extra: elf
 Requires-Dist: shepherd-core[elf]; extra == "elf"
@@ -49,6 +50,7 @@ Requires-Dist: pytest-click; extra == "test"
 Requires-Dist: coverage; extra == "test"
 Provides-Extra: all
 Requires-Dist: shepherd-data[dev,elf,test]; extra == "all"
+Dynamic: license-file
 
 # Shepherd-Data-Tool
 

{shepherd_data-2025.10.1 → shepherd_data-2026.2.1}/shepherd_data.egg-info/SOURCES.txt

@@ -1,3 +1,4 @@
+LICENSE
 README.md
 pyproject.toml
 shepherd_data/__init__.py

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

@@ -5,7 +5,7 @@ numpy
 pandas>=2.0.0
 pyYAML
 scipy
-shepherd-core[inventory]>=2025.09.1
+shepherd-core[inventory]==2026.02.1
 tqdm
 
 [all]

{shepherd_data-2025.10.1 → shepherd_data-2026.2.1}/tests/test_ivonne.py

@@ -20,21 +20,22 @@ def test_convert_ivonne(tmp_path: Path, example_path: Path) -> None:
     ivc_path = tmp_path / (input_file + "_ivc.h5")
     voc_path = tmp_path / (input_file + "_voc.h5")
     opt_path = tmp_path / (input_file + "_opt.h5")
+    duration = 6
 
     with ivonne.Reader(inp_path) as ifr:
-        ifr.upsample_2_isc_voc(isc_path, duration_s=20)
-        ifr.convert_2_ivsurface(ivc_path, duration_s=20)
+        ifr.upsample_2_isc_voc(isc_path, duration_s=duration)
+        ifr.convert_2_ivsurface(ivc_path, duration_s=duration)
 
         tr_voc = mppt.OpenCircuitTracker(ratio=0.76)
         tr_opt = mppt.OptimalTracker()
 
-        ifr.convert_2_ivtrace(voc_path, tracker=tr_voc, duration_s=20)
-        ifr.convert_2_ivtrace(opt_path, tracker=tr_opt, duration_s=20)
+        ifr.convert_2_ivtrace(voc_path, tracker=tr_voc, duration_s=duration)
+        ifr.convert_2_ivtrace(opt_path, tracker=tr_opt, duration_s=duration)
 
     energies = {}
     for file_path in [isc_path, ivc_path, voc_path, opt_path]:
         with Reader(file_path) as sfr:
-            assert sfr.runtime_s == 20
+            assert sfr.runtime_s == duration
             energies[file_path.stem[-3:]] = sfr.energy()
 
     assert energies["isc"] > energies["opt"]