From d9ebf9b90789dfe2a90e5e2e1c17396d282db758 Mon Sep 17 00:00:00 2001
From: Monika Tercjak <57092960+sheenaze@users.noreply.github.com>
Date: Thu, 22 Feb 2024 06:29:15 +0100
Subject: [PATCH] Release 2.6.0 (#833)

* printing removed

* release 2.6.0 prepared
---
 .../share-user-data/share-user-data.component.ts       |  3 +--
 UI/src/app/pages/validate/validate.component.ts        |  1 -
 docker/compose/prod/docker-compose.yml                 |  9 +++++----
 docker/compose/test/docker-compose.yml                 |  6 +++---
 environment/qa4sm_env.yml                              |  2 +-
 release-notes.md                                       | 10 ++++++++++
 valentina/version.py                                   |  3 +--
 7 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/UI/src/app/modules/user-datasets/components/share-user-data/share-user-data.component.ts b/UI/src/app/modules/user-datasets/components/share-user-data/share-user-data.component.ts
index 713a82be7..c3fe7ae6f 100644
--- a/UI/src/app/modules/user-datasets/components/share-user-data/share-user-data.component.ts
+++ b/UI/src/app/modules/user-datasets/components/share-user-data/share-user-data.component.ts
@@ -72,14 +72,13 @@ export class ShareUserDataComponent implements OnInit, OnChanges{
 
   public manageDataInGroup(groupId: number, dataId: string, action: string): void{
     this.userDatasetService.manageDataInManagementGroup(groupId, dataId, action).subscribe(data => {
-      console.log(data);
       this.openShareDataWindow.emit(false)
       // this.shareDataModalWindow = false;
     })
   }
 
   public removeGroup(): void{
-    console.log('I am trying to remove this group')
+    // console.log('I am trying to remove this group')
   }
 
 }
diff --git a/UI/src/app/pages/validate/validate.component.ts b/UI/src/app/pages/validate/validate.component.ts
index 6aa85af5d..4424fb00d 100644
--- a/UI/src/app/pages/validate/validate.component.ts
+++ b/UI/src/app/pages/validate/validate.component.ts
@@ -939,7 +939,6 @@ export class ValidateComponent implements OnInit, AfterViewInit {
   }
 
   public checkIsmnPoints(evt): void {
-    console.log(evt)
     this.noIsmnPoints.next(evt)
   }
 
diff --git a/docker/compose/prod/docker-compose.yml b/docker/compose/prod/docker-compose.yml
index f42377502..bca3528a5 100644
--- a/docker/compose/prod/docker-compose.yml
+++ b/docker/compose/prod/docker-compose.yml
@@ -22,7 +22,7 @@ services:
     restart: always
 
   web:
-    image: "awst/qa4sm:2.5.0"
+    image: "awst/qa4sm:2.6.0"
     restart: always
     environment:
       POSTGRES_PASSWORD: "${POSTGRES_PASSWORD}"
@@ -31,6 +31,7 @@ services:
       QA4SM_DB_USER: "${QA4SM_DB_USER}"
       QA4SM_DB_PASSWORD: "${QA4SM_DB_PASSWORD}"
       QA4SM_DB_HOST: "${QA4SM_DB_HOST}"
+      QA4SM_DATA_FOLDER: "${QA4SM_DATA_FOLDER}"
 
     volumes:
       - type: bind
@@ -50,16 +51,16 @@ services:
         target: /var/lib/qa4sm-web-val/valentina/data/user_data
 
   proxy:
-    image: "awst/qa4sm-proxy:2.5.0"
+    image: "awst/qa4sm-proxy:2.6.0"
     restart: always
     ports:
       - "8080:80"
   ui:
-    image: "awst/qa4sm-ui:2.5.0"
+    image: "awst/qa4sm-ui:2.6.0"
     restart: always
 
   worker-1:
-    image: "awst/qa4sm-worker:2.5.0"
+    image: "awst/qa4sm-worker:2.6.0"
     restart: always
     environment:
       QA4SM_DB_HOST: "${QA4SM_DB_HOST}"
diff --git a/docker/compose/test/docker-compose.yml b/docker/compose/test/docker-compose.yml
index 51b051a69..d4839eebc 100644
--- a/docker/compose/test/docker-compose.yml
+++ b/docker/compose/test/docker-compose.yml
@@ -49,9 +49,6 @@ services:
       - type: bind
         source: "${QA4SM_WORKSPACE}webapp/user_data"
         target: /var/lib/qa4sm-web-val/valentina/data/user_data
-      - type: bind
-        source: "${QA4SM_USERMANUAL_FOLDER}"
-        target: /var/lib/qa4sm-web-val/valentina/docs
 
   proxy:
     image: "awst/qa4sm-proxy:latest"
@@ -81,6 +78,9 @@ services:
       - type: bind
         source: "${QA4SM_WORKSPACE}webapp/user_data"
         target: /var/lib/qa4sm-web-val/valentina/data/user_data
+      - type: bind
+        source: "${QA4SM_USERMANUAL_FOLDER}"
+        target: /var/lib/qa4sm-web-val/valentina/docs
     deploy:
       resources:
         limits:
diff --git a/environment/qa4sm_env.yml b/environment/qa4sm_env.yml
index b41048f57..3e557826e 100644
--- a/environment/qa4sm_env.yml
+++ b/environment/qa4sm_env.yml
@@ -245,7 +245,7 @@ dependencies:
     - gldas==0.7.0
     - h5netcdf==1.1.0
     - h5py==3.8.0
-    - git+https://github.com/TUW-GEO/ismn.git@master
+    - ismn==1.4.0
     - joblib==1.2.0
     - kombu==5.2.4
     - llvmlite==0.40.0
diff --git a/release-notes.md b/release-notes.md
index 7c05c6655..8aa422291 100644
--- a/release-notes.md
+++ b/release-notes.md
@@ -1,3 +1,13 @@
+QA4SM v2.6.0 - Release notes 2024-02-21
+=======================================================
+# Updates
+1. Layout for small screens updated
+2. Ismn package version updated
+
+# New Features
+1. ISMN stations presented on the map for better overview
+2. Possibility to archive and unarchive multiple datasets added
+
 QA4SM v2.5.0 - Release notes 2024-01-08
 =======================================================
 # Updates
diff --git a/valentina/version.py b/valentina/version.py
index e84a6609d..9c22cbe7d 100644
--- a/valentina/version.py
+++ b/valentina/version.py
@@ -1,2 +1 @@
-APP_VERSION = '2.5.0'
-
+APP_VERSION = '2.6.0'
\ No newline at end of file