Validate combined fixes for issues 237–249

.github/workflows/tests.yml

@@ -49,6 +49,15 @@ jobs:
       run: |
         uv sync --group test
 
+    - name: Rebuild extension in place twice (Windows)
+      if: runner.os == 'Windows'
+      run: |
+        uv pip install setuptools wheel
+        uv run --no-sync python setup.py build_ext --inplace --force
+        if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
+        uv run --no-sync python setup.py build_ext --inplace --force
+        if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
+
     - name: Run tests
       run: |
-        uv run pytest tests/ --verbose
+        uv run pytest tests/ --verbose

build_libicsneo.py

@@ -30,7 +30,7 @@
 
 # icspb bootstraps protobuf from source at configure time. Keep the
 # bootstrap OUTSIDE the libicsneo build dir so it survives the per-python
-# `git clean` in _build_libicsneo_linux and is reused across all
+# build-directory cleanup in _build_libicsneo_linux and is reused across all
 # cibuildwheel builds in a job (it self-partitions by <system>-<processor>,
 # so sharing one root across archs is safe). Building protobuf once per
 # arch instead of once per python matters most under QEMU aarch64.
@@ -125,8 +125,11 @@ def _cmake_ninja_args():
 
 def _build_libicsneo_linux():
     print("Cleaning libicsneo...")
-    subprocess.check_output(["git", "clean", "-xdf"], cwd="libicsneo")
-    subprocess.check_output(["mkdir", "-p", "libicsneo/build"])
+    # Source archives have no parent Git checkout. Reset only the CMake
+    # build tree, preserving the source checkout and protobuf bootstrap.
+    if os.path.exists(LIBICSNEO_BUILD):
+        shutil.rmtree(LIBICSNEO_BUILD)
+    os.makedirs(LIBICSNEO_BUILD, exist_ok=True)
 
     print("cmake libicsneo...")
     subprocess.check_output(

generate_icsneo40_structs.py

@@ -737,24 +737,39 @@ def generate(filename="include/ics/icsnVC40.h"):
             f.write(f'    "ics.structures.{fname}",\n')
         f.write("]\n\n")
 
-    # Verify We can at least import all of the modules - quick check to make sure parser worked.
-    ics_module_path = GEN_ICS_DIR.parent.resolve()
-    # Add the module to the eval sys.path.
-    eval("""sys.path.insert(0, f"{ics_module_path}")""")
-    for file_name in file_names:
-        if file_name.startswith("__"):
-            continue
-        import_line = "from ics.structures import {}".format(
-            re.sub(r'(\.py)', '', file_name))
-        try:
-            print(f"Importing / Verifying {output_dir / file_name}...{' '*20}", end="\r")
-            exec(import_line)
-        except Exception as ex:
-            print(f"""\nERROR: {ex} IMPORT LINE: '{import_line}'""")
-            raise ex
+    validate_generated_modules(file_names)
     print("\nDone.")
 
 
+def validate_generated_modules(file_names):
+    """Check imports without keeping an existing native extension loaded in setup."""
+    import json
+
+    # Importing ics also loads ics.ics when it exists. Windows cannot replace a
+    # loaded .pyd, so wait for a separate interpreter to exit before building.
+    # Pass paths and names as data, including paths containing spaces/backslashes.
+    validation_code = """
+import importlib
+import json
+import sys
+
+package_path, file_names = json.load(sys.stdin)
+sys.path.insert(0, package_path)
+for file_name in file_names:
+    if file_name.startswith("__"):
+        continue
+    module_name = "ics.structures." + file_name.removesuffix(".py")
+    print(f"Importing / Verifying {module_name}...", flush=True)
+    importlib.import_module(module_name)
+"""
+    run(
+        [sys.executable, "-c", validation_code],
+        input=json.dumps([str(GEN_ICS_DIR.parent.resolve()), file_names]),
+        text=True,
+        check=True,
+    )
+
+
 def _write_c_object(f, c_object):
     # Write the header
     if c_object.data_type == DataType.Struct:

include/methods.h

@@ -436,7 +436,10 @@ extern "C"
     MODULE_NAME                                                                                                        \
     ".set_reflash_callback(callback)\n"                                                                                \
     "\n"                                                                                                               \
-    "Sets the reflash display callback.\n"                                                                             \
+    "Sets the reflash display callback. The callback is retained until replaced or disabled.\n"                        \
+    "An object with a callable reflash_callback method is also accepted.\n"                                             \
+    "Pass None to disable callbacks, or omit the argument to print progress to stdout.\n"                               \
+    "Callback exceptions are reported through sys.unraisablehook.\n"                                                   \
     "\n"                                                                                                               \
     "Args:\n"                                                                                                          \
     "\tcallback (:class:`function`): Must be a callable Python function (`def callback(msg, progress)`)\n\n"           \

include/object_spy_message.h

@@ -39,6 +39,8 @@ typedef struct
 {
     PyObject_HEAD icsSpyMessage msg;
     bool noExtraDataPtrCleanup;
+    // Private bound, independent of writable protocol/length/ownership fields.
+    size_t extraDataCapacity;
 } spy_message_object;
 #pragma pack(pop)
 
@@ -47,6 +49,7 @@ typedef struct
 {
     PyObject_HEAD icsSpyMessageJ1850 msg;
     bool noExtraDataPtrCleanup;
+    size_t extraDataCapacity;
 } spy_message_j1850_object;
 #pragma pack(pop)
 
@@ -63,5 +66,8 @@ extern PyTypeObject spy_message_j1850_object_type;
 #define PySpyMessageJ1850_GetObject(obj) ((spy_message_j1850_object*)obj)
 
 bool setup_spy_message_object(PyObject* module);
+size_t spy_message_extra_data_length(const icsSpyMessage& msg);
+bool spy_message_validate_extra_data(const spy_message_object* obj);
+void spy_message_record_received_extra_data(PyObject* obj);
 
 #endif // _OBJECT_SPY_MESSAGE_H_

pyproject.toml

@@ -31,10 +31,12 @@ Issues = "https://github.com/intrepidcs/python_ics/issues"
 [dependency-groups]
 test = [
   "pytest>=8.4.2",
+  "dunamai",
+  "setuptools",
 ]
 
 [tool.setuptools.dynamic]
-version = { attr = "ics.__version__" }
+version = { attr = "ics.__version.__version__" }
 
 [build-system]
 requires = [

src/ics/py_neo_device_ex.py

@@ -26,8 +26,11 @@ def __repr__(self):
         return f"<ics.{self.__class__.__name__} {self.Name} {self.serial_number}>"
 
     def __eq__(self, other) -> bool:
+        if not isinstance(other, PyNeoDeviceEx):
+            return NotImplemented
         return \
             self.DeviceType == other.DeviceType and \
+            self.SerialNumber == other.SerialNumber and \
             self.Handle == other.Handle and \
             self.NumberOfClients == other.NumberOfClients and \
             self.MaxAllowedClients == other.MaxAllowedClients and \
@@ -514,4 +517,4 @@ def request_set_neovi_miscio(self, *args, **kwargs):
 
     def get_firmware_variant(self, *args, **kwargs):
         "see ics.get_firmware_variant for details on arguments."
-        return ics.get_firmware_variant(self, *args, **kwargs)
+        return ics.get_firmware_variant(self, *args, **kwargs)