diff --git a/interfaces/python_sdist/pyproject.toml.in b/interfaces/python_sdist/pyproject.toml.in index 60e536b7420..973741ff049 100644 --- a/interfaces/python_sdist/pyproject.toml.in +++ b/interfaces/python_sdist/pyproject.toml.in @@ -68,7 +68,7 @@ build.verbose = true version = ">=3.24" [tool.scikit-build.ninja] -# As of 21-JULY-2024, Ninja 1.12 is not available on PyPI +# As of 06-OCTOBER-2024, Ninja 1.12 is not available on PyPI version = ">=1.11" make-fallback = false @@ -87,8 +87,8 @@ build-frontend = { name="build", args=["-vv"] } skip = "pp* *musllinux*" test-extras = ["pandas", "units", "graphviz"] test-requires = ["pytest"] -manylinux-x86_64-image = "ghcr.io/cantera/manylinux_2_28_x86_64-hdf5-boost" -manylinux-aarch64-image = "ghcr.io/cantera/manylinux_2_28_aarch64-hdf5-boost" +manylinux-x86_64-image = "ghcr.io/cantera/manylinux_2_28-cantera-base" +manylinux-aarch64-image = "ghcr.io/cantera/manylinux_2_28-cantera-base" test-command = "pytest -vv --durations=100 ${CANTERA_TEST_DIR}/test/python" [tool.cibuildwheel.windows] diff --git a/interfaces/python_sdist/src/CMakeLists.txt b/interfaces/python_sdist/src/CMakeLists.txt index 4208c6d3773..e4a244f0b0b 100644 --- a/interfaces/python_sdist/src/CMakeLists.txt +++ b/interfaces/python_sdist/src/CMakeLists.txt @@ -40,11 +40,11 @@ FetchContent_Declare( FIND_PACKAGE_ARGS NAMES fmt GLOBAL ) -set(HIGHFIVE_VERSION 2.9.0) +set(HIGHFIVE_VERSION 2.10.0) FetchContent_Declare( HighFive URL https://github.com/BlueBrain/HighFive/archive/refs/tags/v${HIGHFIVE_VERSION}.tar.gz - URL_HASH SHA256=6301def8ceb9f4d7a595988612db288b448a3c0546f6c83417dab38c64994d7e + URL_HASH SHA256=c29e8e1520e7298fabb26545f804e35bb3af257005c1c2df62e39986458d7c38 # FIND_PACKAGE_ARGS has to be the last thing in this call because it greedily takes # everything after it to pass to `find_package()` FIND_PACKAGE_ARGS NAMES HighFive @@ -117,7 +117,9 @@ target_link_libraries(cantera_lib PUBLIC SUNDIALS::sunmatrixband_static SUNDIALS::sunmatrixdense_static SUNDIALS::sunmatrixsparse_static - SUNDIALS::sunlinsoldense_static - SUNDIALS::sunlinsolband_static + # SUNDIALS::sunlinsoldense_static + SUNDIALS::sunlinsollapackdense_static + # SUNDIALS::sunlinsolband_static + SUNDIALS::sunlinsollapackband_static SUNDIALS::sunlinsolspgmr_static SUNDIALS::sunnonlinsolnewton_static)