For now, import CasADi, don't use importlib

agriyakhetarpal · Feb 24, 2024 · fa6e94f · fa6e94f
1 parent 55aeb4a
commit fa6e94f
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/.github/workflows/publish_pypi.yml b/.github/workflows/publish_pypi.yml
@@ -130,7 +130,7 @@ jobs:
           CIBW_BEFORE_BUILD_LINUX: python -m pip install casadi
           # override; point to Python's CasADi install path so that it can be found by the repair command
           CIBW_REPAIR_WHEEL_COMMAND_LINUX: >
-            LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:$(python -c 'import importlib.util; print(next(iter(importlib.util.find_spec('casadi').submodule_search_locations)))')" auditwheel repair -w {dest_dir} {wheel}
+            LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:$(python -c 'import casadi; print(casadi.__path__[0])')" auditwheel repair -w {dest_dir} {wheel}
           CIBW_TEST_COMMAND: python -c "import pybamm; pybamm.IDAKLUSolver()"
 
       - name: Build wheels on macOS amd64
@@ -139,7 +139,7 @@ jobs:
         env:
           CIBW_BEFORE_BUILD_MACOS: python -m pip install casadi && python scripts/fix_casadi_rpath_mac.py
           CIBW_REPAIR_WHEEL_COMMAND_MACOS: >
-            LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:$(python -c 'import importlib.util; print(next(iter(importlib.util.find_spec('casadi').submodule_search_locations)))')" delocate-listdeps {wheel} && delocate-wheel -v -w {dest_dir} {wheel}
+            LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:$(python -c 'import casadi; print(casadi.__path__[0])')" delocate-listdeps {wheel} && delocate-wheel -v -w {dest_dir} {wheel}
           CIBW_TEST_COMMAND: python -c "import pybamm; pybamm.IDAKLUSolver()"
 
       - name: Upload wheels for Linux
@@ -183,7 +183,7 @@ jobs:
         env:
           CIBW_BEFORE_BUILD_MACOS: python scripts/fix_casadi_rpath_mac.py
           CIBW_REPAIR_WHEEL_COMMAND_MACOS: >
-            LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:$(python -c 'import importlib.util; print(next(iter(importlib.util.find_spec('casadi').submodule_search_locations)))')" delocate-listdeps {wheel} && delocate-wheel -v -w {dest_dir} {wheel}
+            LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:$(python -c 'import casadi; print(casadi.__path__[0])')" delocate-listdeps {wheel} && delocate-wheel -v -w {dest_dir} {wheel}
           CIBW_TEST_COMMAND: python -c "import pybamm; pybamm.IDAKLUSolver()"
 
       - name: Upload wheels for macOS arm64