From 3733a071b0919a5c539fe2f0a98929cd713ecff1 Mon Sep 17 00:00:00 2001
From: "cvat-bot[bot]" <147643061+cvat-bot[bot]@users.noreply.github.com>
Date: Fri, 26 Jan 2024 13:35:45 +0000
Subject: [PATCH] Prepare release v2.10.2
---
CHANGELOG.md | 20 +++++++++++++++++++
...40112_123610_klakhov_remove_empty_masks.md | 4 ----
...roman_project_export_memory_consumption.md | 5 -----
...18_100807_boris_better_errors_messaging.md | 4 ----
...7_klakhov_fix_opencv_tracker_frame_late.md | 4 ----
cvat-cli/requirements/base.txt | 2 +-
cvat-cli/src/cvat_cli/version.py | 2 +-
cvat-sdk/gen/generate.sh | 2 +-
cvat/__init__.py | 2 +-
cvat/schema.yml | 2 +-
docker-compose.yml | 18 ++++++++---------
helm-chart/values.yaml | 4 ++--
12 files changed, 36 insertions(+), 33 deletions(-)
delete mode 100644 changelog.d/20240112_123610_klakhov_remove_empty_masks.md
delete mode 100644 changelog.d/20240118_030702_roman_project_export_memory_consumption.md
delete mode 100644 changelog.d/20240118_100807_boris_better_errors_messaging.md
delete mode 100644 changelog.d/20240126_130427_klakhov_fix_opencv_tracker_frame_late.md
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6bae35d6a416..68bd76d69aaf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,26 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
+
+## \[2.10.2\] - 2024-01-26
+
+### Changed
+
+- Enhanced errors messaging for better perception by users
+ ()
+
+### Fixed
+
+- Empty masks might be created with `polygon-minus` tool ()
+- Empty masks might be created as a result of removing underlying pixels ()
+
+- Fixed excessive memory usage
+ when exporting a project with multiple video tasks
+ ()
+
+- OpenCV tracker MIL works one frame behind
+ ()
+
## \[2.10.1\] - 2024-01-18
diff --git a/changelog.d/20240112_123610_klakhov_remove_empty_masks.md b/changelog.d/20240112_123610_klakhov_remove_empty_masks.md
deleted file mode 100644
index d01566fd32ef..000000000000
--- a/changelog.d/20240112_123610_klakhov_remove_empty_masks.md
+++ /dev/null
@@ -1,4 +0,0 @@
-### Fixed
-
-- Empty masks might be created with `polygon-minus` tool ()
-- Empty masks might be created as a result of removing underlying pixels ()
diff --git a/changelog.d/20240118_030702_roman_project_export_memory_consumption.md b/changelog.d/20240118_030702_roman_project_export_memory_consumption.md
deleted file mode 100644
index fd60e8db6d70..000000000000
--- a/changelog.d/20240118_030702_roman_project_export_memory_consumption.md
+++ /dev/null
@@ -1,5 +0,0 @@
-### Fixed
-
-- Fixed excessive memory usage
- when exporting a project with multiple video tasks
- ()
diff --git a/changelog.d/20240118_100807_boris_better_errors_messaging.md b/changelog.d/20240118_100807_boris_better_errors_messaging.md
deleted file mode 100644
index 9f6611ef05bc..000000000000
--- a/changelog.d/20240118_100807_boris_better_errors_messaging.md
+++ /dev/null
@@ -1,4 +0,0 @@
-### Changed
-
-- Enhanced errors messaging for better perception by users
- ()
diff --git a/changelog.d/20240126_130427_klakhov_fix_opencv_tracker_frame_late.md b/changelog.d/20240126_130427_klakhov_fix_opencv_tracker_frame_late.md
deleted file mode 100644
index 9979c4d4ac6d..000000000000
--- a/changelog.d/20240126_130427_klakhov_fix_opencv_tracker_frame_late.md
+++ /dev/null
@@ -1,4 +0,0 @@
-### Fixed
-
-- OpenCV tracker MIL works one frame behind
- ()
diff --git a/cvat-cli/requirements/base.txt b/cvat-cli/requirements/base.txt
index 923a5c573f90..f830295c331d 100644
--- a/cvat-cli/requirements/base.txt
+++ b/cvat-cli/requirements/base.txt
@@ -1,3 +1,3 @@
-cvat-sdk~=2.11.0
+cvat-sdk~=2.10.2
Pillow>=10.1.0
setuptools>=65.5.1 # not directly required, pinned by Snyk to avoid a vulnerability
diff --git a/cvat-cli/src/cvat_cli/version.py b/cvat-cli/src/cvat_cli/version.py
index e80dd8624369..5474fb4f6f9f 100644
--- a/cvat-cli/src/cvat_cli/version.py
+++ b/cvat-cli/src/cvat_cli/version.py
@@ -1 +1 @@
-VERSION = "2.11.0"
+VERSION = "2.10.2"
diff --git a/cvat-sdk/gen/generate.sh b/cvat-sdk/gen/generate.sh
index 0ce2af39efd0..30d6bac17a35 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.11.0"
+VERSION="2.10.2"
LIB_NAME="cvat_sdk"
LAYER1_LIB_NAME="${LIB_NAME}/api_client"
DST_DIR="$(cd "$(dirname -- "$0")/.." && pwd)"
diff --git a/cvat/__init__.py b/cvat/__init__.py
index 5e28d327dbf0..d83a93019184 100644
--- a/cvat/__init__.py
+++ b/cvat/__init__.py
@@ -4,6 +4,6 @@
from cvat.utils.version import get_version
-VERSION = (2, 11, 0, 'alpha', 0)
+VERSION = (2, 10, 2, 'final', 0)
__version__ = get_version(VERSION)
diff --git a/cvat/schema.yml b/cvat/schema.yml
index f8ee3e42c3a0..23e5f7a2ba0c 100644
--- a/cvat/schema.yml
+++ b/cvat/schema.yml
@@ -1,7 +1,7 @@
openapi: 3.0.3
info:
title: CVAT REST API
- version: 2.11.0
+ version: 2.10.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 bec69441589e..43377c9f7e04 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -64,7 +64,7 @@ services:
cvat_server:
container_name: cvat_server
- image: cvat/server:${CVAT_VERSION:-dev}
+ image: cvat/server:${CVAT_VERSION:-v2.10.2}
restart: always
depends_on:
<<: *backend-deps
@@ -99,7 +99,7 @@ services:
cvat_utils:
container_name: cvat_utils
- image: cvat/server:${CVAT_VERSION:-dev}
+ image: cvat/server:${CVAT_VERSION:-v2.10.2}
restart: always
depends_on: *backend-deps
environment:
@@ -116,7 +116,7 @@ services:
cvat_worker_import:
container_name: cvat_worker_import
- image: cvat/server:${CVAT_VERSION:-dev}
+ image: cvat/server:${CVAT_VERSION:-v2.10.2}
restart: always
depends_on: *backend-deps
environment:
@@ -132,7 +132,7 @@ services:
cvat_worker_export:
container_name: cvat_worker_export
- image: cvat/server:${CVAT_VERSION:-dev}
+ image: cvat/server:${CVAT_VERSION:-v2.10.2}
restart: always
depends_on: *backend-deps
environment:
@@ -148,7 +148,7 @@ services:
cvat_worker_annotation:
container_name: cvat_worker_annotation
- image: cvat/server:${CVAT_VERSION:-dev}
+ image: cvat/server:${CVAT_VERSION:-v2.10.2}
restart: always
depends_on: *backend-deps
environment:
@@ -164,7 +164,7 @@ services:
cvat_worker_webhooks:
container_name: cvat_worker_webhooks
- image: cvat/server:${CVAT_VERSION:-dev}
+ image: cvat/server:${CVAT_VERSION:-v2.10.2}
restart: always
depends_on: *backend-deps
environment:
@@ -180,7 +180,7 @@ services:
cvat_worker_quality_reports:
container_name: cvat_worker_quality_reports
- image: cvat/server:${CVAT_VERSION:-dev}
+ image: cvat/server:${CVAT_VERSION:-v2.10.2}
restart: always
depends_on: *backend-deps
environment:
@@ -196,7 +196,7 @@ services:
cvat_worker_analytics_reports:
container_name: cvat_worker_analytics_reports
- image: cvat/server:${CVAT_VERSION:-dev}
+ image: cvat/server:${CVAT_VERSION:-v2.10.2}
restart: always
depends_on: *backend-deps
environment:
@@ -212,7 +212,7 @@ services:
cvat_ui:
container_name: cvat_ui
- image: cvat/ui:${CVAT_VERSION:-dev}
+ image: cvat/ui:${CVAT_VERSION:-v2.10.2}
restart: always
depends_on:
- cvat_server
diff --git a/helm-chart/values.yaml b/helm-chart/values.yaml
index d6f5de34289d..8f1e4ec6a801 100644
--- a/helm-chart/values.yaml
+++ b/helm-chart/values.yaml
@@ -113,7 +113,7 @@ cvat:
additionalVolumeMounts: []
replicas: 1
image: cvat/server
- tag: dev
+ tag: v2.10.2
imagePullPolicy: Always
permissionFix:
enabled: true
@@ -137,7 +137,7 @@ cvat:
frontend:
replicas: 1
image: cvat/ui
- tag: dev
+ tag: v2.10.2
imagePullPolicy: Always
labels: {}
# test: test