Testing the built wheels with cibuildwheel (#4341)

* Using cibuildwheel to run tests Signed-off-by: Pradyot Ranjan <[email protected]> * using cibw marker Signed-off-by: Pradyot Ranjan <[email protected]> * removing trailing whitespace Signed-off-by: Pradyot Ranjan <[email protected]> --------- Signed-off-by: Pradyot Ranjan <[email protected]> Co-authored-by: Pradyot Ranjan <[email protected]>
pybamm-team · Aug 22, 2024 · fcab586 · fcab586
1 parent 25a9936
commit fcab586
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 3 deletions.
diff --git a/.github/workflows/publish_pypi.yml b/.github/workflows/publish_pypi.yml
@@ -85,8 +85,10 @@ jobs:
           CIBW_ARCHS: AMD64
           CIBW_BEFORE_BUILD: python -m pip install setuptools wheel delvewheel # skip CasADi and CMake
           CIBW_REPAIR_WHEEL_COMMAND: delvewheel repair -w {dest_dir} {wheel}
-          CIBW_TEST_COMMAND: python -c "import pybamm; print(pybamm.IDAKLUSolver())"
-
+          CIBW_TEST_EXTRAS: "all,dev,jax"
+          CIBW_TEST_COMMAND: |
+            python -c "import pybamm; print(pybamm.IDAKLUSolver())"
+            python -m pytest -m cibw {project}/tests/unit
       - name: Upload Windows wheels
         uses: actions/[email protected]
         with:
@@ -118,9 +120,11 @@ jobs:
             bash scripts/install_sundials.sh 6.0.3 6.5.0
           CIBW_BEFORE_BUILD_LINUX: python -m pip install cmake casadi setuptools wheel
           CIBW_REPAIR_WHEEL_COMMAND_LINUX: auditwheel repair -w {dest_dir} {wheel}
+          CIBW_TEST_EXTRAS: "all,dev,jax"
           CIBW_TEST_COMMAND: |
             set -e -x
             python -c "import pybamm; print(pybamm.IDAKLUSolver())"
+            python -m pytest -m cibw {project}/tests/unit
 
       - name: Upload wheels for Linux
         uses: actions/[email protected]
@@ -249,9 +253,11 @@ jobs:
               delocate-listdeps {wheel} && delocate-wheel -v -w {dest_dir} {wheel} --require-target-macos-version 11.1
               for file in {dest_dir}/*.whl; do mv "$file" "${file//macosx_11_1/macosx_11_0}"; done
             fi
+          CIBW_TEST_EXTRAS: "all,dev,jax"
           CIBW_TEST_COMMAND: |
             set -e -x
             python -c "import pybamm; print(pybamm.IDAKLUSolver())"
+            python -m pytest -m cibw {project}/tests/unit
 
       - name: Upload wheels for macOS (amd64, arm64)
         uses: actions/[email protected]

diff --git a/conftest.py b/conftest.py
@@ -19,12 +19,19 @@ def pytest_addoption(parser):
         default=False,
         help="run integration tests",
     )
+    parser.addoption(
+        "--cibw",
+        action="store_true",
+        default=False,
+        help="test build wheels",
+    )
 
 
 def pytest_configure(config):
     config.addinivalue_line("markers", "scripts: mark test as an example script")
     config.addinivalue_line("markers", "unit: mark test as a unit test")
     config.addinivalue_line("markers", "integration: mark test as an integration test")
+    config.addinivalue_line("markers", "cibw: mark test as build wheel test")
 
 
 def pytest_collection_modifyitems(items):

diff --git a/pyproject.toml b/pyproject.toml
@@ -234,6 +234,7 @@ required_plugins = [
     "pytest-xdist",
     "pytest-mock",
 ]
+norecursedirs = 'pybind11*'
 addopts = [
     "-nauto",
     "-vra",

diff --git a/tests/unit/test_solvers/test_idaklu_solver.py b/tests/unit/test_solvers/test_idaklu_solver.py
@@ -5,13 +5,14 @@
 from contextlib import redirect_stdout
 import io
 import unittest
-
+import pytest
 import numpy as np
 
 import pybamm
 from tests import get_discretisation_for_testing
 
 
+@pytest.mark.cibw
 @unittest.skipIf(not pybamm.have_idaklu(), "idaklu solver is not installed")
 class TestIDAKLUSolver(unittest.TestCase):
     def test_ida_roberts_klu(self):