From c21062f5f02490a3511a58c490b25beb0f408241 Mon Sep 17 00:00:00 2001 From: "cvat-bot[bot]" <147643061+cvat-bot[bot]@users.noreply.github.com> Date: Thu, 18 Jan 2024 10:25:37 +0000 Subject: [PATCH 1/2] Prepare release v2.10.1 --- CHANGELOG.md | 20 +++++++++++++++++++ ...31721_maria_fix_export_to_cloud_storage.md | 6 ------ ...0240115_172625_andrey_switch_to_kvrocks.md | 4 ---- .../20240117_093145_boris_fixed_ui_fail.md | 6 ------ 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 ++-- 11 files changed, 36 insertions(+), 32 deletions(-) delete mode 100644 changelog.d/20240108_231721_maria_fix_export_to_cloud_storage.md delete mode 100644 changelog.d/20240115_172625_andrey_switch_to_kvrocks.md delete mode 100644 changelog.d/20240117_093145_boris_fixed_ui_fail.md diff --git a/CHANGELOG.md b/CHANGELOG.md index 661cdc7d3850..6bae35d6a416 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.1\] - 2024-01-18 + +### Changed + +- KeyDB used as data cache replaced by Kvrocks + () + +### Fixed + +- 504 Timeout error when exporting resources to cloud storage + () +- Enqueuing deferred jobs when their dependencies have been started -> cancelled -> restarted -> finished + () + +- UI failed when open context menu for a skeleton element on a frame with a conflict + () +- Issue can not be created for a skeleton element in review mode + () + ## \[2.10.0\] - 2024-01-10 diff --git a/changelog.d/20240108_231721_maria_fix_export_to_cloud_storage.md b/changelog.d/20240108_231721_maria_fix_export_to_cloud_storage.md deleted file mode 100644 index 13554c9e98fc..000000000000 --- a/changelog.d/20240108_231721_maria_fix_export_to_cloud_storage.md +++ /dev/null @@ -1,6 +0,0 @@ -### Fixed - -- 504 Timeout error when exporting resources to cloud storage - () -- Enqueuing deferred jobs when their dependencies have been started -> cancelled -> restarted -> finished - () diff --git a/changelog.d/20240115_172625_andrey_switch_to_kvrocks.md b/changelog.d/20240115_172625_andrey_switch_to_kvrocks.md deleted file mode 100644 index 079ad5fbd8eb..000000000000 --- a/changelog.d/20240115_172625_andrey_switch_to_kvrocks.md +++ /dev/null @@ -1,4 +0,0 @@ -### Changed - -- KeyDB used as data cache replaced by Kvrocks - () diff --git a/changelog.d/20240117_093145_boris_fixed_ui_fail.md b/changelog.d/20240117_093145_boris_fixed_ui_fail.md deleted file mode 100644 index 20a57f4cafd3..000000000000 --- a/changelog.d/20240117_093145_boris_fixed_ui_fail.md +++ /dev/null @@ -1,6 +0,0 @@ -### Fixed - -- UI failed when open context menu for a skeleton element on a frame with a conflict - () -- Issue can not be created for a skeleton element in review mode - () diff --git a/cvat-cli/requirements/base.txt b/cvat-cli/requirements/base.txt index 923a5c573f90..5d8a52de294c 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.1 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..267fcbda3760 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.1" diff --git a/cvat-sdk/gen/generate.sh b/cvat-sdk/gen/generate.sh index 0ce2af39efd0..503927641415 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.1" 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..3be3f95e21d1 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, 1, 'final', 0) __version__ = get_version(VERSION) diff --git a/cvat/schema.yml b/cvat/schema.yml index f8ee3e42c3a0..801b783a947d 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.1 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..61f687120041 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.1} 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.1} 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.1} 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.1} 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.1} 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.1} 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.1} 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.1} 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.1} restart: always depends_on: - cvat_server diff --git a/helm-chart/values.yaml b/helm-chart/values.yaml index d6f5de34289d..75678842011e 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.1 imagePullPolicy: Always permissionFix: enabled: true @@ -137,7 +137,7 @@ cvat: frontend: replicas: 1 image: cvat/ui - tag: dev + tag: v2.10.1 imagePullPolicy: Always labels: {} # test: test From 1d8721696ad1e698c15e196340f9fc660e3cb442 Mon Sep 17 00:00:00 2001 From: "cvat-bot[bot]" <147643061+cvat-bot[bot]@users.noreply.github.com> Date: Thu, 18 Jan 2024 11:10:54 +0000 Subject: [PATCH 2/2] Update develop after v2.10.1 --- 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 ++-- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/cvat-cli/requirements/base.txt b/cvat-cli/requirements/base.txt index 5d8a52de294c..923a5c573f90 100644 --- a/cvat-cli/requirements/base.txt +++ b/cvat-cli/requirements/base.txt @@ -1,3 +1,3 @@ -cvat-sdk~=2.10.1 +cvat-sdk~=2.11.0 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 267fcbda3760..e80dd8624369 100644 --- a/cvat-cli/src/cvat_cli/version.py +++ b/cvat-cli/src/cvat_cli/version.py @@ -1 +1 @@ -VERSION = "2.10.1" +VERSION = "2.11.0" diff --git a/cvat-sdk/gen/generate.sh b/cvat-sdk/gen/generate.sh index 503927641415..0ce2af39efd0 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.10.1" +VERSION="2.11.0" 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 3be3f95e21d1..5e28d327dbf0 100644 --- a/cvat/__init__.py +++ b/cvat/__init__.py @@ -4,6 +4,6 @@ from cvat.utils.version import get_version -VERSION = (2, 10, 1, 'final', 0) +VERSION = (2, 11, 0, 'alpha', 0) __version__ = get_version(VERSION) diff --git a/cvat/schema.yml b/cvat/schema.yml index 801b783a947d..f8ee3e42c3a0 100644 --- a/cvat/schema.yml +++ b/cvat/schema.yml @@ -1,7 +1,7 @@ openapi: 3.0.3 info: title: CVAT REST API - version: 2.10.1 + version: 2.11.0 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 61f687120041..bec69441589e 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:-v2.10.1} + image: cvat/server:${CVAT_VERSION:-dev} restart: always depends_on: <<: *backend-deps @@ -99,7 +99,7 @@ services: cvat_utils: container_name: cvat_utils - image: cvat/server:${CVAT_VERSION:-v2.10.1} + image: cvat/server:${CVAT_VERSION:-dev} 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:-v2.10.1} + image: cvat/server:${CVAT_VERSION:-dev} 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:-v2.10.1} + image: cvat/server:${CVAT_VERSION:-dev} 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:-v2.10.1} + image: cvat/server:${CVAT_VERSION:-dev} 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:-v2.10.1} + image: cvat/server:${CVAT_VERSION:-dev} 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:-v2.10.1} + image: cvat/server:${CVAT_VERSION:-dev} 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:-v2.10.1} + image: cvat/server:${CVAT_VERSION:-dev} restart: always depends_on: *backend-deps environment: @@ -212,7 +212,7 @@ services: cvat_ui: container_name: cvat_ui - image: cvat/ui:${CVAT_VERSION:-v2.10.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 75678842011e..d6f5de34289d 100644 --- a/helm-chart/values.yaml +++ b/helm-chart/values.yaml @@ -113,7 +113,7 @@ cvat: additionalVolumeMounts: [] replicas: 1 image: cvat/server - tag: v2.10.1 + tag: dev imagePullPolicy: Always permissionFix: enabled: true @@ -137,7 +137,7 @@ cvat: frontend: replicas: 1 image: cvat/ui - tag: v2.10.1 + tag: dev imagePullPolicy: Always labels: {} # test: test