Merge pull request #1494 from ScilifelabDataCentre/new-release-nov22

New version & changelog
ScilifelabDataCentre · Nov 22, 2023 · 2a21ccf · 2a21ccf
2 parents 055e7c8 + 8624b8d
commit 2a21ccf
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 2 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,6 +1,20 @@
 Changelog
 ==========
 
+.. _2.6.0:
+
+2.6.0 - 2023-11-22
+~~~~~~~~~~~~~~~~~~~~~~~
+
+- New endpoint `AddFailedFiles` to allow a retry of saving files to the database after issues during upload.
+- Cronjobs:
+    - Updated command: `quarterly-usage` changed to `monthly-usage` and refactored to catch errors and send emails.
+    - New command `send-usage` to collect usage rows from the `Usage` table and send csv files to support email.
+- Dependencies: 
+    - `Pillow` from `9.3.0` to `10.1.0`
+    - `urllib3` from `1.26.8` to `1.26.18`
+    - `postcss` (npm) from `8.4.28` to `8.4.31`
+
 .. _2.5.2:
 
 2.5.2 - 2023-10-25

diff --git a/SPRINTLOG.md b/SPRINTLOG.md
@@ -329,3 +329,4 @@ _Nothing merged in CLI during this sprint_
 - Updated urllib3 package version to address vulnerabities ([#1487](https://github.com/ScilifelabDataCentre/dds_web/pull/1487))
 - Updated PostCss Node package to address vulnerabities ([#1489](https://github.com/ScilifelabDataCentre/dds_web/pull/1489))
 - Updated Several node libraries to address vulnerabities ([#1492](https://github.com/ScilifelabDataCentre/dds_web/pull/1492))
+- New version: 2.6.0 ([#1494](https://github.com/ScilifelabDataCentre/dds_web/pull/1494))
diff --git a/dds_web/version.py b/dds_web/version.py
@@ -1 +1,3 @@
-__version__ = "2.5.2"
+# 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"
diff --git a/tests/test_version.py b/tests/test_version.py
@@ -2,4 +2,4 @@
 
 
 def test_version():
-    assert version.__version__ == "2.5.2"
+    assert version.__version__ == "2.6.0"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,4 @@


		def test_version():
		assert version.__version__ == "2.5.2"
		assert version.__version__ == "2.6.0"