Merge branch 'dev' into migrations-readme

ScilifelabDataCentre · Dec 17, 2024 · 7700506 · 7700506
2 parents a0322b2 + a396807
commit 7700506
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 4 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,6 +1,24 @@
 Changelog
 ==========
 
+.. _2.9.0:
+
+2.9.0 - 2024-12-18
+~~~~~~~~~~~~~~~~~~
+
+- New features:
+    - Delivery directory names now include 'Upload' or 'Download' for clarity.
+    - Monitor usage now sends warnings to the affected unit and Data Centre when approaching the allocated quota.
+- Bugs fixed:
+    - Improved error message for downloads after a password reset.
+    - Fixed the dds ls --tree command.
+    - Pinned mariadb-client version in backend Dockerfile for stability.
+    - Resolved Node.js vulnerabilities with npm audit fix.
+- Logging:
+    - Removed invalid token exceptions from logs.
+    - Logged usernames for password resets.
+    - Filtered out MaintenanceModeException from logs.
+
 .. _2.8.1:
 
 2.8.1 - 2024-10-23

diff --git a/Dockerfiles/backend.Dockerfile b/Dockerfiles/backend.Dockerfile
@@ -65,7 +65,7 @@ USER $USERNAME
 FROM node:18 as nodebuilder
 COPY ./dds_web/static /build
 WORKDIR /build
-RUN npm install -g npm@latest --quiet
+RUN npm install -g npm@10.9.2 --quiet
 RUN npm install --quiet
 RUN npm run css
 

diff --git a/Dockerfiles/nodebuilder.Dockerfile b/Dockerfiles/nodebuilder.Dockerfile
@@ -1,6 +1,6 @@
 FROM node:18
 RUN mkdir /build
 WORKDIR /build
-RUN npm install -g npm@latest --quiet
+RUN npm install -g npm@10.9.2 --quiet
 RUN echo "npm install --quiet && npm run watch" > /runner.sh
 CMD ["sh", "/runner.sh"]
diff --git a/SPRINTLOG.md b/SPRINTLOG.md
@@ -468,4 +468,8 @@ _Nothing merged during this sprint_
 - Update documentation regarding 'Upload' or 'Download' added to end of delivery directory name depending on command ([#1580](https://github.com/ScilifelabDataCentre/dds_web/pull/1580))
 - Modify the monitor usage command to send warning to the affected unit as well as Data Centre([#1562](https://github.com/ScilifelabDataCentre/dds_web/pull/1562))
 - Run npm audit fix to solve node cve's ([#1577](https://github.com/ScilifelabDataCentre/dds_web/pull/1577)
+
+# 2024-12-16 - 2024-12-20
+
+- New version: 2.9.0 ([#1584](https://github.com/ScilifelabDataCentre/dds_web/pull/1584))
 - Instructions regarding database migrations moved to migrations directory, and Linkspector action added to scan for incorrect links in MD ([#1576](https://github.com/ScilifelabDataCentre/dds_web/pull/1576))
diff --git 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.8.1"
+__version__ = "2.9.0"
diff --git a/tests/test_version.py b/tests/test_version.py
@@ -2,4 +2,4 @@
 
 
 def test_version():
-    assert version.__version__ == "2.8.1"
+    assert version.__version__ == "2.9.0"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,4 @@


		def test_version():
		assert version.__version__ == "2.8.1"
		assert version.__version__ == "2.9.0"