PyOpenMagnetics 1.3.10__tar.gz → 1.3.13__tar.gz

{pyopenmagnetics-1.3.10 → pyopenmagnetics-1.3.13}/.github/workflows/publish.yml

@@ -10,6 +10,11 @@ on:
         required: false
         default: false
         type: boolean
+      publish_to_pypi:
+        description: 'Publish to real PyPI instead of TestPyPI (use to rebuild a failed release without recreating the GitHub release/tag)'
+        required: false
+        default: false
+        type: boolean
 
 env:
   GIT_LFS_SKIP_SMUDGE: 1  # Skip LFS to avoid bandwidth quota issues
@@ -109,18 +114,18 @@ jobs:
               if [ $i -lt 3 ]; then sleep 60; fi
             done
           CIBW_ENVIRONMENT_LINUX: PATH=/opt/rh/gcc-toolset-13/root/usr/bin:$PATH LD_LIBRARY_PATH=/opt/rh/gcc-toolset-13/root/usr/lib64:$LD_LIBRARY_PATH
-          CIBW_BEFORE_BUILD: pip install --default-timeout=60 --retries 5 scikit-build-core cmake ninja pybind11
+          CIBW_BEFORE_BUILD: pip install --default-timeout=60 --retries 5 scikit-build-core "cmake<4" ninja pybind11
           CIBW_TEST_COMMAND: python -c "import PyOpenMagnetics; print(f'PyOpenMagnetics loaded successfully with {len(dir(PyOpenMagnetics))} functions')"
 
       - name: Publish Linux wheels to PyPI
-        if: github.event_name == 'release'
+        if: github.event_name == 'release' || (github.event_name == 'workflow_dispatch' && inputs.publish_to_pypi)
         uses: pypa/gh-action-pypi-publish@release/v1
         with:
           password: ${{ secrets.PYPI_API_TOKEN }}
           packages-dir: wheelhouse/
 
       - name: Publish Linux wheels to TestPyPI
-        if: github.event_name == 'workflow_dispatch'
+        if: github.event_name == 'workflow_dispatch' && !inputs.publish_to_pypi
         uses: pypa/gh-action-pypi-publish@release/v1
         with:
           repository-url: https://test.pypi.org/legacy/
@@ -181,21 +186,21 @@ jobs:
           CIBW_BUILD: cp310-* cp311-* cp312-* cp313-*
           CIBW_SKIP: "*-win32 *-manylinux_i686 *musllinux* pp*"
           CIBW_BEFORE_ALL_WINDOWS: npm install -g quicktype
-          CIBW_BEFORE_BUILD: pip install --default-timeout=60 --retries 5 scikit-build-core cmake ninja pybind11
+          CIBW_BEFORE_BUILD: pip install --default-timeout=60 --retries 5 scikit-build-core "cmake<4" ninja pybind11
           CIBW_TEST_COMMAND: python -c "import PyOpenMagnetics; print(f'PyOpenMagnetics loaded successfully with {len(dir(PyOpenMagnetics))} functions')"
 
       - name: Install twine
         run: python -m pip install twine
 
       - name: Publish Windows wheels to PyPI
