From f668ff54083ee32548ac8ce4e92864dc1ae64390 Mon Sep 17 00:00:00 2001
From: tinosulzer <tinosulzer@users.noreply.github.com>
Date: Sat, 28 May 2022 10:13:06 +0000
Subject: [PATCH 1/2] Update version to v22.5

---
 CHANGELOG.md      | 2 ++
 CITATION.cff      | 2 +-
 docs/conf.py      | 2 +-
 pybamm/version.py | 2 +-
 vcpkg.json        | 2 +-
 5 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3e3b0ded0a..6fd2e713b1 100644
--- 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
index 40514b0617..0448617dd1 100644
--- 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
index a173c20d61..d70d7f4d18 100644
--- 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
 
diff --git a/pybamm/version.py b/pybamm/version.py
index 165bd5dd4f..f4624fbd18 100644
--- a/pybamm/version.py
+++ b/pybamm/version.py
@@ -1 +1 @@
-__version__ = "22.4"
+__version__ = "22.5"
diff --git a/vcpkg.json b/vcpkg.json
index 7408925ff2..d186733afd 100644
--- a/vcpkg.json
+++ b/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "pybamm",
-  "version-string": "22.4",
+  "version-string": "22.5",
   "dependencies": [
     "casadi",
     {

From 330ad03bf253a1c8108cac82d00f22432273ef21 Mon Sep 17 00:00:00 2001
From: Ferran Brosa Planella <Ferran.Brosa-Planella@warwick.ac.uk>
Date: Mon, 30 May 2022 14:27:37 +0100
Subject: [PATCH 2/2] set language to fix docs

---
 docs/conf.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/conf.py b/docs/conf.py
index 152174664b..65ec0c9e4e 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -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.