From 0a2ff486ec8f438377a8dd40e85c3114c347ac98 Mon Sep 17 00:00:00 2001
From: "cvat-bot[bot]" <147643061+cvat-bot[bot]@users.noreply.github.com>
Date: Wed, 29 Jan 2025 17:43:01 +0000
Subject: [PATCH 1/2] Prepare release v2.26.1

---
 CHANGELOG.md                                  | 26 +++++++++++++++++++
 ...0122_142453_roman_labeltype_choicefield.md |  4 ---
 ...4_143705_klakhov_copy_frame_name_button.md |  4 ---
 .../20250129_120758_andrey_fix_export.md      |  8 ------
 ...29_190931_andrey_change_event_cache_dir.md |  4 ---
 cvat/__init__.py                              |  2 +-
 docker-compose.yml                            | 20 +++++++-------
 helm-chart/values.yaml                        |  4 +--
 8 files changed, 39 insertions(+), 33 deletions(-)
 delete mode 100644 changelog.d/20250122_142453_roman_labeltype_choicefield.md
 delete mode 100644 changelog.d/20250124_143705_klakhov_copy_frame_name_button.md
 delete mode 100644 changelog.d/20250129_120758_andrey_fix_export.md
 delete mode 100644 changelog.d/20250129_190931_andrey_change_event_cache_dir.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7fdfc720bbb6..f19dbace3a98 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,32 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 <!-- scriv-insert-here -->
 
