PyOpenMagnetics 1.4.3__tar.gz → 1.4.5__tar.gz

{pyopenmagnetics-1.4.3 → pyopenmagnetics-1.4.5}/CMakeLists.txt

@@ -182,11 +182,27 @@ if(NOT LOCAL_MKF_MAS)
         message(STATUS "MAS git error: ${MAS_GIT_ERROR}")
     endif()
 
-    if(NOT MKF_POPULATED)
-        message(STATUS "Populating MKF")
-        FetchContent_Populate(MKF)
-    else()
-        message(STATUS "MKF already populated at: ${MKF_SOURCE_DIR}")
+    # Always delete and repopulate MKF to ensure we get the latest main,
+    # mirroring the MAS refresh above. FetchContent will NOT re-fetch an
+    # already-cloned source dir even with GIT_TAG main, so a persisted build
+    # dir (incremental CI cache, local rebuilds) otherwise keeps a STALE MKF
+    # checkout — fixes merged to MKF main would silently never reach the wheel.
+    if(EXISTS ${CMAKE_BINARY_DIR}/_deps/mkf-src)
+        message(STATUS "Removing old MKF source to force fresh clone")
+        file(REMOVE_RECURSE ${CMAKE_BINARY_DIR}/_deps/mkf-src)
+    endif()
+    message(STATUS "Populating MKF")
+    FetchContent_Populate(MKF)
+    # Show git log to verify we built against MKF main HEAD
+    execute_process(
+        COMMAND git -C ${mkf_SOURCE_DIR} log --oneline -1
+        OUTPUT_VARIABLE MKF_GIT_LOG
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+        ERROR_VARIABLE MKF_GIT_ERROR
+    )
+    message(STATUS "MKF version: ${MKF_GIT_LOG}")
+    if(MKF_GIT_ERROR)
+        message(STATUS "MKF git error: ${MKF_GIT_ERROR}")
     endif()
 
     message(STATUS ${MAS_SOURCE_DIR})

{pyopenmagnetics-1.4.3 → pyopenmagnetics-1.4.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: PyOpenMagnetics
-Version: 1.4.3
+Version: 1.4.5
 Summary: Python wrapper for OpenMagnetics
 Author-Email: Alfonso Martinez <Alfonso_VII@hotmail.com>
 Classifier: Development Status :: 4 - Beta

{pyopenmagnetics-1.4.3 → pyopenmagnetics-1.4.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "scikit_build_core.build"
 
 [project]
 name = "PyOpenMagnetics"
-version = "1.4.3"
+version = "1.4.5"
 requires-python = ">=3.8"
 authors = [
   { name="Alfonso Martinez", email="Alfonso_VII@hotmail.com" },

{pyopenmagnetics-1.4.3 → pyopenmagnetics-1.4.5}/src/utils.cpp

@@ -2,9 +2,10 @@
 
 namespace PyMKF {
 
-double resolve_dimension_with_tolerance(json dimensionWithToleranceJson) {
+double resolve_dimension_with_tolerance(json dimensionWithToleranceJson, std::string preferredValue) {
     DimensionWithTolerance dimensionWithTolerance(dimensionWithToleranceJson);
-    return OpenMagnetics::resolve_dimensional_values(dimensionWithTolerance);
+    OpenMagnetics::DimensionalValues preferred = json(preferredValue).get<OpenMagnetics::DimensionalValues>();
+    return OpenMagnetics::resolve_dimensional_values(dimensionWithTolerance, preferred);
 }
 
 json calculate_basic_processed_data(json waveformJson) {
@@ -347,16 +348,19 @@ void register_utils_bindings(py::module& m) {
     m.def("resolve_dimension_with_tolerance", &resolve_dimension_with_tolerance,
         R"pbdoc(
         Resolve a dimension specification that may include tolerances.
-        
+
         Extracts a single value from dimension data that may contain
         nominal, minimum, and maximum values.
-        
+
         Args:
             dimension_json: JSON object with dimension specification.
-        
+            preferred: Which value to prefer when present — "Nominal" (default),
+                "Maximum", or "Minimum".
+
         Returns:
             Resolved dimension value as float.
-        )pbdoc");
+        )pbdoc",
+        py::arg("dimensionWithToleranceJson"), py::arg("preferredValue") = "Nominal");
     
     m.def("calculate_basic_processed_data", &calculate_basic_processed_data,
         R"pbdoc(

{pyopenmagnetics-1.4.3 → pyopenmagnetics-1.4.5}/src/utils.h

@@ -4,7 +4,7 @@
 namespace PyMKF {
 
 // Utility functions for processing and calculations
-double resolve_dimension_with_tolerance(json dimensionWithToleranceJson);
+double resolve_dimension_with_tolerance(json dimensionWithToleranceJson, std::string preferredValue = "Nominal");
 json calculate_basic_processed_data(json waveformJson);
 json calculate_harmonics(json waveformJson, double frequency);
 json calculate_sampled_waveform(json waveformJson, double frequency);