Merge pull request pybamm-team#3674 from pybamm-team/v24.1

Sync v24.1 and develop
kratman · Jan 9, 2024 · cf2203c · cf2203c
2 parents 6173f16 + 0580f06
commit cf2203c
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 8 deletions.
diff --git a/.github/release_reminder.md b/.github/release_reminder.md
@@ -1,6 +1,6 @@
 ---
 title: Create {{ date | date('YY.MM') }} (final or rc0) release
-labels: priority:high
+labels: "priority: high"
 ---
 Quarterly reminder to create a -
 

diff --git a/.github/wheel_failure.md b/.github/wheel_failure.md
@@ -1,6 +1,6 @@
 ---
 title: Fortnightly build for wheels failed
-labels: priority:high, bug
+labels: "priority: high, bug"
 ---
 
 The build is failing with the following logs - {{ env.LOGS }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,7 @@
 # [Unreleased](https://github.com/pybamm-team/PyBaMM/)
 
+# [v24.1rc0](https://github.com/pybamm-team/PyBaMM/tree/v24.1rc0) - 2024-01-31
+
 ## Features
 
 - The `pybamm_install_odes` command now includes support for macOS systems and can be used to set up SUNDIALS and install the `scikits.odes` solver on macOS ([#3417](https://github.com/pybamm-team/PyBaMM/pull/3417))

diff --git a/CITATION.cff b/CITATION.cff
@@ -24,6 +24,6 @@ keywords:
   - "expression tree"
   - "python"
   - "symbolic differentiation"
-version: "23.9"
+version: "24.1rc0"
 repository-code: "https://github.com/pybamm-team/PyBaMM"
 title: "Python Battery Mathematical Modelling (PyBaMM)"
diff --git a/pybamm/version.py b/pybamm/version.py
@@ -1 +1 @@
-__version__ = "23.9"
+__version__ = "24.1rc0"
diff --git a/pyproject.toml b/pyproject.toml
@@ -13,7 +13,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pybamm"
-version = "23.9"
+version = "24.1rc0"
 license = { file = "LICENSE.txt" }
 description = "Python Battery Mathematical Modelling"
 authors = [{name = "The PyBaMM Team", email = "[email protected]"}]

diff --git a/scripts/update_version.py b/scripts/update_version.py
@@ -32,7 +32,9 @@ def update_version():
     # pyproject.toml
     with open(os.path.join(pybamm.root_dir(), "pyproject.toml"), "r+") as file:
         output = file.read()
-        replace_version = re.sub('(?<=version = ")(.+)(?=")', release_version, output)
+        replace_version = re.sub(
+            r'(?<=\bversion = ")(.+)(?=")', release_version, output
+        )
         file.truncate(0)
         file.seek(0)
         file.write(replace_version)

diff --git a/vcpkg-configuration.json b/vcpkg-configuration.json
@@ -7,7 +7,7 @@
     {
       "kind": "git",
       "repository": "https://github.com/pybamm-team/sundials-vcpkg-registry.git",
-      "baseline": "af9f5e4bc730bf2361c47f809dcfb733e7951faa",
+      "baseline": "13d432fcf5da8591bb6cb2d46be9d6acf39cd02b",
       "packages": ["sundials"]
     },
     {

diff --git a/vcpkg.json b/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "pybamm",
-  "version-string": "23.9",
+  "version-string": "24.1rc0",
   "dependencies": [
     "casadi",
     {