-        if: github.event_name == 'release'
+        if: github.event_name == 'release' || (github.event_name == 'workflow_dispatch' && inputs.publish_to_pypi)
         run: python -m twine upload wheelhouse/*.whl
         env:
           TWINE_USERNAME: __token__
           TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN }}
 
       - name: Publish Windows wheels to TestPyPI
-        if: github.event_name == 'workflow_dispatch'
+        if: github.event_name == 'workflow_dispatch' && !inputs.publish_to_pypi
         run: python -m twine upload --repository-url https://test.pypi.org/legacy/ wheelhouse/*.whl
         env:
           TWINE_USERNAME: __token__
@@ -266,21 +271,21 @@ jobs:
               if [ $i -lt 5 ]; then sleep 60; fi
             done
           CIBW_ENVIRONMENT_MACOS: MACOSX_DEPLOYMENT_TARGET=15.0
-          CIBW_BEFORE_BUILD: pip install --default-timeout=60 --retries 5 scikit-build-core cmake ninja pybind11
+          CIBW_BEFORE_BUILD: pip install --default-timeout=60 --retries 5 scikit-build-core "cmake<4" ninja pybind11
           CIBW_TEST_COMMAND: python -c "import PyOpenMagnetics; print(f'PyOpenMagnetics loaded successfully with {len(dir(PyOpenMagnetics))} functions')"
 
       - name: Install twine
         run: python -m pip install twine
 
       - name: Publish macOS wheels to PyPI
-        if: github.event_name == 'release'
+        if: github.event_name == 'release' || (github.event_name == 'workflow_dispatch' && inputs.publish_to_pypi)
         run: python -m twine upload wheelhouse/*.whl
         env:
           TWINE_USERNAME: __token__
           TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN }}
 
       - name: Publish macOS wheels to TestPyPI
-        if: github.event_name == 'workflow_dispatch'
+        if: github.event_name == 'workflow_dispatch' && !inputs.publish_to_pypi
         run: python -m twine upload --repository-url https://test.pypi.org/legacy/ wheelhouse/*.whl
         env:
           TWINE_USERNAME: __token__
@@ -338,14 +343,14 @@ jobs:
         run: python -m build --sdist
 
       - name: Publish sdist to PyPI
-        if: github.event_name == 'release'
+        if: github.event_name == 'release' || (github.event_name == 'workflow_dispatch' && inputs.publish_to_pypi)
         uses: pypa/gh-action-pypi-publish@release/v1
         with:
           password: ${{ secrets.PYPI_API_TOKEN }}
           packages-dir: dist/
 
       - name: Publish sdist to TestPyPI
-        if: github.event_name == 'workflow_dispatch'
+        if: github.event_name == 'workflow_dispatch' && !inputs.publish_to_pypi
         uses: pypa/gh-action-pypi-publish@release/v1
         with:
           repository-url: https://test.pypi.org/legacy/

{pyopenmagnetics-1.3.10 → pyopenmagnetics-1.3.13}/CMakeLists.txt

@@ -123,12 +123,12 @@ if(NOT LOCAL_MKF_MAS)
     set(MKF_FORCE_REFRESH "2026-04-29-extra-components")
     # Tell MKF to disable matplotplusplus and use SVG-based Painter instead
     set(INCLUDE_PYMKF ON CACHE BOOL "Build Python interface" FORCE)
-    # GIT_SUBMODULES_RECURSE pulls in CAS/EAS (added 2026-04 alongside the
+    # GIT_SUBMODULES_RECURSE pulls in CAS/PEAS (added 2026-04 alongside the
     # ExtraComponentsMode API). MAS is also a submodule of MKF but PyMKF
-    # fetches it independently below for fast-update reasons; CAS/EAS only
+    # fetches it independently below for fast-update reasons; CAS/PEAS only
     # exist as MKF submodules, so we need them populated under MKF/.
     # NOTE: we cannot use GIT_SHALLOW with GIT_SUBMODULES — shallow clone
-    # skips submodule init. Drop the shallow flag for MKF so CAS/EAS/
+    # skips submodule init. Drop the shallow flag for MKF so CAS/PEAS/
     # cci_coords are actually checked out. cci_coords MUST stay in this
     # list — the CCI generator reads from MKF/cci_coords/coordinates/.
     # MAS is fetched separately below (not a sub-fetch of MKF here) so
@@ -137,7 +137,7 @@ if(NOT LOCAL_MKF_MAS)
             GIT_REPOSITORY https://github.com/OpenMagnetics/MKF.git
             GIT_TAG main
             GIT_PROGRESS TRUE
-            GIT_SUBMODULES "CAS" "EAS" "cci_coords"
+            GIT_SUBMODULES "CAS" "PEAS" "cci_coords"
             GIT_SUBMODULES_RECURSE TRUE)
 
     message(STATUS "Fetching mas")
@@ -232,7 +232,6 @@ add_custom_command(
     -S ${MAS_DIR}/schemas/inputs/topologies/currentTransformer.json
     -S ${MAS_DIR}/schemas/inputs/topologies/boost.json
     -S ${MAS_DIR}/schemas/inputs/topologies/buck.json
-    -S ${MAS_DIR}/schemas/inputs/topologies/flybuck.json
     -S ${MAS_DIR}/schemas/inputs/topologies/forward.json
     -S ${MAS_DIR}/schemas/inputs/topologies/isolatedBuck.json
     -S ${MAS_DIR}/schemas/inputs/topologies/isolatedBuckBoost.json
@@ -240,7 +239,20 @@ add_custom_command(
     -S ${MAS_DIR}/schemas/inputs/topologies/dualActiveBridge.json
     -S ${MAS_DIR}/schemas/inputs/topologies/llcResonant.json
     -S ${MAS_DIR}/schemas/inputs/topologies/cllcResonant.json
-    -S ${MAS_DIR}/schemas/inputs/topologies/phaseShiftFullBridge.json
+    -S ${MAS_DIR}/schemas/inputs/topologies/clllcResonant.json
+    -S ${MAS_DIR}/schemas/inputs/topologies/phaseShiftedFullBridge.json
+    -S ${MAS_DIR}/schemas/inputs/topologies/phaseShiftedHalfBridge.json
+    -S ${MAS_DIR}/schemas/inputs/topologies/powerFactorCorrection.json
+    -S ${MAS_DIR}/schemas/inputs/topologies/commonModeChoke.json
+    -S ${MAS_DIR}/schemas/inputs/topologies/differentialModeChoke.json
+    -S ${MAS_DIR}/schemas/inputs/topologies/asymmetricHalfBridge.json
+    -S ${MAS_DIR}/schemas/inputs/topologies/cuk.json
+    -S ${MAS_DIR}/schemas/inputs/topologies/sepic.json
+    -S ${MAS_DIR}/schemas/inputs/topologies/zeta.json
+    -S ${MAS_DIR}/schemas/inputs/topologies/weinberg.json
+    -S ${MAS_DIR}/schemas/inputs/topologies/fourSwitchBuckBoost.json
+    -S ${MAS_DIR}/schemas/inputs/topologies/seriesResonant.json
+    -S ${MAS_DIR}/schemas/inputs/topologies/vienna.json
     -o ${MAS_DIRECTORY}/MAS.hpp --namespace MAS --source-style single-source --type-style pascal-case --member-style underscore-case --enumerator-style upper-underscore-case --no-boost
   USES_TERMINAL)
 
@@ -250,14 +262,14 @@ add_custom_target(PyMASGeneration
 
 # ──────────────────────────────────────────────────────────────────
 # CAS.hpp generation (mirrors MKF/CMakeLists.txt:419-451)
-# CAS = Capacitor Adviser Schema. EAS = Element Adviser Schema.
+# CAS = Capacitor Adviser Schema. PEAS = Power Element Adviser Schema.
 # Both are submodules of MKF (added 2026-04). MKF/Topology.h #includes
 # <CAS.hpp> for the get_extra_components_inputs API; we must generate
 # the header here so PyOpenMagnetics's TU sees it.
 # ──────────────────────────────────────────────────────────────────
 set(CAS_DIRECTORY "${CMAKE_BINARY_DIR}/CAS/")
 set(CAS_DIR "${MKF_DIR}/CAS")
-set(EAS_DIR "${MKF_DIR}/EAS")
+set(PEAS_DIR "${MKF_DIR}/PEAS")
 file(MAKE_DIRECTORY "${CAS_DIRECTORY}")
 
 add_custom_command(
@@ -265,8 +277,10 @@ add_custom_command(
   COMMAND ${CMAKE_COMMAND} -E remove -f "${CAS_DIRECTORY}/CAS.hpp"
   COMMAND quicktype -l c++ -s schema ${CAS_DIR}/schemas/inputs.json
     -S ${CAS_DIR}/schemas/inputs/designRequirements.json
-    -S ${EAS_DIR}/schemas/utils.json
-    -S ${EAS_DIR}/schemas/inputs/twoTerminalOperatingPoint.json
+    -S ${PEAS_DIR}/schemas/utils.json
+    -S ${PEAS_DIR}/schemas/inputs/twoTerminalOperatingPoint.json
+    -S ${PEAS_DIR}/schemas/inputs/operatingConditions.json
+    -S ${PEAS_DIR}/schemas/inputs/operatingPointExcitation.json
     -o ${CAS_DIRECTORY}/CAS.hpp --namespace CAS --source-style single-source
     --type-style pascal-case --member-style underscore-case
     --enumerator-style upper-underscore-case --no-boost
@@ -274,8 +288,10 @@ add_custom_command(
   DEPENDS
     "${CAS_DIR}/schemas/inputs.json"
     "${CAS_DIR}/schemas/inputs/designRequirements.json"
-    "${EAS_DIR}/schemas/utils.json"
-    "${EAS_DIR}/schemas/inputs/twoTerminalOperatingPoint.json"
+    "${PEAS_DIR}/schemas/utils.json"
+    "${PEAS_DIR}/schemas/inputs/twoTerminalOperatingPoint.json"
+    "${PEAS_DIR}/schemas/inputs/operatingConditions.json"
+    "${PEAS_DIR}/schemas/inputs/operatingPointExcitation.json"
   USES_TERMINAL)
 
 add_custom_target(PyCASGeneration

{pyopenmagnetics-1.3.10 → pyopenmagnetics-1.3.13}/PKG-INFO

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

{pyopenmagnetics-1.3.10 → pyopenmagnetics-1.3.13}/PyOpenMagnetics.pyi

@@ -960,3 +960,39 @@ def process_isolated_buck_boost(isolated_buck_boost: JsonDict) -> Inputs:
 def process_current_transformer(ct: JsonDict, turns_ratio: float, secondary_resistance: float = 0.0) -> Inputs:
     """Process Current Transformer specification to Inputs."""
     ...
+
+def process_cuk(cuk: JsonDict) -> Inputs:
+    """Process Cuk converter specification to Inputs."""
+    ...
+
+def process_sepic(sepic: JsonDict) -> Inputs:
+    """Process SEPIC converter specification to Inputs."""
+    ...
+
+def process_zeta(zeta: JsonDict) -> Inputs:
+    """Process Zeta converter specification to Inputs."""
+    ...
+
+def process_four_switch_buck_boost(converter: JsonDict) -> Inputs:
+    """Process Four-Switch Buck-Boost converter specification to Inputs."""
+    ...
+
+def process_asymmetric_half_bridge(converter: JsonDict) -> Inputs:
+    """Process Asymmetric Half-Bridge converter specification to Inputs."""
+    ...
+
+def process_weinberg(converter: JsonDict) -> Inputs:
+    """Process Weinberg converter specification to Inputs."""
+    ...
+
+def process_vienna(converter: JsonDict) -> Inputs:
+    """Process Vienna Rectifier converter specification to Inputs."""
+    ...
+
+def process_clllc(converter: JsonDict) -> Inputs:
+    """Process CLLLC Resonant converter specification to Inputs."""
+    ...
+
+def process_src(converter: JsonDict) -> Inputs:
+    """Process Series Resonant Converter (SRC) specification to Inputs."""
+    ...

{pyopenmagnetics-1.3.10 → pyopenmagnetics-1.3.13}/pyproject.toml

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