Merge branch 'develop' into remove-id

pybamm-team · Jun 2, 2022 · 91be4b2 · 91be4b2
2 parents 18bc283 + e1f52ff
commit 91be4b2
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,7 @@
 # [Unreleased](https://github.com/pybamm-team/PyBaMM/)
 
+# [v22.5](https://github.com/pybamm-team/PyBaMM/tree/v22.5) - 2022-05-31
+
 ## Features
 
 -   Added functionality to generate Julia expressions from a model. See [PyBaMM.jl](https://github.com/tinosulzer/PyBaMM.jl) for how to use these ([#1942](https://github.com/pybamm-team/PyBaMM/pull/1942)))

diff --git a/CITATION.cff b/CITATION.cff
@@ -24,6 +24,6 @@ keywords:
   - "expression tree"
   - "python"
   - "symbolic differentiation"
-version: "22.4"
+version: "22.5"
 repository-code: "https://github.com/pybamm-team/PyBaMM"
 title: "Python Battery Mathematical Modelling (PyBaMM)"
diff --git a/docs/conf.py b/docs/conf.py
@@ -27,7 +27,7 @@
 author = "The PyBaMM Team"
 
 # The short X.Y version
-version = "22.4"
+version = "22.5"
 # The full version, including alpha/beta/rc tags
 release = version
 
@@ -75,7 +75,7 @@
 #
 # This is also used if you do content translation via gettext catalogs.
 # Usually you set "language" from the command line for these cases.
-language = None
+language = "en"
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.

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