From 58187222fa90220a5f7c66e4d9c021c0a83ee0dc Mon Sep 17 00:00:00 2001 From: valyo <582646+valyo@users.noreply.github.com> Date: Thu, 14 Dec 2023 15:06:20 +0100 Subject: [PATCH 1/3] changelog --- CHANGELOG.rst | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 1c52999f3..277c1441b 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,6 +1,17 @@ Changelog ========== +.. _2.6.1: + +2.6.1 - 2023-12-20 +~~~~~~~~~~~~~~~~~~~~~~~ + +- Bugs fixed: + - Listing users invites will now show if the invote is for Project Owner. + - Permissions issue for `send-usage` command in testing and production environment. +- Dependencies: + - `Cryptography` from `41.0.3` to `41.0.6` + .. _2.6.0: 2.6.0 - 2023-11-22 From fb1140c46ced82a7edc9137c4039bf492efa56b0 Mon Sep 17 00:00:00 2001 From: valyo <582646+valyo@users.noreply.github.com> Date: Thu, 14 Dec 2023 15:06:50 +0100 Subject: [PATCH 2/3] version --- dds_web/version.py | 2 +- tests/test_version.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dds_web/version.py b/dds_web/version.py index 1d61112a0..67e1d4985 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.0" +__version__ = "2.6.1" diff --git a/tests/test_version.py b/tests/test_version.py index aaf84a488..345f38049 100644 --- a/tests/test_version.py +++ b/tests/test_version.py @@ -2,4 +2,4 @@ def test_version(): - assert version.__version__ == "2.6.0" + assert version.__version__ == "2.6.1" From eca8aa55e2cf4d8aca93d0c6d0b6d6d5a5b63410 Mon Sep 17 00:00:00 2001 From: valyo <582646+valyo@users.noreply.github.com> Date: Thu, 14 Dec 2023 15:09:47 +0100 Subject: [PATCH 3/3] sprintlog --- SPRINTLOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/SPRINTLOG.md b/SPRINTLOG.md index 433fe0f35..ca031ea1f 100644 --- a/SPRINTLOG.md +++ b/SPRINTLOG.md @@ -336,3 +336,4 @@ _Nothing merged in CLI during this sprint_ - Patch update crypthography package to address cve ([#1496](https://github.com/ScilifelabDataCentre/dds_web/pull/1496)) - Fix listing users was not showing PO ([#1497](https://github.com/ScilifelabDataCentre/dds_web/pull/1497)) - Bug: `flask send-usage` permission issue on testing and production environment ([1499](https://github.com/ScilifelabDataCentre/dds_web/pull/1499)) +- New version: 2.6.1 ([#1501](https://github.com/ScilifelabDataCentre/dds_web/pull/1501))