From 925ae6a624cc9ed7ce6ebbe5e7d41a4047ecd6b5 Mon Sep 17 00:00:00 2001 From: "cvat-bot[bot]" <147643061+cvat-bot[bot]@users.noreply.github.com> Date: Tue, 5 Mar 2024 13:16:16 +0000 Subject: [PATCH 1/2] Prepare release v2.11.1 --- CHANGELOG.md | 24 +++++++++++++++++++ .../20240123_225942_2h-kim_hotfix_cvat_ui.md | 4 ---- ...0240219_101835_boris_single_object_mode.md | 4 ---- ...0240223_131040_roman_better_timekeeping.md | 9 ------- ...29_185536_sekachev.bs_disable_gt_button.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, 40 insertions(+), 37 deletions(-) delete mode 100644 changelog.d/20240123_225942_2h-kim_hotfix_cvat_ui.md delete mode 100644 changelog.d/20240219_101835_boris_single_object_mode.md delete mode 100644 changelog.d/20240223_131040_roman_better_timekeeping.md delete mode 100644 changelog.d/20240229_185536_sekachev.bs_disable_gt_button.md diff --git a/CHANGELOG.md b/CHANGELOG.md index 5967fc679be8..5872e8e68ac8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,30 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 + +## \[2.11.1\] - 2024-03-05 + +### Added + +- Single shape annotation mode allowing to easily annotate scenarious where a user +only needs to draw one object on one image () + +### Fixed + +- Fixed a problem with Korean/Chinese characters in attribute annotation mode + () + +- Fixed incorrect working time calculation in the case where an event + occurred during another event + () + +- Fixed working time not being calculated for the first event in each batch + sent from the UI + () + +- Submit button is enabled while creating a ground truth job + () + ## \[2.11.0\] - 2024-02-23 diff --git a/changelog.d/20240123_225942_2h-kim_hotfix_cvat_ui.md b/changelog.d/20240123_225942_2h-kim_hotfix_cvat_ui.md deleted file mode 100644 index 5fd92355b6e5..000000000000 --- a/changelog.d/20240123_225942_2h-kim_hotfix_cvat_ui.md +++ /dev/null @@ -1,4 +0,0 @@ -### Fixed - -- Fixed a problem with Korean/Chinese characters in attribute annotation mode - () diff --git a/changelog.d/20240219_101835_boris_single_object_mode.md b/changelog.d/20240219_101835_boris_single_object_mode.md deleted file mode 100644 index 8d6706187b27..000000000000 --- a/changelog.d/20240219_101835_boris_single_object_mode.md +++ /dev/null @@ -1,4 +0,0 @@ -### Added - -- Single shape annotation mode allowing to easily annotate scenarious where a user -only needs to draw one object on one image () diff --git a/changelog.d/20240223_131040_roman_better_timekeeping.md b/changelog.d/20240223_131040_roman_better_timekeeping.md deleted file mode 100644 index bd3089a83e09..000000000000 --- a/changelog.d/20240223_131040_roman_better_timekeeping.md +++ /dev/null @@ -1,9 +0,0 @@ -### Fixed - -- Fixed incorrect working time calculation in the case where an event - occurred during another event - () - -- Fixed working time not being calculated for the first event in each batch - sent from the UI - () diff --git a/changelog.d/20240229_185536_sekachev.bs_disable_gt_button.md b/changelog.d/20240229_185536_sekachev.bs_disable_gt_button.md deleted file mode 100644 index 33574470dc70..000000000000 --- a/changelog.d/20240229_185536_sekachev.bs_disable_gt_button.md +++ /dev/null @@ -1,4 +0,0 @@ -### Fixed - -- Submit button is enabled while creating a ground truth job - () diff --git a/cvat-cli/requirements/base.txt b/cvat-cli/requirements/base.txt index 42f6811cd379..84eed943a020 100644 --- a/cvat-cli/requirements/base.txt +++ b/cvat-cli/requirements/base.txt @@ -1,3 +1,3 @@ -cvat-sdk~=2.12.0 +cvat-sdk~=2.11.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 a2befd3cc6c3..fd36d7a74976 100644 --- a/cvat-cli/src/cvat_cli/version.py +++ b/cvat-cli/src/cvat_cli/version.py @@ -1 +1 @@ -VERSION = "2.12.0" +VERSION = "2.11.1" diff --git a/cvat-sdk/gen/generate.sh b/cvat-sdk/gen/generate.sh index aaea93ceea54..0c0e04c70fe4 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.12.0" +VERSION="2.11.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 fc0e4ccd59b8..950b50a7a444 100644 --- a/cvat/__init__.py +++ b/cvat/__init__.py @@ -4,6 +4,6 @@ from cvat.utils.version import get_version -VERSION = (2, 12, 0, 'alpha', 0) +VERSION = (2, 11, 1, 'final', 0) __version__ = get_version(VERSION) diff --git a/cvat/schema.yml b/cvat/schema.yml index e97fd8ff869e..739321276d9f 100644 --- a/cvat/schema.yml +++ b/cvat/schema.yml @@ -1,7 +1,7 @@ openapi: 3.0.3 info: title: CVAT REST API - version: 2.12.0 + version: 2.11.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 371ec0b923b1..b30680566b09 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -70,7 +70,7 @@ services: cvat_server: container_name: cvat_server - image: cvat/server:${CVAT_VERSION:-dev} + image: cvat/server:${CVAT_VERSION:-v2.11.1} restart: always depends_on: <<: *backend-deps @@ -105,7 +105,7 @@ services: cvat_utils: container_name: cvat_utils - image: cvat/server:${CVAT_VERSION:-dev} + image: cvat/server:${CVAT_VERSION:-v2.11.1} restart: always depends_on: *backend-deps environment: @@ -122,7 +122,7 @@ services: cvat_worker_import: container_name: cvat_worker_import - image: cvat/server:${CVAT_VERSION:-dev} + image: cvat/server:${CVAT_VERSION:-v2.11.1} restart: always depends_on: *backend-deps environment: @@ -138,7 +138,7 @@ services: cvat_worker_export: container_name: cvat_worker_export - image: cvat/server:${CVAT_VERSION:-dev} + image: cvat/server:${CVAT_VERSION:-v2.11.1} restart: always depends_on: *backend-deps environment: @@ -154,7 +154,7 @@ services: cvat_worker_annotation: container_name: cvat_worker_annotation - image: cvat/server:${CVAT_VERSION:-dev} + image: cvat/server:${CVAT_VERSION:-v2.11.1} restart: always depends_on: *backend-deps environment: @@ -170,7 +170,7 @@ services: cvat_worker_webhooks: container_name: cvat_worker_webhooks - image: cvat/server:${CVAT_VERSION:-dev} + image: cvat/server:${CVAT_VERSION:-v2.11.1} restart: always depends_on: *backend-deps environment: @@ -186,7 +186,7 @@ services: cvat_worker_quality_reports: container_name: cvat_worker_quality_reports - image: cvat/server:${CVAT_VERSION:-dev} + image: cvat/server:${CVAT_VERSION:-v2.11.1} restart: always depends_on: *backend-deps environment: @@ -202,7 +202,7 @@ services: cvat_worker_analytics_reports: container_name: cvat_worker_analytics_reports - image: cvat/server:${CVAT_VERSION:-dev} + image: cvat/server:${CVAT_VERSION:-v2.11.1} restart: always depends_on: *backend-deps environment: @@ -218,7 +218,7 @@ services: cvat_ui: container_name: cvat_ui - image: cvat/ui:${CVAT_VERSION:-dev} + image: cvat/ui:${CVAT_VERSION:-v2.11.1} restart: always depends_on: - cvat_server diff --git a/helm-chart/values.yaml b/helm-chart/values.yaml index d6f5de34289d..83875c4a324a 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.11.1 imagePullPolicy: Always permissionFix: enabled: true @@ -137,7 +137,7 @@ cvat: frontend: replicas: 1 image: cvat/ui - tag: dev + tag: v2.11.1 imagePullPolicy: Always labels: {} # test: test From e00c9022fb8ca7ab8da12231fc9677d693e20fe0 Mon Sep 17 00:00:00 2001 From: "cvat-bot[bot]" <147643061+cvat-bot[bot]@users.noreply.github.com> Date: Tue, 5 Mar 2024 19:28:55 +0000 Subject: [PATCH 2/2] Update develop after v2.11.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 84eed943a020..42f6811cd379 100644 --- a/cvat-cli/requirements/base.txt +++ b/cvat-cli/requirements/base.txt @@ -1,3 +1,3 @@ -cvat-sdk~=2.11.1 +cvat-sdk~=2.12.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 fd36d7a74976..a2befd3cc6c3 100644 --- a/cvat-cli/src/cvat_cli/version.py +++ b/cvat-cli/src/cvat_cli/version.py @@ -1 +1 @@ -VERSION = "2.11.1" +VERSION = "2.12.0" diff --git a/cvat-sdk/gen/generate.sh b/cvat-sdk/gen/generate.sh index 0c0e04c70fe4..aaea93ceea54 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.1" +VERSION="2.12.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 950b50a7a444..fc0e4ccd59b8 100644 --- a/cvat/__init__.py +++ b/cvat/__init__.py @@ -4,6 +4,6 @@ from cvat.utils.version import get_version -VERSION = (2, 11, 1, 'final', 0) +VERSION = (2, 12, 0, 'alpha', 0) __version__ = get_version(VERSION) diff --git a/cvat/schema.yml b/cvat/schema.yml index 739321276d9f..e97fd8ff869e 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.1 + version: 2.12.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 b30680566b09..371ec0b923b1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -70,7 +70,7 @@ services: cvat_server: container_name: cvat_server - image: cvat/server:${CVAT_VERSION:-v2.11.1} + image: cvat/server:${CVAT_VERSION:-dev} restart: always depends_on: <<: *backend-deps @@ -105,7 +105,7 @@ services: cvat_utils: container_name: cvat_utils - image: cvat/server:${CVAT_VERSION:-v2.11.1} + image: cvat/server:${CVAT_VERSION:-dev} restart: always depends_on: *backend-deps environment: @@ -122,7 +122,7 @@ services: cvat_worker_import: container_name: cvat_worker_import - image: cvat/server:${CVAT_VERSION:-v2.11.1} + image: cvat/server:${CVAT_VERSION:-dev} restart: always depends_on: *backend-deps environment: @@ -138,7 +138,7 @@ services: cvat_worker_export: container_name: cvat_worker_export - image: cvat/server:${CVAT_VERSION:-v2.11.1} + image: cvat/server:${CVAT_VERSION:-dev} restart: always depends_on: *backend-deps environment: @@ -154,7 +154,7 @@ services: cvat_worker_annotation: container_name: cvat_worker_annotation - image: cvat/server:${CVAT_VERSION:-v2.11.1} + image: cvat/server:${CVAT_VERSION:-dev} restart: always depends_on: *backend-deps environment: @@ -170,7 +170,7 @@ services: cvat_worker_webhooks: container_name: cvat_worker_webhooks - image: cvat/server:${CVAT_VERSION:-v2.11.1} + image: cvat/server:${CVAT_VERSION:-dev} restart: always depends_on: *backend-deps environment: @@ -186,7 +186,7 @@ services: cvat_worker_quality_reports: container_name: cvat_worker_quality_reports - image: cvat/server:${CVAT_VERSION:-v2.11.1} + image: cvat/server:${CVAT_VERSION:-dev} restart: always depends_on: *backend-deps environment: @@ -202,7 +202,7 @@ services: cvat_worker_analytics_reports: container_name: cvat_worker_analytics_reports - image: cvat/server:${CVAT_VERSION:-v2.11.1} + image: cvat/server:${CVAT_VERSION:-dev} restart: always depends_on: *backend-deps environment: @@ -218,7 +218,7 @@ services: cvat_ui: container_name: cvat_ui - image: cvat/ui:${CVAT_VERSION:-v2.11.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 83875c4a324a..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.11.1 + tag: dev imagePullPolicy: Always permissionFix: enabled: true @@ -137,7 +137,7 @@ cvat: frontend: replicas: 1 image: cvat/ui - tag: v2.11.1 + tag: dev imagePullPolicy: Always labels: {} # test: test