From 826e011a63059051827f43935e9c57d8479dcbf3 Mon Sep 17 00:00:00 2001 From: Agriya Khetarpal <74401230+agriyakhetarpal@users.noreply.github.com> Date: Sat, 4 May 2024 18:31:46 +0530 Subject: [PATCH 1/2] Update vcpkg baseline --- vcpkg-configuration.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vcpkg-configuration.json b/vcpkg-configuration.json index d97bc3c617..11505be46e 100644 --- a/vcpkg-configuration.json +++ b/vcpkg-configuration.json @@ -13,7 +13,7 @@ { "kind": "git", "repository": "https://github.com/pybamm-team/casadi-vcpkg-registry.git", - "baseline": "baa26c2e629ea18fbb1aefa7d27c6612c4068fa7", + "baseline": "ceee3ed50246744cdef43517d7d7617b8ac291e7", "packages": ["casadi"] } ] From 442532afff58fe795852192b681dbeb87657650d Mon Sep 17 00:00:00 2001 From: Agriya Khetarpal <74401230+agriyakhetarpal@users.noreply.github.com> Date: Sat, 4 May 2024 18:32:55 +0530 Subject: [PATCH 2/2] Bump CasADi to minimum 3.6.5, both build and run --- pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index b8b1469ece..54ec27e2bd 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -3,7 +3,7 @@ requires = [ "setuptools>=64", "wheel", # On Windows, use the CasADi vcpkg registry and CMake bundled from MSVC - "casadi>=3.6.3; platform_system!='Windows'", + "casadi>=3.6.5; platform_system!='Windows'", # Note: the version of CasADi as a build-time dependency should be matched # cross platforms, so updates to its minimum version here should be accompanied # by a version bump in https://github.com/pybamm-team/casadi-vcpkg-registry. @@ -37,7 +37,7 @@ classifiers = [ dependencies = [ "numpy>=1.23.5", "scipy>=1.9.3,<1.13.0", - "casadi>=3.6.3", + "casadi>=3.6.5", "xarray>=2022.6.0", "anytree>=2.8.0", "sympy>=1.12",