shepherd-core 2023.10.3__py3-none-any.whl → 2023.12.1__py3-none-any.whl

shepherd_core/testbed_client/fixtures.py

@@ -148,16 +148,12 @@ class Fixture:
     def query_id(self, _id: int) -> dict:
         if isinstance(_id, int) and _id in self.elements_by_id:
             return self.elements_by_id[_id]
-        raise ValueError(
-            f"Initialization of {self.model_type} by ID failed - {_id} is unknown!"
-        )
+        raise ValueError(f"Initialization of {self.model_type} by ID failed - {_id} is unknown!")
 
     def query_name(self, name: str) -> dict:
         if isinstance(name, str) and name.lower() in self.elements_by_name:
             return self.elements_by_name[name.lower()]
-        raise ValueError(
-            f"Initialization of {self.model_type} by name failed - {name} is unknown!"
-        )
+        raise ValueError(f"Initialization of {self.model_type} by name failed - {name} is unknown!")
 
 
 def file_older_than(file: Path, delta: timedelta) -> bool:
@@ -172,7 +168,7 @@ class Fixtures:
     suffix = ".yaml"
 
     @validate_call
-    def __init__(self, file_path: Optional[Path] = None) -> None:
+    def __init__(self, file_path: Optional[Path] = None, *, reset: bool = False) -> None:
         if file_path is None:
             self.file_path = Path(__file__).parent.parent.resolve() / "data_models"
         else:
@@ -180,7 +176,7 @@ class Fixtures:
         self.components: Dict[str, Fixture] = {}
         save_path = self.file_path / "fixtures.pickle"
 
-        if save_path.exists() and not file_older_than(save_path, timedelta(hours=24)):
+        if save_path.exists() and not file_older_than(save_path, timedelta(hours=24)) and not reset:
             # speedup
             with save_path.open("rb", buffering=-1) as fd:
                 self.components = pickle.load(fd)  # noqa: S301

shepherd_core/testbed_client/user_model.py

@@ -19,9 +19,7 @@ from ..data_models.base.shepherd import ShpModel
 
 
 @validate_call