+<a id='changelog-2.26.1'></a>
+## \[2.26.1\] - 2025-01-29
+
+### Added
+
+- A button to copy a filename of the image into the clipboard
+  (<https://github.com/cvat-ai/cvat/pull/8989>)
+
+### Changed
+
+- Changed location of events cache dir
+  (<https://github.com/cvat-ai/cvat/pull/9015>)
+
+### Removed
+
+- \[Helm\] Removed `disableDistinctCachePerService` settings
+  (<https://github.com/cvat-ai/cvat/pull/9008>)
+
+### Fixed
+
+- The backend now rejects invalid label types
+  (<https://github.com/cvat-ai/cvat/pull/8980>)
+
+- \[Helm\] Impossible to download exported annotations
+  (<https://github.com/cvat-ai/cvat/pull/9008>)
+
 <a id='changelog-2.26.0'></a>
 ## \[2.26.0\] - 2025-01-27
 
diff --git a/changelog.d/20250122_142453_roman_labeltype_choicefield.md b/changelog.d/20250122_142453_roman_labeltype_choicefield.md
deleted file mode 100644
index f9739ca4c8a6..000000000000
--- a/changelog.d/20250122_142453_roman_labeltype_choicefield.md
+++ /dev/null
@@ -1,4 +0,0 @@
-### Fixed
-
-- The backend now rejects invalid label types
-  (<https://github.com/cvat-ai/cvat/pull/8980>)
diff --git a/changelog.d/20250124_143705_klakhov_copy_frame_name_button.md b/changelog.d/20250124_143705_klakhov_copy_frame_name_button.md
deleted file mode 100644
index 4c76c5f80724..000000000000
--- a/changelog.d/20250124_143705_klakhov_copy_frame_name_button.md
+++ /dev/null
@@ -1,4 +0,0 @@
-### Added
-
-- A button to copy a filename of the image into the clipboard
-  (<https://github.com/cvat-ai/cvat/pull/8989>)
diff --git a/changelog.d/20250129_120758_andrey_fix_export.md b/changelog.d/20250129_120758_andrey_fix_export.md
deleted file mode 100644
index 6b741bfb611d..000000000000
--- a/changelog.d/20250129_120758_andrey_fix_export.md
+++ /dev/null
@@ -1,8 +0,0 @@
-### Removed
-
-- \[Helm\] Removed `disableDistinctCachePerService` settings
-  (<https://github.com/cvat-ai/cvat/pull/9008>)
-
-### Fixed
-- \[Helm\] Impossible to download exported annotations
-  (<https://github.com/cvat-ai/cvat/pull/9008>)
diff --git a/changelog.d/20250129_190931_andrey_change_event_cache_dir.md b/changelog.d/20250129_190931_andrey_change_event_cache_dir.md
deleted file mode 100644
index fa550a348ff9..000000000000
--- a/changelog.d/20250129_190931_andrey_change_event_cache_dir.md
+++ /dev/null
@@ -1,4 +0,0 @@
-### Changed
-
-- Changed location of events cache dir
-  (<https://github.com/cvat-ai/cvat/pull/9015>)
diff --git a/cvat/__init__.py b/cvat/__init__.py
index 81bf478b8753..c5f4f83e5cd5 100644
--- a/cvat/__init__.py
+++ b/cvat/__init__.py
@@ -4,6 +4,6 @@
 
 from cvat.utils.version import get_version
 
-VERSION = (2, 26, 1, "alpha", 0)
+VERSION = (2, 26, 1, "final", 0)
 
 __version__ = get_version(VERSION)
diff --git a/docker-compose.yml b/docker-compose.yml
index 1d83ad44754a..e48a59ba4463 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -81,7 +81,7 @@ services:
 
   cvat_server:
     container_name: cvat_server
-    image: cvat/server:${CVAT_VERSION:-dev}
+    image: cvat/server:${CVAT_VERSION:-v2.26.1}
     restart: always
     depends_on:
       <<: *backend-deps
@@ -115,7 +115,7 @@ services:
 
   cvat_utils:
     container_name: cvat_utils
-    image: cvat/server:${CVAT_VERSION:-dev}
+    image: cvat/server:${CVAT_VERSION:-v2.26.1}
     restart: always
     depends_on: *backend-deps
     environment:
@@ -132,7 +132,7 @@ services:
 
   cvat_worker_import:
     container_name: cvat_worker_import
-    image: cvat/server:${CVAT_VERSION:-dev}
+    image: cvat/server:${CVAT_VERSION:-v2.26.1}
     restart: always
     depends_on: *backend-deps
     environment:
@@ -148,7 +148,7 @@ services:
 
   cvat_worker_export:
     container_name: cvat_worker_export
-    image: cvat/server:${CVAT_VERSION:-dev}
+    image: cvat/server:${CVAT_VERSION:-v2.26.1}
     restart: always
     depends_on: *backend-deps
     environment:
@@ -164,7 +164,7 @@ services:
 
   cvat_worker_annotation:
     container_name: cvat_worker_annotation
-    image: cvat/server:${CVAT_VERSION:-dev}
+    image: cvat/server:${CVAT_VERSION:-v2.26.1}
     restart: always
     depends_on: *backend-deps
     environment:
@@ -180,7 +180,7 @@ services:
 
   cvat_worker_webhooks:
     container_name: cvat_worker_webhooks
-    image: cvat/server:${CVAT_VERSION:-dev}
+    image: cvat/server:${CVAT_VERSION:-v2.26.1}
     restart: always
     depends_on: *backend-deps
     environment:
@@ -196,7 +196,7 @@ services:
 
   cvat_worker_quality_reports:
     container_name: cvat_worker_quality_reports
-    image: cvat/server:${CVAT_VERSION:-dev}
+    image: cvat/server:${CVAT_VERSION:-v2.26.1}
     restart: always
     depends_on: *backend-deps
     environment:
@@ -212,7 +212,7 @@ services:
 
   cvat_worker_analytics_reports:
     container_name: cvat_worker_analytics_reports
-    image: cvat/server:${CVAT_VERSION:-dev}
+    image: cvat/server:${CVAT_VERSION:-v2.26.1}
     restart: always
     depends_on: *backend-deps
     environment:
@@ -228,7 +228,7 @@ services:
 
   cvat_worker_chunks:
     container_name: cvat_worker_chunks
-    image: cvat/server:${CVAT_VERSION:-dev}
+    image: cvat/server:${CVAT_VERSION:-v2.26.1}
     restart: always
     depends_on: *backend-deps
     environment:
@@ -244,7 +244,7 @@ services:
 
   cvat_ui:
     container_name: cvat_ui
-    image: cvat/ui:${CVAT_VERSION:-dev}
+    image: cvat/ui:${CVAT_VERSION:-v2.26.1}
     restart: always
     depends_on:
       - cvat_server
diff --git a/helm-chart/values.yaml b/helm-chart/values.yaml
index 1ea296d3dd78..329f74fe5aef 100644
--- a/helm-chart/values.yaml
+++ b/helm-chart/values.yaml
@@ -139,7 +139,7 @@ cvat:
       additionalVolumeMounts: []
     replicas: 1
     image: cvat/server
-    tag: dev
+    tag: v2.26.1
     imagePullPolicy: Always
     permissionFix:
       enabled: true
@@ -161,7 +161,7 @@ cvat:
   frontend:
     replicas: 1
     image: cvat/ui
-    tag: dev
+    tag: v2.26.1
     imagePullPolicy: Always
     labels: {}
     #  test: test

From 70bfe7bf6e853106bb1586d17d573cdce543d10b Mon Sep 17 00:00:00 2001
From: "cvat-bot[bot]" <147643061+cvat-bot[bot]@users.noreply.github.com>
Date: Wed, 29 Jan 2025 18:42:38 +0000
Subject: [PATCH 2/2] Update develop after v2.26.1

---
 cvat-cli/requirements/base.txt   |  2 +-
 cvat-cli/src/cvat_cli/version.py |  2 +-
 cvat-sdk/gen/generate.sh         |  2 +-
 cvat-ui/package.json             |  2 +-
 cvat/__init__.py                 |  2 +-
 cvat/schema.yml                  |  2 +-
 docker-compose.yml               | 20 ++++++++++----------
 helm-chart/values.yaml           |  4 ++--
 8 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/cvat-cli/requirements/base.txt b/cvat-cli/requirements/base.txt
index bea402979e5b..944cd4b898ff 100644
--- a/cvat-cli/requirements/base.txt
+++ b/cvat-cli/requirements/base.txt
@@ -1,4 +1,4 @@
-cvat-sdk==2.26.1
+cvat-sdk==2.26.2
 
 attrs>=24.2.0
 Pillow>=10.3.0
diff --git a/cvat-cli/src/cvat_cli/version.py b/cvat-cli/src/cvat_cli/version.py
index d4640239b8ee..575f64c06e4c 100644
--- a/cvat-cli/src/cvat_cli/version.py
+++ b/cvat-cli/src/cvat_cli/version.py
@@ -1 +1 @@
-VERSION = "2.26.1"
+VERSION = "2.26.2"
diff --git a/cvat-sdk/gen/generate.sh b/cvat-sdk/gen/generate.sh
index 52a32e9155a4..8694ccdd1be3 100755
--- a/cvat-sdk/gen/generate.sh
+++ b/cvat-sdk/gen/generate.sh
@@ -8,7 +8,7 @@ set -e
 
 GENERATOR_VERSION="v6.0.1"
 
-VERSION="2.26.1"
+VERSION="2.26.2"
 LIB_NAME="cvat_sdk"
 LAYER1_LIB_NAME="${LIB_NAME}/api_client"
 DST_DIR="$(cd "$(dirname -- "$0")/.." && pwd)"
diff --git a/cvat-ui/package.json b/cvat-ui/package.json
index fb7cf38d9611..08b640f1a90c 100644
--- a/cvat-ui/package.json
+++ b/cvat-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cvat-ui",
-  "version": "2.26.1",
+  "version": "2.26.2",
   "description": "CVAT single-page application",
   "main": "src/index.tsx",
   "scripts": {
diff --git a/cvat/__init__.py b/cvat/__init__.py
index c5f4f83e5cd5..2869df48f720 100644
--- a/cvat/__init__.py
+++ b/cvat/__init__.py
@@ -4,6 +4,6 @@
 
 from cvat.utils.version import get_version
 
-VERSION = (2, 26, 1, "final", 0)
+VERSION = (2, 26, 2, "alpha", 0)
 
 __version__ = get_version(VERSION)
diff --git a/cvat/schema.yml b/cvat/schema.yml
index 4bbc544d86c8..cca95f213c5b 100644
--- a/cvat/schema.yml
+++ b/cvat/schema.yml
@@ -1,7 +1,7 @@
 openapi: 3.0.3
 info:
   title: CVAT REST API
-  version: 2.26.1
+  version: 2.26.2
   description: REST API for Computer Vision Annotation Tool (CVAT)
   termsOfService: https://www.google.com/policies/terms/
   contact:
diff --git a/docker-compose.yml b/docker-compose.yml
index e48a59ba4463..1d83ad44754a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -81,7 +81,7 @@ services:
 
   cvat_server:
     container_name: cvat_server
-    image: cvat/server:${CVAT_VERSION:-v2.26.1}
+    image: cvat/server:${CVAT_VERSION:-dev}
     restart: always
     depends_on:
       <<: *backend-deps
@@ -115,7 +115,7 @@ services:
 
   cvat_utils:
     container_name: cvat_utils
-    image: cvat/server:${CVAT_VERSION:-v2.26.1}
+    image: cvat/server:${CVAT_VERSION:-dev}
     restart: always
     depends_on: *backend-deps
     environment:
@@ -132,7 +132,7 @@ services:
 
   cvat_worker_import:
     container_name: cvat_worker_import
-    image: cvat/server:${CVAT_VERSION:-v2.26.1}
+    image: cvat/server:${CVAT_VERSION:-dev}
     restart: always
     depends_on: *backend-deps
     environment:
@@ -148,7 +148,7 @@ services:
 
   cvat_worker_export:
     container_name: cvat_worker_export
-    image: cvat/server:${CVAT_VERSION:-v2.26.1}
+    image: cvat/server:${CVAT_VERSION:-dev}
     restart: always
     depends_on: *backend-deps
     environment:
@@ -164,7 +164,7 @@ services:
 
   cvat_worker_annotation:
     container_name: cvat_worker_annotation
-    image: cvat/server:${CVAT_VERSION:-v2.26.1}
+    image: cvat/server:${CVAT_VERSION:-dev}
     restart: always
     depends_on: *backend-deps
     environment:
@@ -180,7 +180,7 @@ services:
 
   cvat_worker_webhooks:
     container_name: cvat_worker_webhooks
-    image: cvat/server:${CVAT_VERSION:-v2.26.1}
+    image: cvat/server:${CVAT_VERSION:-dev}
     restart: always
     depends_on: *backend-deps
     environment:
@@ -196,7 +196,7 @@ services:
 
   cvat_worker_quality_reports:
     container_name: cvat_worker_quality_reports
-    image: cvat/server:${CVAT_VERSION:-v2.26.1}
+    image: cvat/server:${CVAT_VERSION:-dev}
     restart: always
     depends_on: *backend-deps
     environment:
@@ -212,7 +212,7 @@ services:
 
   cvat_worker_analytics_reports:
     container_name: cvat_worker_analytics_reports
-    image: cvat/server:${CVAT_VERSION:-v2.26.1}
+    image: cvat/server:${CVAT_VERSION:-dev}
     restart: always
     depends_on: *backend-deps
     environment:
@@ -228,7 +228,7 @@ services:
 
   cvat_worker_chunks:
     container_name: cvat_worker_chunks
-    image: cvat/server:${CVAT_VERSION:-v2.26.1}
+    image: cvat/server:${CVAT_VERSION:-dev}
     restart: always
     depends_on: *backend-deps
     environment:
@@ -244,7 +244,7 @@ services:
 
   cvat_ui:
     container_name: cvat_ui
-    image: cvat/ui:${CVAT_VERSION:-v2.26.1}
+    image: cvat/ui:${CVAT_VERSION:-dev}
     restart: always
     depends_on:
       - cvat_server
diff --git a/helm-chart/values.yaml b/helm-chart/values.yaml
index 329f74fe5aef..1ea296d3dd78 100644
--- a/helm-chart/values.yaml
+++ b/helm-chart/values.yaml
@@ -139,7 +139,7 @@ cvat:
       additionalVolumeMounts: []
     replicas: 1
     image: cvat/server
-    tag: v2.26.1
+    tag: dev
     imagePullPolicy: Always
     permissionFix:
       enabled: true
@@ -161,7 +161,7 @@ cvat:
   frontend:
     replicas: 1
     image: cvat/ui
-    tag: v2.26.1
+    tag: dev
     imagePullPolicy: Always
     labels: {}
     #  test: test