Run python tests, fix python wheels not being able to import

SoarGroup · May 29, 2024 · a7f5843 · a7f5843
1 parent 0c644c3
commit a7f5843
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -367,6 +367,7 @@ jobs:
           - macos-12
             # latest is ARM
           - macos-latest
+          - windows-latest
         python-minor:
           - 5
           - 6
@@ -420,10 +421,17 @@ jobs:
           key: ${{ runner.os }}-${{ github.sha }}
           fail-on-cache-miss: true
 
-      - name: Run python test command
+      - name: Install soar-sml
         run: |
           pip3.${{ matrix.python-minor }} install soar-sml -f wheelhouse --no-index
-          python3.${{ matrix.python-minor }} Core/ClientSMLSWIG/Python/TestPythonSML.py
+
+      - name: Run test command (Non-Windows)
+        if: matrix.os != 'windows-latest'
+        run: python3.${{ matrix.python-minor }} Core/ClientSMLSWIG/Python/TestPythonSML.py
+
+      - name: Run test command (Windows)
+        if: matrix.os == 'windows-latest'
+        run: py -3.${{ matrix.python-minor }} Core/ClientSMLSWIG/Python/TestPythonSML.py
 
   python_push_dev:
     name: Publish to test.pypi.org

diff --git a/Core/ClientSMLSWIG/Python/pyproject.toml b/Core/ClientSMLSWIG/Python/pyproject.toml
@@ -139,7 +139,10 @@ test-command = "SOAR_UNIT_TEST_BASE_DIR={project}/out/ python {project}/Core/Cli
 test-skip = "cp38-macosx_*:arm64"
 
 [tool.cibuildwheel.windows]
-# For windows we need a slightly different command
+# For windows, we need to include msvcp140.dll and vcruntime140_1.dll in the wheel.
+before-build = "pip install delvewheel"
+repair-wheel-command = "delvewheel repair --ignore-in-wheel -w {dest_dir} {wheel}"
+# For windows we need a slightly different test command
 test-command = """\
 set SOAR_UNIT_TEST_BASE_DIR={project}/out/
 python {project}/Core/ClientSMLSWIG/Python/TestPythonSML.py