-def hash_password(
-    pw: Annotated[str, StringConstraints(min_length=20, max_length=100)]
-) -> bytes:
+def hash_password(pw: Annotated[str, StringConstraints(min_length=20, max_length=100)]) -> bytes:
     # TODO: add salt of testbed -> this fn should be part of Testbed-Object
     # NOTE: 1M Iterations need 25s on beaglebone
     return pbkdf2_hmac(

shepherd_core/vsource/virtual_converter_model.py

@@ -52,9 +52,7 @@ class VirtualConverterModel:
         self.V_input_uV: float = 0.0
         self.P_inp_fW: float = 0.0
         self.P_out_fW: float = 0.0
-        self.interval_startup_disabled_drain_n: int = (
-            self._cfg.interval_startup_delay_drain_n
-        )
+        self.interval_startup_disabled_drain_n: int = self._cfg.interval_startup_delay_drain_n
 
         # container for the stored energy
         self.V_mid_uV: float = self._cfg.V_intermediate_init_uV
@@ -71,12 +69,8 @@ class VirtualConverterModel:
 
         # prepare hysteresis-thresholds
         self.dV_enable_output_uV: float = self._cfg.dV_enable_output_uV
-        self.V_enable_output_threshold_uV: float = (
-            self._cfg.V_enable_output_threshold_uV
-        )
-        self.V_disable_output_threshold_uV: float = (
-            self._cfg.V_disable_output_threshold_uV
-        )
+        self.V_enable_output_threshold_uV: float = self._cfg.V_enable_output_threshold_uV
+        self.V_disable_output_threshold_uV: float = self._cfg.V_disable_output_threshold_uV
 
         if self.dV_enable_output_uV > self.V_enable_output_threshold_uV:
             self.V_enable_output_threshold_uV = self.dV_enable_output_uV
@@ -163,11 +157,7 @@ class VirtualConverterModel:
 
         if self.V_mid_uV > self._cfg.V_intermediate_max_uV:
             self.V_mid_uV = self._cfg.V_intermediate_max_uV
-        if (
-            (not self.enable_boost)
-            and (self.P_inp_fW > 0.0)
-            and (self.V_mid_uV > self.V_input_uV)
-        ):
+        if (not self.enable_boost) and (self.P_inp_fW > 0.0) and (self.V_mid_uV > self.V_input_uV):
             # TODO: obfuscated - no "direct connection"?
             self.V_mid_uV = self.V_input_uV
         elif self.V_mid_uV < 1:

shepherd_core/vsource/virtual_harvester_model.py

@@ -93,9 +93,7 @@ class VirtualHarvesterModel:
             if distance_now < distance_last and distance_now < self.voltage_step_x4_uV:
                 self.voltage_hold = _voltage_uV
                 self.current_hold = _current_nA
-            elif (
-                distance_last < distance_now and distance_last < self.voltage_step_x4_uV
-            ):
+            elif distance_last < distance_now and distance_last < self.voltage_step_x4_uV:
                 self.voltage_hold = self.voltage_last
                 self.current_hold = self.current_last
 

shepherd_core/vsource/virtual_source_model.py

@@ -37,9 +37,7 @@ class VirtualSourceModel:
         cnv_config = ConverterPRUConfig.from_vsrc(
             self.cfg_src, log_intermediate_node=log_intermediate
         )
-        self.cnv: VirtualConverterModel = VirtualConverterModel(
-            cnv_config, self._cal_pru
-        )
+        self.cnv: VirtualConverterModel = VirtualConverterModel(cnv_config, self._cal_pru)
 
         hrv_config = HarvesterPRUConfig.from_vhrv(
             self.cfg_src.harvester,
@@ -53,9 +51,7 @@ class VirtualSourceModel:
         self.W_inp_fWs: float = 0.0
         self.W_out_fWs: float = 0.0
 
-    def iterate_sampling(
-        self, V_inp_uV: int = 0, I_inp_nA: int = 0, I_out_nA: int = 0
-    ) -> int:
+    def iterate_sampling(self, V_inp_uV: int = 0, I_inp_nA: int = 0, I_out_nA: int = 0) -> int:
         """TEST-SIMPLIFICATION - code below is not part of pru-code,
         but in part sample_emulator() in sampling.c
 

shepherd_core/writer.py

@@ -39,9 +39,7 @@ def path2str(
 
 
 def time2int(dumper: Dumper, data: timedelta) -> ScalarNode:
-    return dumper.represent_scalar(
-        "tag:yaml.org,2002:int", str(int(data.total_seconds()))
-    )
+    return dumper.represent_scalar("tag:yaml.org,2002:int", str(int(data.total_seconds())))
 
 
 yaml.add_representer(pathlib.PosixPath, path2str, SafeDumper)
@@ -130,23 +128,20 @@ class Writer(Reader):
             base_dir = file_path.resolve().parents[0]
             self.file_path = unique_path(base_dir / file_path.stem, file_path.suffix)
             self._logger.warning(
-                "File '%s' already exists -> " "storing under '%s' instead",
+                "File '%s' already exists -> storing under '%s' instead",
                 file_path,
                 self.file_path.name,
             )
 
         if isinstance(mode, str) and mode not in self.mode_dtype_dict:
-            raise ValueError(
-                f"Can't handle mode '{mode}' " f"(choose one of {self.mode_dtype_dict})"
-            )
+            raise ValueError(f"Can't handle mode '{mode}' (choose one of {self.mode_dtype_dict})")
 
         _dtypes = self.mode_dtype_dict[mode if mode else self.mode_default]
         if isinstance(datatype, str):
             datatype = EnergyDType[datatype]
         if isinstance(datatype, EnergyDType) and datatype not in _dtypes:
             raise ValueError(
-                f"Can't handle value '{datatype}' of datatype "
-                f"(choose one of {_dtypes})"
+                f"Can't handle value '{datatype}' of datatype (choose one of {_dtypes})"
             )
 
         if self._modify:
@@ -158,9 +153,7 @@ class Writer(Reader):
             self._datatype = (
                 datatype if isinstance(datatype, EnergyDType) else self.datatype_default
             )
-            self._window_samples = (
-                window_samples if isinstance(window_samples, int) else 0
-            )
+            self._window_samples = window_samples if isinstance(window_samples, int) else 0
 
         if isinstance(cal_data, (CalEmu, CalHrv)):
             self._cal = CalSeries.from_cal(cal_data)
@@ -181,9 +174,7 @@ class Writer(Reader):
 
         # show key parameters for h5-performance
         settings = list(self.h5file.id.get_access_plist().get_cache())
-        self._logger.debug(
-            "H5Py Cache_setting=%s (_mdc, _nslots, _nbytes, _w0)", settings
-        )
+        self._logger.debug("H5Py Cache_setting=%s (_mdc, _nslots, _nbytes, _w0)", settings)
 
         # Store the mode in order to allow user to differentiate harvesting vs emulation data
         if isinstance(self._mode, str) and self._mode in self.mode_dtype_dict:
@@ -257,9 +248,7 @@ class Writer(Reader):
             compression=self._compression,
         )
         grp_data["time"].attrs["unit"] = "s"
-        grp_data["time"].attrs[
-            "description"
-        ] = "system time [s] = value * gain + (offset)"
+        grp_data["time"].attrs["description"] = "system time [s] = value * gain + (offset)"
 
         grp_data.create_dataset(
             "current",
@@ -309,7 +298,7 @@ class Writer(Reader):
         else:
             raise ValueError("timestamp-data was not usable")
 
-        len_old = self.ds_time.shape[0]
+        len_old = self.ds_voltage.shape[0]
 
         # resize dataset
         self.ds_time.resize((len_old + len_new,))
@@ -346,15 +335,15 @@ class Writer(Reader):
     def _align(self) -> None:
         """Align datasets with buffer-size of shepherd"""
         self._refresh_file_stats()
-        n_buff = self.ds_time.size / self.samples_per_buffer
+        n_buff = self.ds_voltage.size / self.samples_per_buffer
         size_new = int(math.floor(n_buff) * self.samples_per_buffer)
-        if size_new < self.ds_time.size:
+        if size_new < self.ds_voltage.size:
             if self.samplerate_sps != samplerate_sps_default:
                 self._logger.debug("skipped alignment due to altered samplerate")
                 return
             self._logger.info(
                 "aligning with buffer-size, discarding last %d entries",
-                self.ds_time.size - size_new,
+                self.ds_voltage.size - size_new,
             )
             self.ds_time.resize((size_new,))
             self.ds_voltage.resize((size_new,))

{shepherd_core-2023.10.3.dist-info → shepherd_core-2023.12.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: shepherd-core
-Version: 2023.10.3
+Version: 2023.12.1
 Summary: Programming- and CLI-Interface for the h5-dataformat of the Shepherd-Testbed
 Home-page: https://pypi.org/project/shepherd-core/
 Author: Ingmar Splitt, Kai Geissdoerfer
@@ -42,9 +42,6 @@ Requires-Dist: requests
 Requires-Dist: pyelftools
 Requires-Dist: zstandard
 Provides-Extra: dev
-Requires-Dist: black ; extra == 'dev'
-Requires-Dist: pylint ; extra == 'dev'
-Requires-Dist: flake8 ; extra == 'dev'
 Requires-Dist: twine ; extra == 'dev'
 Requires-Dist: pre-commit ; extra == 'dev'
 Requires-Dist: pyright ; extra == 'dev'
@@ -64,7 +61,7 @@ Requires-Dist: coverage ; extra == 'test'
 [![PyPiVersion](https://img.shields.io/pypi/v/shepherd_core.svg)](https://pypi.org/project/shepherd_core)
 [![image](https://img.shields.io/pypi/pyversions/shepherd_core.svg)](https://pypi.python.org/pypi/shepherd-core)
 [![Pytest](https://github.com/orgua/shepherd-datalib/actions/workflows/py_unittest.yml/badge.svg)](https://github.com/orgua/shepherd-datalib/actions/workflows/py_unittest.yml)
-[![CodeStyle](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
+[![CodeStyle](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff)
 
 **Documentation**: <https://orgua.github.io/shepherd/external/shepherd_core.html>
 
@@ -93,6 +90,20 @@ For postprocessing shepherds .h5-files users want to use [shepherd_data](https:/
 
 See [examples](https://github.com/orgua/shepherd-datalib/tree/main/shepherd_core/examples) for more details and usage. Most functionality is showcased there. The [extra](https://github.com/orgua/shepherd-datalib/tree/main/shepherd_core/extra)-directory holds data-generators relevant for the testbed. Notably is a trafficbench-experiment that's used to derive the link-matrix.
 
+### Compatibility
+
+| OS      |   PyVersion  | Comment                                    |
+|---------|--------------|--------------------------------------------|
+| Ubuntu  | 3.8 - 3.12   |                                            |
+| Windows | 3.8 - 3.12   | no support for elf and hex-conversions yet |
+| MacOS   | 3.8 - 3.12   | hex-conversion missing                     |
+
+Notes:
+- hex-conversion needs a working and accessible objcopy
+- elf-supports needs
+  - ``shepherd-core[elf]`` installs ``pwntools-elf-only``
+  - most elf-features also still utilize hex-conversion
+
 ### Data-Models in Detail
 
 - new orchestration ``/data-models`` with focus on remote shepherd-testbed

{shepherd_core-2023.10.3.dist-info → shepherd_core-2023.12.1.dist-info}/RECORD

@@ -1,16 +1,16 @@
-shepherd_core/__init__.py,sha256=uqGKDFbN1N7oot8zczOtlcIUhR1D3HzFt75eUAfbXZM,1347
+shepherd_core/__init__.py,sha256=M5Zl1foAX-m7EVEVTgv9PtIY00FwE0CopdFfmhLEBeE,1347
 shepherd_core/calibration_hw_def.py,sha256=VBPgekKtoA6xc5pLOADGdAIuJUNz5kdDf3pm3A13F0U,2158
 shepherd_core/commons.py,sha256=8HLrOq30Zrgh0AcrtakJYyu3hwMgQks7mF7JyaBMcdw,170
-shepherd_core/logger.py,sha256=xKdRmdy9_V7f5suYTHD3CzLKoM0E3-seXj7bOAaHMJ0,1662
-shepherd_core/reader.py,sha256=QvT__klOXUa8kd_cOk4zq_Jg5PjLG9dEcP4MzyM4zeA,25400
-shepherd_core/writer.py,sha256=otDVKz8gFJZXQE1kljnCSL-6WJSXr9KrVfCwsVSMX8c,14487
+shepherd_core/logger.py,sha256=mIJQ5eCpamsCnc_R7qoceYVXe8JM4-YZriqfzvTt9Yk,1656
+shepherd_core/reader.py,sha256=mjBNWnDfsbTxlzhfPJYfcZdySCPO4K1Ub098T8RI0rI,26064
+shepherd_core/writer.py,sha256=hnaC7Jy82lQDln-3ZXWLdmXUO1mgD8s16K89lBbKCew,14352
 shepherd_core/data_models/__init__.py,sha256=mem0m4nZY3EgG1ctBdGGGt128lhmglF9a4e5w9OGJu0,1651
 shepherd_core/data_models/doc_virtual_source.py,sha256=KizMcfGKj7BnHIbaJHT7KeTF01SV__UXv01qV_DGHSs,6057
 shepherd_core/data_models/base/__init__.py,sha256=ugVEWXfYRCmK4o94RG4N_GKR7AbBQLfn5PCbEKVpZMU,44
 shepherd_core/data_models/base/cal_measurement.py,sha256=ZlSnHXOiY--AzQ1-g0BnU7I4g9sMDqF3g52jsl5IHDY,2873
 shepherd_core/data_models/base/calibration.py,sha256=5Xn5p9uNaOw9mdO1ZsulpMP0rwDIMcJPf5-Cp5CnRq0,9709
-shepherd_core/data_models/base/content.py,sha256=IsNiwTtR0UFOMmYKOCMNoTJuzX5lPNfRaTMjFb2XQPo,1964
-shepherd_core/data_models/base/shepherd.py,sha256=rsR55-SGGSnrr-K0GyTuU_TjG2G0lBqe9toneHj7-fk,5784
+shepherd_core/data_models/base/content.py,sha256=4k3D14m6h681QQjJFsG7Xgr4R64d21JEWKJWOnVVVck,1925
+shepherd_core/data_models/base/shepherd.py,sha256=5kQNZdhF53u9S4wLadbm_73mB9VTzgHyrm6LG_KheWc,5748
 shepherd_core/data_models/base/timezone.py,sha256=OBzPPfrD__z1aTO7qlVWD1uD8eZFJ6CoDLac_mTrYCg,443
 shepherd_core/data_models/base/wrapper.py,sha256=mzAMdX9-BeSAeTzlWKFnjj3v2wV6NJgaSHULFHEiWes,600
 shepherd_core/data_models/content/__init__.py,sha256=JLj2zzjDeyqLrz9KiWDMW1shCeJjj676zjcXj8ly10Y,545
@@ -21,58 +21,58 @@ shepherd_core/data_models/content/firmware.py,sha256=cuh8tURI39ZzTF-wuh4ofsNfRC1
 shepherd_core/data_models/content/firmware_datatype.py,sha256=WHVJu-LIP_snjeITIKkuZo7aIapoTIZeFXkUNqyEqy8,154
 shepherd_core/data_models/content/virtual_harvester.py,sha256=5obXW17uBkQdfyPnpJHoSZmlIBUefoDGmFLYrxUSmOA,9268
 shepherd_core/data_models/content/virtual_harvester_fixture.yaml,sha256=UWlXq-7lsyhHAkrKkyEHWdJ0fIlyy_jwSV9O_hVE2nY,4294
-shepherd_core/data_models/content/virtual_source.py,sha256=3M3SdE-DxvtDsDX1aFwvwqb_tgaEKmFDVLzI9fWeZWs,14360
+shepherd_core/data_models/content/virtual_source.py,sha256=0CucbyBh-r5I4UJNJayW9fKNwb6dI97iaE5MLYxrZMc,13960
 shepherd_core/data_models/content/virtual_source_fixture.yaml,sha256=2PsWP3-xad5TycZ-OQn23WsJdYwq7_9_foC4wBFYmK0,10443
 shepherd_core/data_models/experiment/__init__.py,sha256=DX9kylCe8zFm4PpVT8YS4csip7-MDoSrdah3nhBdiJE,651
-shepherd_core/data_models/experiment/experiment.py,sha256=PoEImOQF1J6jSydWPIk_wXZbO3Z3MNyPfeNSqBVf-P4,4042
-shepherd_core/data_models/experiment/observer_features.py,sha256=tFzL-EcWf1z_RT7tx-IpkEiRRbKsEcRJKibG-kk9mmw,5020
-shepherd_core/data_models/experiment/target_config.py,sha256=1CTT9ovR6ifASWKsIZQwPcs84Vj1LdPCxKa4crReyX4,3618
-shepherd_core/data_models/task/__init__.py,sha256=oBhMSrQmRFQEsCT-U5ojS0igsf54kAqRBGPoRVhULU8,3216
-shepherd_core/data_models/task/emulation.py,sha256=M4GdvsnwbzWLxiqq7H_PwkgNYzfdjJVpcSEZa8Pnhks,6242
-shepherd_core/data_models/task/firmware_mod.py,sha256=f2KV0LRId4_lmVtV6aV6ezx4WbF_YyZnngFgGEBVLVA,2760
-shepherd_core/data_models/task/harvest.py,sha256=EttmTINix80whPghalCo7zVJ9vonuez8N8qhuSRFBoo,3284
+shepherd_core/data_models/experiment/experiment.py,sha256=LY0uIaFGAzPta0fbCy-gSxlUe90ztZdc4CqVwzc_mIU,3971
+shepherd_core/data_models/experiment/observer_features.py,sha256=chK9PJ3KCS_jfd28GAfM73V-EI2c1WJM1cAAS20nIj0,4984
+shepherd_core/data_models/experiment/target_config.py,sha256=IBWxf3yVF5dUBi7mS5mJXfN1rL2S7QYhu_4IL6u6Yig,3532
+shepherd_core/data_models/task/__init__.py,sha256=g0l4dtIgTPKhfFvnClJrCm3zLFiZpBVbbQ2f4gzdwK0,3180
+shepherd_core/data_models/task/emulation.py,sha256=HE7L3GWKdsAkUPgvdDHxYJG92GNodP9CUEtKgQJghjA,6221
+shepherd_core/data_models/task/firmware_mod.py,sha256=8uXMFVk3Z96gUW0gVY95VeUx-YtZnMc2yw3paC5S5Mw,2730
+shepherd_core/data_models/task/harvest.py,sha256=QcNJjgixiq70NogdcYXwpj91_6Jl7s7CaAnEw_xEWck,3254
 shepherd_core/data_models/task/observer_tasks.py,sha256=cwFBdoUESE5zcOuky35lmd6uKFaQkGiW8kNFHir1z1g,3380
 shepherd_core/data_models/task/programming.py,sha256=uO6IZR8wb0N3791QgAZE7AF0CB7XoyOkFBiDH395IvE,2244
 shepherd_core/data_models/task/testbed_tasks.py,sha256=W8ElhxOjNrTFG9A1WKGrjhNnyLxmvJgM06DwLyBbayQ,1771
 shepherd_core/data_models/testbed/__init__.py,sha256=kQG0EUqJ5ylGRuwYZTbppWue9zDcSytpsHtUnohbGgA,566
 shepherd_core/data_models/testbed/cape.py,sha256=Y9QDQcJ76IFPMVgiIw5pFztDd1y7RUiDhrsjVqHj6jM,1154
-shepherd_core/data_models/testbed/cape_fixture.yaml,sha256=aft2kSxIrOVAIIaJLiRpOMRTRxETInH3C1LYoLnQ3mM,2053
+shepherd_core/data_models/testbed/cape_fixture.yaml,sha256=uwZxe6hsqvofn5tzg4sffjbVtTVUkextL1GCri_z2A4,2197
 shepherd_core/data_models/testbed/gpio.py,sha256=pzgRpo9QXL2lyqeov_o1Sr3_5r4T8NS7-Q6rOYnbVR4,2100
 shepherd_core/data_models/testbed/gpio_fixture.yaml,sha256=yXvoXAau2hancKi2yg1xIkErPWQa6gIxNUG3y8JuF9Y,3076
 shepherd_core/data_models/testbed/mcu.py,sha256=JHVVOYkhvhwYG5z5nUXdiVVXVcRNrAfqefaS56E4RWM,1301
 shepherd_core/data_models/testbed/mcu_fixture.yaml,sha256=lRZMLs27cTeERSFGkbMt5xgxbn11Gh9G1mQqOZK136I,522
-shepherd_core/data_models/testbed/observer.py,sha256=UHF8vuWtG0KiGAEPEszzUDhWP41ijWvkxaXx7prlRe8,3298
-shepherd_core/data_models/testbed/observer_fixture.yaml,sha256=YmNMHcXLTjhGfv-F8KgdAmG3IAIHmrLqRalZWP72pEM,4082
+shepherd_core/data_models/testbed/observer.py,sha256=hivbfME16o-M7LwBto4hvNA9X_prGgs0FdH39cve4Mo,3110
+shepherd_core/data_models/testbed/observer_fixture.yaml,sha256=f6UjGFCsMlqtgfsThd_BfwcgpjI3LB4oPt_GNwBHWRI,4806
 shepherd_core/data_models/testbed/target.py,sha256=wIjeqXlYkDv24S1iSswyLrpSWsI_J78MnmNVk2KGpT0,1776
-shepherd_core/data_models/testbed/target_fixture.yaml,sha256=Xtfysqs_1RjmfiyUa_-t4u-S-IFx4kuFnWW9Oa7lC9Q,3349
-shepherd_core/data_models/testbed/testbed.py,sha256=LQ-hvYQKTjX-xKp5g1Re741NEGZD8iu5tDbl-TjbjFU,3296
-shepherd_core/data_models/testbed/testbed_fixture.yaml,sha256=c2qsGEPebbSmiOT85ruFNWfNa8iWiC2YDPGfmu3Wy2A,670
+shepherd_core/data_models/testbed/target_fixture.yaml,sha256=rgWCwCpPXzaEoUzMDxkb7dgH-4gW2qffUuAC78JkNQk,3667
+shepherd_core/data_models/testbed/testbed.py,sha256=RY_YHwWuZdMWzZB5mYwgborycvnCrNdMyFB5Ou2Zrek,3274
+shepherd_core/data_models/testbed/testbed_fixture.yaml,sha256=9i2cmYRrHOHTJG9zp40h8h0LgO9DdrCJz8tyGdiQCzc,714
 shepherd_core/decoder_waveform/__init__.py,sha256=HEdjRcm3m4ySEXpJ_D3lZqnxiuobJqC8axZAaAHBwDk,43
-shepherd_core/decoder_waveform/uart.py,sha256=qUUBnjtRPZyjinP-qlnLURZvuH5Fxe138c-E-p_SiwA,10904
-shepherd_core/fw_tools/__init__.py,sha256=nXGS1wVPYbzAN6xCF0FAqUYw0EZvOe4DZ7wD-NDqUY4,2085
-shepherd_core/fw_tools/converter.py,sha256=cWeotgNsRaTlGPwQdyQ7f4r1pH10GDnUnwqXsAvUiuM,3345
+shepherd_core/decoder_waveform/uart.py,sha256=EumQv4wTWDvz4-0vhFx9vCI0PLDsOFmSU9473TxmH_M,10671
+shepherd_core/fw_tools/__init__.py,sha256=9W-MXU5j3iJ8AgRzoGUaljD0bN29jh8LtY-pyj5HWbY,2071
+shepherd_core/fw_tools/converter.py,sha256=2g0CZBZLn-CfUTpJljghf8AEpjIt4X7Q1FoCTsmx3A0,3273
 shepherd_core/fw_tools/converter_elf.py,sha256=SEkrPuYUsr1VICDlZiZzr0B1njWcl9mW3J_oZk32Sb4,1008
-shepherd_core/fw_tools/patcher.py,sha256=o76As0SuxEz9NKg1R8qRWEiFBTwUK7kQmv_ayu6_4D4,3830
-shepherd_core/fw_tools/validation.py,sha256=ckooeOWjE9EaHFmGTe5GnBfiqlzPvmdDxGboOhOAgYY,4174
-shepherd_core/inventory/__init__.py,sha256=IyErH3iyVl39inLWaoTzpN9CZrbejF1dcKwF8KJT5Ig,1922
-shepherd_core/inventory/python.py,sha256=FWppF_XZC_xaxJZZU1JO812Prtq9NaA8kzYBdGNo3xM,1107
-shepherd_core/inventory/system.py,sha256=GijkDgmhlQhsPgAqI-sM6ZNGXN56JufTdwi3MWcmz2g,1952
+shepherd_core/fw_tools/patcher.py,sha256=nXgYKGQjcEE4IYd8yNl4-t5kjlB43iFdp24oYlEaras,3774
+shepherd_core/fw_tools/validation.py,sha256=aVfMiv8gX6rWOtj9IIAEiqh6APH2_DNWwueSyPJztro,4262
+shepherd_core/inventory/__init__.py,sha256=0qkTGMMuHUOg5sn4gNOB8XcKhF75fTC7DzRh9aN4soQ,1856
+shepherd_core/inventory/python.py,sha256=Ar_M4cmmQgViY4caU5XH9Iye5X3jNFDnJiWGaZwNpo4,1168
+shepherd_core/inventory/system.py,sha256=Mmd5TieS3mnPSF2L_HSpjdA7mbTe8Wquduz28OJjD1Q,1930
 shepherd_core/inventory/target.py,sha256=XywiKmDpYKIBQt1Jo_k3bJeCOKxnzy5ob_9PYdFrjGE,421
 shepherd_core/testbed_client/__init__.py,sha256=V38uxXOhwB8tlAjR0jH1MPSWB1LltwC0g8ipwaIyC9o,103
-shepherd_core/testbed_client/client.py,sha256=4mg1_p9eGiKGfvR-haLnNC4r9-7ifSRZljhQZje3lHg,5933
-shepherd_core/testbed_client/fixtures.py,sha256=Os7LFYQfTn6jOJKN-NW8l6wr9l0pKgvV-4knJA8ZsC0,9084
-shepherd_core/testbed_client/user_model.py,sha256=HL-NP6YBhYLv_b-B6xeiA9q7A1zHsPT3YE5rqvc-S0g,1984
+shepherd_core/testbed_client/client.py,sha256=geqj1brDvzsAtriDFSyLCAHZfMPKwch8TSpLHw5sLXM,5785
+shepherd_core/testbed_client/fixtures.py,sha256=W-lTy5y4wPYfOBVGotRVxLAt72jCNTWqC_kePe06xys,9078
+shepherd_core/testbed_client/user_model.py,sha256=MU_k6j_c_Y6JILDcu9iN2kNERoxS4UwaGuj5dlnlUqo,1978
 shepherd_core/vsource/__init__.py,sha256=x84_0M8Dg8R7DLKE5zyNAAGFiuOHPehDOWPt2KeBhKw,344
-shepherd_core/vsource/virtual_converter_model.py,sha256=FfctW3xgD-LnPYGrr_J6m6F4yLVS8TWWAHs31OJCQDs,10451
-shepherd_core/vsource/virtual_harvester_model.py,sha256=jAx4lq1tT30Ec53W46xG6aEvJ0di_fQ8LTnFdmVQVyI,7795
-shepherd_core/vsource/virtual_source_model.py,sha256=rrdY7Rsn7BHNYWQRld6TLBBzZ31G1OheCWRWHDizIYM,2759
+shepherd_core/vsource/virtual_converter_model.py,sha256=gT-eKQCcroc2EIzSa2O9HGArsM_JKhx2CKJjuKUyiak,10331
+shepherd_core/vsource/virtual_harvester_model.py,sha256=tlt_Emi7bGbqeo0Cb7f2rt2K07whEB7r1RXdTJncGyI,7763
+shepherd_core/vsource/virtual_source_model.py,sha256=LiprQZmcfRBfliiDedr_RxEtrPYxcGWrUrqBM76zqCQ,2723
 tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/conftest.py,sha256=Tsa4GWKUdvvRzkvZUvWx6gQjUcf3Oj9PnkKfhqZ71Ys,916
-tests/test_cal_hw.py,sha256=UsjLvRsarYaLQJl_jcUSEuxkmwp1Vd5OSjbNNpYBiQY,1255
-tests/test_examples.py,sha256=oWZfv8_hvhNIQSdDmspCmEbq9rHrYl7-L5OOoR3Q3Po,641
+tests/conftest.py,sha256=6S4xE1rsqMjZlZ7ItzipGcuggUQk04DZBCta2vEOdGI,1856
+tests/test_cal_hw.py,sha256=fECEm1QAtpxjLIqboljEr0UVG6neGS_-uJ-rgZrMkFg,1243
+tests/test_examples.py,sha256=RPuIOzhuMmWk8GPggiv12sGGHZ0TzjVfUDU7GERzOeM,888
 tests/test_logger.py,sha256=aW9Et1juBSyQmpEBhn1sdN4k18XOkzGxdByhgTGZGZk,432
 tests/test_reader.py,sha256=6Q5Yfpsnlonm3nT8PWc6dY41Vn7APCLateeO5InZBXI,9560
-tests/test_writer.py,sha256=9ETcTQd9qwOv2OrDc1mE97PMOza0DdtslnRLSJzufms,5317
+tests/test_writer.py,sha256=MvKlX5ANUI-0XlAnPn39VbBRQy_vGE3ggc4OJj7stO0,5323
 tests/data_models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/data_models/conftest.py,sha256=thBKAL1LsphEC5g4yQG-3U1jNr_HGFe0F0rDLAJZJ54,368
 tests/data_models/example_cal_data.yaml,sha256=61QrTWjvvI3phIoZsKKiw02thYPjZeY51a302Bl-wk4,785
@@ -88,10 +88,10 @@ tests/data_models/example_config_testbed.yaml,sha256=ubN9dfvrMPxHQuWpqw_JkNHTxc4
 tests/data_models/example_config_virtsource.yaml,sha256=zB9nGys728SzUrR4tO-e8ebr1vP8-Bgg7TsKISDnGrk,4415
 tests/data_models/test_base_models.py,sha256=QysiTWlxiD3vvHZNuQVm-Fpu1QyfnnqRHysh0FKOrcw,6755
 tests/data_models/test_content_fixtures.py,sha256=rfYIEYzxWGBD6YYQQoJyCk2qbj_BAPnFZhOoL86SgYk,1701
-tests/data_models/test_content_models.py,sha256=lZiv2PeytCzK-w_5kw1ZAm4r9KtXy0SmF-udwIcfBPM,7852
+tests/data_models/test_content_models.py,sha256=NZMg1VqGEfs_V0_4LcQTlARfBbUOGflvp_SGyh8Urv0,8058
 tests/data_models/test_examples.py,sha256=yiiPZCjFQ4oBZCiIGmR3XOyU9qEAiFqncmO33LbbPNU,1420
-tests/data_models/test_experiment_models.py,sha256=sCcnoJa39g06yV2TDwNMdmaiVsd9xHmiRj6CPW_uVtY,9225
-tests/data_models/test_task_generation.py,sha256=EM3aLOGjl2mZrVpD01nEtOA1-4QHiSN1H3C5_88UWCM,1908
+tests/data_models/test_experiment_models.py,sha256=1imFOh7_zFCYlihsj6VP_9tlKYXGelSKmsZAqwAh0LA,9184
+tests/data_models/test_task_generation.py,sha256=xsGMb_KjhqFTogr5IkAax4CPBz4VfvgxjYgUtLMM-1E,1905
 tests/data_models/test_task_models.py,sha256=Ii673kTZjqpj8ly1fJ_qp43XWL3KEHzKBwKO_oAYvn4,3575
 tests/data_models/test_testbed_fixtures.py,sha256=k5hxz5vgx-LkKDxJptOUdrCZFwpEp8h2cK1HyY_5reA,1419
 tests/data_models/test_testbed_models.py,sha256=WSVZQIEvA7nOUx8w9v-gxqEjt9Sh_0zG6J0yr2Bts9k,4573
@@ -99,19 +99,19 @@ tests/decoder_waveform/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3
 tests/decoder_waveform/test_decoder.py,sha256=g6Es5G2BDORfaQsn-YIjMudd3URiHwYBtc8zHdz0EiE,894
 tests/fw_tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/fw_tools/conftest.py,sha256=gaEjO9M883G6NG7UHYfyudPAeoSjDncQpOcPJ4qmor8,151
-tests/fw_tools/test_converter.py,sha256=RNCdNd0TDyuadq38aKmE6VAZU4g9RMfJpHyDM5PJaF0,1992
-tests/fw_tools/test_patcher.py,sha256=ZDCYygjia7U71qzImxvBHGuuNWwbzAMTroYGQmxNxk4,2044
-tests/fw_tools/test_validation.py,sha256=axXcwQgvxx9wpnyW54OQVi0iBypzkQdM_XHrtzOY0-E,1733
+tests/fw_tools/test_converter.py,sha256=-jbAOjoad1KC6Za5S8AMs2CGJgmLSSijAV7dlraqQ9o,2215
+tests/fw_tools/test_patcher.py,sha256=LmMG5XKoV9vjjFbgo2SSnckz6WfuO6HtJEXdu545Zv4,2109
+tests/fw_tools/test_validation.py,sha256=769IIbnzljWnjZuZYb3HaVDTlXziSZDORLZVxnrzK2E,1893
 tests/inventory/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/inventory/test_inventory.py,sha256=q7i0Pw7rlYEPOBzsfVhcOE7WUP39dNtyjhNE7CbLA20,618
+tests/inventory/test_inventory.py,sha256=rw7NNHEJIT9W3G-N1SgqtwUO_o3EvHfSrbf9e3bRJLs,612
 tests/testbed_client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/vsource/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/vsource/conftest.py,sha256=jxSi5a6iuuCGtMY9rmnC_OS8Lqa7vkEGoXno7tKfS9k,1403
-tests/vsource/test_converter.py,sha256=zyhzgg95yi_AUWnGcWwuDf2-_RHfsUxvUDngptXn_sE,5151
-tests/vsource/test_harvester.py,sha256=-8OT1n7J7GnXD5aTngKq4L6WNTYKEmylDyFasqh7Nrw,2524
+tests/vsource/conftest.py,sha256=57KUTh9NtZ_1OZ1YWY8JzwPDMH3KcdHSFaIYzvL7HyY,1387
+tests/vsource/test_converter.py,sha256=vDbhLuMbN6oAv9DRhFIl-SUQC9BlghMTHCR5KhP6sgY,5075
+tests/vsource/test_harvester.py,sha256=hx8Nfd4SIJ7-bcrd2tpT_nb7O7-ZUSuqYMA7Eo69j3s,2442
 tests/vsource/test_z.py,sha256=H9LlNsAq3nV5PPaoM8yP4FLnPhdJJSoLSmUOD5rtobM,90
-shepherd_core-2023.10.3.dist-info/METADATA,sha256=XbU5t5qZhufXNnCLvJ8t6d59B0pebhAJxTeHsf2YGpU,6509
-shepherd_core-2023.10.3.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-shepherd_core-2023.10.3.dist-info/top_level.txt,sha256=6H9zsX2PNWwILI7EJu8fNam1KfG2Sqvkez-jlwrD9SE,20
-shepherd_core-2023.10.3.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-shepherd_core-2023.10.3.dist-info/RECORD,,
+shepherd_core-2023.12.1.dist-info/METADATA,sha256=zX8uiU5P39bWwiau2V_7AD1dqs7B6N8Pbsy4qvedCn4,7029
+shepherd_core-2023.12.1.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+shepherd_core-2023.12.1.dist-info/top_level.txt,sha256=6H9zsX2PNWwILI7EJu8fNam1KfG2Sqvkez-jlwrD9SE,20
+shepherd_core-2023.12.1.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+shepherd_core-2023.12.1.dist-info/RECORD,,

{shepherd_core-2023.10.3.dist-info → shepherd_core-2023.12.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.2)
+Generator: bdist_wheel (0.42.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

tests/conftest.py

@@ -1,4 +1,6 @@
+import subprocess
 from pathlib import Path
+from typing import Iterable  # py38, later use: from collections.abc import Iterable
 
 import numpy as np
 import pytest
@@ -30,3 +32,33 @@ def generate_h5_file(file_path: Path, file_name: str = "harvest_example.h5") ->
 @pytest.fixture
 def data_h5(tmp_path: Path) -> Path:
     return generate_h5_file(tmp_path)
+
+
+def pytest_collection_modifyitems(
+    config: pytest.Config,
+    items: Iterable[pytest.Item],
+) -> None:
+    # ELF
+    try:
+        from pwnlib.elf import ELF
+    except ImportError:
+        ELF = None
+    skip_elf = pytest.mark.skip(
+        reason="ELF-support not found -> shepherd_core[elf] missing or OS is Windows?"
+    )
+
+    # OBJCOPY
+    try:
+        subprocess.run(["objcopy", "--version"], check=True)
+        OBJCOPY = True
+    except FileNotFoundError:
+        OBJCOPY = None
+    skip_converter = pytest.mark.skip(
+        reason="Objcopy not found -> are binutils or build-essential installed?"
+    )
+
+    for item in items:
+        if "elf" in item.keywords and ELF is None:
+            item.add_marker(skip_elf)
+        if "converter" in item.keywords and OBJCOPY is None:
+            item.add_marker(skip_converter)

tests/data_models/test_content_models.py

@@ -55,6 +55,8 @@ def test_content_model_fw_faulty() -> None:
         )
 
 
+@pytest.mark.elf
+@pytest.mark.converter
 @pytest.mark.parametrize("path_elf", files_elf)
 def test_content_model_fw_min(path_elf: Path, tmp_path: Path) -> None:
     path_hex = (tmp_path / (path_elf.stem + ".hex")).resolve()
@@ -70,6 +72,8 @@ def test_content_model_fw_min(path_elf: Path, tmp_path: Path) -> None:
     )
 
 
+@pytest.mark.elf
+@pytest.mark.converter
 @pytest.mark.parametrize("path_elf", files_elf)
 def test_content_model_fw_from_elf(path_elf: Path) -> None:
     Firmware.from_firmware(
@@ -80,6 +84,8 @@ def test_content_model_fw_from_elf(path_elf: Path) -> None:
     )
 
 
+@pytest.mark.elf
+@pytest.mark.converter
 @pytest.mark.parametrize("path_elf", files_elf)
 def test_content_model_fw_from_hex(path_elf: Path, tmp_path: Path) -> None:
     path_hex = (tmp_path / (path_elf.stem + ".hex")).resolve()
@@ -105,6 +111,8 @@ def test_content_model_fw_from_hex_failing(tmp_path: Path) -> None:
         )
 
 
+@pytest.mark.elf
+@pytest.mark.converter
 @pytest.mark.parametrize("path_elf", files_elf)
 def test_content_model_fw_extract_elf_to_dir(path_elf: Path, tmp_path: Path) -> None:
     fw = Firmware.from_firmware(
@@ -118,6 +126,8 @@ def test_content_model_fw_extract_elf_to_dir(path_elf: Path, tmp_path: Path) ->
     assert file.is_file()
 
 
+@pytest.mark.elf
+@pytest.mark.converter
 @pytest.mark.parametrize("path_elf", files_elf)
 def test_content_model_fw_extract_hex_to_dir(path_elf: Path, tmp_path: Path) -> None:
     path_hex = (tmp_path / (path_elf.stem + ".hex")).resolve()
@@ -134,9 +144,7 @@ def test_content_model_fw_extract_hex_to_dir(path_elf: Path, tmp_path: Path) ->
 
 
 @pytest.mark.parametrize("path_elf", files_elf)
-def test_content_model_fw_extract_path_elf_to_dir(
-    path_elf: Path, tmp_path: Path
-) -> None:
+def test_content_model_fw_extract_path_elf_to_dir(path_elf: Path, tmp_path: Path) -> None:
     assert path_elf.exists()
     fw = Firmware(
         data=path_elf,
@@ -151,10 +159,10 @@ def test_content_model_fw_extract_path_elf_to_dir(
     assert file.is_file()
 
 
+@pytest.mark.elf
+@pytest.mark.converter
 @pytest.mark.parametrize("path_elf", files_elf)
-def test_content_model_fw_extract_path_hex_to_dir(
-    path_elf: Path, tmp_path: Path
-) -> None:
+def test_content_model_fw_extract_path_hex_to_dir(path_elf: Path, tmp_path: Path) -> None:
     path_hex = (tmp_path / (path_elf.stem + ".hex")).resolve()
     path_hex = fw_tools.elf_to_hex(path_elf, path_hex)
     assert path_hex.exists()
@@ -213,9 +221,7 @@ def test_content_model_hrv_faulty_voltage0() -> None:
 
 def test_content_model_hrv_faulty_voltage1() -> None:
     with pytest.raises(ValueError):
-        _ = VirtualHarvesterConfig(
-            name="iv110", voltage_min_mV=4001, voltage_max_mV=4000
-        )
+        _ = VirtualHarvesterConfig(name="iv110", voltage_min_mV=4001, voltage_max_mV=4000)
 
 
 def test_content_model_hrv_faulty_voltage2() -> None:

tests/data_models/test_experiment_models.py

@@ -46,7 +46,7 @@ def test_experiment_model_exp_yaml_comparison() -> None:
 
     target_cfgs = TargetConfig(
         target_IDs=list(range(1, 5)),
-        custom_IDs=list(range(0, 4)),
+        custom_IDs=list(range(4)),
         energy_env={"name": "SolarSunny"},
         virtual_source={"name": "diode+capacitor"},
         firmware1={"name": "nrf52_demo_rf"},
@@ -148,9 +148,7 @@ def test_experiment_model_exp_missing_target() -> None:
                 target_IDs=[1234567],  # <- not existent
                 custom_IDs=list(range(7, 18)),
                 energy_env=EnergyEnvironment(name="ThermoelectricWashingMachine"),
-                virtual_source=VirtualSourceConfig(
-                    name="BQ25570-Schmitt", harvester=hrv
-                ),
+                virtual_source=VirtualSourceConfig(name="BQ25570-Schmitt", harvester=hrv),
                 firmware1=Firmware(name="nrf52_demo_rf"),
                 firmware2=Firmware(name="msp430_deep_sleep"),
             ),

tests/data_models/test_task_generation.py

@@ -25,7 +25,7 @@ def test_task_generation_script(tmp_path: Path) -> None:
         # first init similar to yaml
         TargetConfig(
             target_IDs=list(range(1, 4)),
-            custom_IDs=list(range(0, 3)),
+            custom_IDs=list(range(3)),
             energy_env={"name": "SolarSunny"},
             virtual_source={"name": "diode+capacitor"},
             firmware1={"name": "nrf52_demo_rf"},

tests/fw_tools/test_converter.py

@@ -14,6 +14,7 @@ def path_hex(tmp_path: Path) -> Path:
     return fw_tools.elf_to_hex(path_elf, path_hex)
 
 
+@pytest.mark.converter
 @pytest.mark.parametrize("path_elf", files_elf)
 def test_elf_to_hex(path_elf: Path, tmp_path: Path) -> None:
     path_hex = (tmp_path / (path_elf.stem + ".hex")).resolve()
@@ -22,6 +23,8 @@ def test_elf_to_hex(path_elf: Path, tmp_path: Path) -> None:
     assert path_hex.as_posix() == path_gen.as_posix()
 
 
+@pytest.mark.elf
+@pytest.mark.converter
 @pytest.mark.parametrize("path_elf", files_elf)
 def test_firmware_to_hex_w_elf(path_elf: Path) -> None:
     path_gen = fw_tools.firmware_to_hex(path_elf)
@@ -29,6 +32,8 @@ def test_firmware_to_hex_w_elf(path_elf: Path) -> None:
     assert path_gen.suffix.lower() == ".hex"
 
 
+@pytest.mark.elf
+@pytest.mark.converter
 def test_firmware_to_hex_w_hex(path_hex: Path) -> None:
     path_gen = fw_tools.firmware_to_hex(path_hex)
     assert path_gen.exists
@@ -36,12 +41,16 @@ def test_firmware_to_hex_w_hex(path_hex: Path) -> None:
     assert path_gen.as_posix() == path_hex.as_posix()
 
 
+@pytest.mark.elf
+@pytest.mark.converter
 def test_firmware_to_hex_w_fail() -> None:
     path_some = Path(__file__).parent / "conftest.py"
     with pytest.raises(ValueError):
         _ = fw_tools.firmware_to_hex(path_some)
 
 
+@pytest.mark.elf
+@pytest.mark.converter
 def test_hash() -> None:
     hash_a = fw_tools.file_to_hash(files_elf[0])
     hash_b = fw_tools.file_to_hash(files_elf[1])
@@ -50,6 +59,8 @@ def test_hash() -> None:
     assert hash_b == hash_c
 
 
+@pytest.mark.elf
+@pytest.mark.converter
 @pytest.mark.parametrize("path_elf", files_elf)
 def test_base64(path_elf: Path, tmp_path: Path) -> None:
     b64_a = fw_tools.file_to_base64(path_elf)