From 502282d2d11b8517b212b74c8b05baa764369323 Mon Sep 17 00:00:00 2001
From: rv0lt <alvarorevu@gmail.com>
Date: Tue, 9 Apr 2024 10:54:40 +0200
Subject: [PATCH 1/5] changelog and update sprintlog

---
 CHANGELOG.rst | 12 ++++++++++++
 SPRINTLOG.md  |  4 ++++
 2 files changed, 16 insertions(+)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index b39a4655c..9d60c6fab 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,6 +1,18 @@
 Changelog
 ==========
 
+.. _2.6.4:
+
+2.6.4 - 2023-04-10
+~~~~~~~~~~~~~~~~~~~~~~~
+
+- New features:
+    - Fix the files endpoint acording to openAPI standar .
+    - Added email contact to troubleshouting page
+- Dependencies: 
+    - `Criptography` from `1.5.1` to `1.5.6`
+- Update base image for the docker containers from `python:3.10-alpine` to `python:3.11-alpine`
+
 .. _2.6.3:
 
 2.6.3 - 2023-02-27
diff --git a/SPRINTLOG.md b/SPRINTLOG.md
index fe7314fa9..e83c62ff7 100644
--- a/SPRINTLOG.md
+++ b/SPRINTLOG.md
@@ -374,3 +374,7 @@ _Nothing merged in CLI during this sprint_
 
 - Fix the files endpoints according to the openAPI standards, providing new endpoint version that co-exists with the current one ([#1505](https://github.com/ScilifelabDataCentre/dds_web/pull/1505))
 - Added email to troubleshouting webpage, with obfuscation ([#1520](https://github.com/ScilifelabDataCentre/dds_web/pull/1520))
+
+# 2024-03-25 - 2024-04-5
+
+- Update base image and packages to address cve in docker containers ([#1523](https://github.com/ScilifelabDataCentre/dds_web/pull/1523))

From 19b4ce08cb32e74eddb09a033c9e18d57504fd99 Mon Sep 17 00:00:00 2001
From: rv0lt <alvarorevu@gmail.com>
Date: Tue, 9 Apr 2024 10:56:22 +0200
Subject: [PATCH 2/5] version.py update

---
 dds_web/version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dds_web/version.py b/dds_web/version.py
index c56b21528..da6d8c6eb 100644
--- a/dds_web/version.py
+++ b/dds_web/version.py
@@ -1,3 +1,3 @@
 # Do not do major version upgrade during 2024.
 # If mid or minor version reaches 9, continue with 10, 11 etc etc.
-__version__ = "2.6.3"
+__version__ = "2.6.4"

From 3841d0a7189ec866f6c56997939a31fce6f4f5b0 Mon Sep 17 00:00:00 2001
From: rv0lt <alvarorevu@gmail.com>
Date: Tue, 9 Apr 2024 11:03:21 +0200
Subject: [PATCH 3/5] changelog

---
 CHANGELOG.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 9d60c6fab..a22e13198 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -10,7 +10,7 @@ Changelog
     - Fix the files endpoint acording to openAPI standar .
     - Added email contact to troubleshouting page
 - Dependencies: 
-    - `Criptography` from `1.5.1` to `1.5.6`
+    - `jwcrypto` from `1.5.1` to `1.5.6`
 - Update base image for the docker containers from `python:3.10-alpine` to `python:3.11-alpine`
 
 .. _2.6.3:

From aaee0fa3c7695473905fea909020a9f77c5552a8 Mon Sep 17 00:00:00 2001
From: rv0lt <alvarorevu@gmail.com>
Date: Tue, 9 Apr 2024 11:11:17 +0200
Subject: [PATCH 4/5] sprintlog

---
 SPRINTLOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/SPRINTLOG.md b/SPRINTLOG.md
index e83c62ff7..38230474f 100644
--- a/SPRINTLOG.md
+++ b/SPRINTLOG.md
@@ -378,3 +378,7 @@ _Nothing merged in CLI during this sprint_
 # 2024-03-25 - 2024-04-5
 
 - Update base image and packages to address cve in docker containers ([#1523](https://github.com/ScilifelabDataCentre/dds_web/pull/1523))
+
+# 2024-04-8 - 2024-04-19
+
+- New version: 2.6.4 ([#1526](https://github.com/ScilifelabDataCentre/dds_web/pull/1526))

From e4bfd6967c962a82eebc4f8d0be67e44082d9bd9 Mon Sep 17 00:00:00 2001
From: rv0lt <alvarorevu@gmail.com>
Date: Tue, 9 Apr 2024 11:33:31 +0200
Subject: [PATCH 5/5] update test version aswell

---
 tests/test_version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_version.py b/tests/test_version.py
index ffda79421..3d739eac6 100644
--- a/tests/test_version.py
+++ b/tests/test_version.py
@@ -2,4 +2,4 @@
 
 
 def test_version():
-    assert version.__version__ == "2.6.3"
+    assert version.__version__ == "2.6.4"