Merge branch 'develop' into ocvr_ecm

MarcBerliner · Sep 3, 2024 · 4786443 · 4786443
2 parents 13270c2 + ac93806
commit 4786443
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 53 deletions.
diff --git a/.github/release_reminder.md b/.github/release_reminder.md
diff --git a/.github/workflows/release_reminder.yml b/.github/workflows/release_reminder.yml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,7 @@
 # [Unreleased](https://github.com/pybamm-team/PyBaMM/)
 
+# [v24.9.0](https://github.com/pybamm-team/PyBaMM/tree/v24.9.0) - 2024-09-03
+
 ## Features
 
 - Added a lithium ion equivalent circuit model with split open circuit voltages for each electrode. ([#4330](https://github.com/pybamm-team/PyBaMM/pull/4330))

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

diff --git a/scripts/update_version.py b/scripts/update_version.py
@@ -6,9 +6,6 @@
 import os
 import re
 from datetime import date
-from dateutil.relativedelta import relativedelta
-
-
 import pybamm
 
 
@@ -17,11 +14,7 @@ def update_version():
     Opens file and updates the version number
     """
     release_version = os.getenv("VERSION")[1:]
-    release_date = (
-        date.today()
-        if "rc" in release_version
-        else date.today() + relativedelta(day=31)
-    )
+    release_date = date.today()
 
     # pybamm/version.py
     with open(
@@ -84,15 +77,7 @@ def update_version():
     with open(os.path.join(pybamm.root_dir(), "CHANGELOG.md"), "r+") as file:
         output_list = file.readlines()
         output_list[0] = changelog_line1
-        # add a new heading for rc0 releases
-        if "rc0" in release_version:
-            output_list.insert(2, changelog_line2)
-        else:
-            # for rcX and final releases, update the already existing rc
-            # release heading
-            for i in range(0, len(output_list)):
-                if re.search("[v]\d\d\.\drc\d", output_list[i]):
-                    output_list[i] = changelog_line2[:-1]
+        output_list.insert(2, changelog_line2)
         file.truncate(0)
         file.seek(0)
         file.writelines(output_list)

diff --git a/src/pybamm/version.py b/src/pybamm/version.py
@@ -1 +1 @@
-__version__ = "24.5"
+__version__ = "24.9.0"
diff --git a/vcpkg.json b/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "pybamm",
-  "version-string": "24.5",
+  "version-string": "24.9.0",
   "dependencies": [
     "casadi",
     {