From 68f13a0fe4f60918b5c94c61afc0ae628d3bc849 Mon Sep 17 00:00:00 2001 From: "cvat-bot[bot]" <147643061+cvat-bot[bot]@users.noreply.github.com> Date: Mon, 11 Mar 2024 19:25:03 +0000 Subject: [PATCH 1/2] Prepare release v2.11.2 --- CHANGELOG.md | 29 +++++++++++++++++++ ...05_171241_roman_webhooks_lazy_rendering.md | 4 --- .../20240305_193358_roman_less_bumpy.md | 5 ---- ...06_181839_kirill.9992_fix_meta_requests.md | 6 ---- ...5130_roman_efficient_analytics_debounce.md | 4 --- .../20240308_193911_roman_extra_encoding.md | 5 ---- .../20240311_093929_klakhov_improve_sam.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 +-- 14 files changed, 45 insertions(+), 44 deletions(-) delete mode 100644 changelog.d/20240305_171241_roman_webhooks_lazy_rendering.md delete mode 100644 changelog.d/20240305_193358_roman_less_bumpy.md delete mode 100644 changelog.d/20240306_181839_kirill.9992_fix_meta_requests.md delete mode 100644 changelog.d/20240308_175130_roman_efficient_analytics_debounce.md delete mode 100644 changelog.d/20240308_193911_roman_extra_encoding.md delete mode 100644 changelog.d/20240311_093929_klakhov_improve_sam.md diff --git a/CHANGELOG.md b/CHANGELOG.md index 5872e8e68ac8..86f28f3fe29b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,35 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 + +## \[2.11.2\] - 2024-03-11 + +### Changed + +- Sped up resource updates when there are no matching webhooks + () + +### Fixed + +- Job and task `updated_date` are no longer bumped twice when updating + annotations + () + +- Sending `PATCH /jobs/{id}/data/meta` on each job save even if nothing changed in meta data + () +- Sending `GET /jobs/{id}/data/meta` twice on each job load + () + +- Made analytics report update job scheduling more efficient + () + +- Fixed being unable to connect to in-mem Redis + when the password includes URL-unsafe characters + () + +- Segment anything decoder is loaded anytime when CVAT is opened, but might be not required + () + ## \[2.11.1\] - 2024-03-05 diff --git a/changelog.d/20240305_171241_roman_webhooks_lazy_rendering.md b/changelog.d/20240305_171241_roman_webhooks_lazy_rendering.md deleted file mode 100644 index 35e6eaf5f7a6..000000000000 --- a/changelog.d/20240305_171241_roman_webhooks_lazy_rendering.md +++ /dev/null @@ -1,4 +0,0 @@ -### Changed - -- Sped up resource updates when there are no matching webhooks - () diff --git a/changelog.d/20240305_193358_roman_less_bumpy.md b/changelog.d/20240305_193358_roman_less_bumpy.md deleted file mode 100644 index 169963096130..000000000000 --- a/changelog.d/20240305_193358_roman_less_bumpy.md +++ /dev/null @@ -1,5 +0,0 @@ -### Fixed - -- Job and task `updated_date` are no longer bumped twice when updating - annotations - () diff --git a/changelog.d/20240306_181839_kirill.9992_fix_meta_requests.md b/changelog.d/20240306_181839_kirill.9992_fix_meta_requests.md deleted file mode 100644 index ed663cc74ab7..000000000000 --- a/changelog.d/20240306_181839_kirill.9992_fix_meta_requests.md +++ /dev/null @@ -1,6 +0,0 @@ -### Fixed - -- Sending `PATCH /jobs/{id}/data/meta` on each job save even if nothing changed in meta data - () -- Sending `GET /jobs/{id}/data/meta` twice on each job load - () diff --git a/changelog.d/20240308_175130_roman_efficient_analytics_debounce.md b/changelog.d/20240308_175130_roman_efficient_analytics_debounce.md deleted file mode 100644 index 8ab33ea6089e..000000000000 --- a/changelog.d/20240308_175130_roman_efficient_analytics_debounce.md +++ /dev/null @@ -1,4 +0,0 @@ -### Fixed - -- Made analytics report update job scheduling more efficient - () diff --git a/changelog.d/20240308_193911_roman_extra_encoding.md b/changelog.d/20240308_193911_roman_extra_encoding.md deleted file mode 100644 index 6dc37d13494c..000000000000 --- a/changelog.d/20240308_193911_roman_extra_encoding.md +++ /dev/null @@ -1,5 +0,0 @@ -### Fixed - -- Fixed being unable to connect to in-mem Redis - when the password includes URL-unsafe characters - () diff --git a/changelog.d/20240311_093929_klakhov_improve_sam.md b/changelog.d/20240311_093929_klakhov_improve_sam.md deleted file mode 100644 index bec31a252964..000000000000 --- a/changelog.d/20240311_093929_klakhov_improve_sam.md +++ /dev/null @@ -1,4 +0,0 @@ -### Fixed - -- Segment anything decoder is loaded anytime when CVAT is opened, but might be not required - () diff --git a/cvat-cli/requirements/base.txt b/cvat-cli/requirements/base.txt index 42f6811cd379..a96ad22040e4 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.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 a2befd3cc6c3..7ccf0045facb 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.2" diff --git a/cvat-sdk/gen/generate.sh b/cvat-sdk/gen/generate.sh index aaea93ceea54..ccce877b2f4d 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.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 fc0e4ccd59b8..c7a73f70341b 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, 2, 'final', 0) __version__ = get_version(VERSION) diff --git a/cvat/schema.yml b/cvat/schema.yml index e97fd8ff869e..4a6edd1fe288 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.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 371ec0b923b1..d33630b75d7b 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.2} 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.2} 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.2} 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.2} 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.2} 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.2} 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.2} 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.2} 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.2} restart: always depends_on: - cvat_server diff --git a/helm-chart/values.yaml b/helm-chart/values.yaml index d6f5de34289d..d99c4cfd8e86 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.2 imagePullPolicy: Always permissionFix: enabled: true @@ -137,7 +137,7 @@ cvat: frontend: replicas: 1 image: cvat/ui - tag: dev + tag: v2.11.2 imagePullPolicy: Always labels: {} # test: test From 6aa6df037070671bf5b083245f13d1e81370d44a Mon Sep 17 00:00:00 2001 From: "cvat-bot[bot]" <147643061+cvat-bot[bot]@users.noreply.github.com> Date: Tue, 12 Mar 2024 07:46:46 +0000 Subject: [PATCH 2/2] Update develop after v2.11.2 --- 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 a96ad22040e4..42f6811cd379 100644 --- a/cvat-cli/requirements/base.txt +++ b/cvat-cli/requirements/base.txt @@ -1,3 +1,3 @@ -cvat-sdk~=2.11.2 +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 7ccf0045facb..a2befd3cc6c3 100644 --- a/cvat-cli/src/cvat_cli/version.py +++ b/cvat-cli/src/cvat_cli/version.py @@ -1 +1 @@ -VERSION = "2.11.2" +VERSION = "2.12.0" diff --git a/cvat-sdk/gen/generate.sh b/cvat-sdk/gen/generate.sh index ccce877b2f4d..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.2" +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 c7a73f70341b..fc0e4ccd59b8 100644 --- a/cvat/__init__.py +++ b/cvat/__init__.py @@ -4,6 +4,6 @@ from cvat.utils.version import get_version -VERSION = (2, 11, 2, 'final', 0) +VERSION = (2, 12, 0, 'alpha', 0) __version__ = get_version(VERSION) diff --git a/cvat/schema.yml b/cvat/schema.yml index 4a6edd1fe288..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.2 + 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 d33630b75d7b..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.2} + 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.2} + 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.2} + 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.2} + 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.2} + 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.2} + 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.2} + 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.2} + 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.2} + 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 d99c4cfd8e86..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.2 + tag: dev imagePullPolicy: Always permissionFix: enabled: true @@ -137,7 +137,7 @@ cvat: frontend: replicas: 1 image: cvat/ui - tag: v2.11.2 + tag: dev imagePullPolicy: Always labels: {} # test: test