From f616d6a718e1d7b054eb058bf65b2a9aba514b05 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Fri, 13 Oct 2023 13:28:31 +0000 Subject: [PATCH 1/4] Prepare release v2.7.6 --- CHANGELOG.md | 59 +++++++++++++++++++ .../20231006_155231_persist_image_filters.md | 4 -- ...yk_fix_7429062f3bf9ab5eb080c5cceabd5d6a.md | 4 -- ...0_113810_sizow.k.d_fix_tracks_splitting.md | 4 -- ...117_sizow.k.d_fix_coco_tracks_uploading.md | 4 -- .../20231011_153251_andrey_fix_siammask.md | 4 -- .../20231012_095633_klakhov_fix_memory.md | 4 -- ...20231012_105902_sekachev.bs_fixed_crash.md | 4 -- ...31012_113210_andrey_update_nginx_config.md | 4 -- .../20231012_123219_andrey_x_frame_options.md | 4 -- ...418_sekachev.bs_fixed_google_translator.md | 4 -- ..._cs_content_when_s3_contains_empty_dirs.md | 4 -- ...231012_181301_andrey_fix_worker_restart.md | 8 --- .../20231013_095118_boris_optimize_masks.md | 4 -- ...0231013_110048_klakhov_remove_need_help.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 +- 22 files changed, 75 insertions(+), 76 deletions(-) delete mode 100644 changelog.d/20231006_155231_persist_image_filters.md delete mode 100644 changelog.d/20231009_165414_roman_snyk_fix_7429062f3bf9ab5eb080c5cceabd5d6a.md delete mode 100644 changelog.d/20231010_113810_sizow.k.d_fix_tracks_splitting.md delete mode 100644 changelog.d/20231011_153117_sizow.k.d_fix_coco_tracks_uploading.md delete mode 100644 changelog.d/20231011_153251_andrey_fix_siammask.md delete mode 100644 changelog.d/20231012_095633_klakhov_fix_memory.md delete mode 100644 changelog.d/20231012_105902_sekachev.bs_fixed_crash.md delete mode 100644 changelog.d/20231012_113210_andrey_update_nginx_config.md delete mode 100644 changelog.d/20231012_123219_andrey_x_frame_options.md delete mode 100644 changelog.d/20231012_131418_sekachev.bs_fixed_google_translator.md delete mode 100644 changelog.d/20231012_145036_maria_fix_getting_cs_content_when_s3_contains_empty_dirs.md delete mode 100644 changelog.d/20231012_181301_andrey_fix_worker_restart.md delete mode 100644 changelog.d/20231013_095118_boris_optimize_masks.md delete mode 100644 changelog.d/20231013_110048_klakhov_remove_need_help.md diff --git a/CHANGELOG.md b/CHANGELOG.md index bf337acfca1e..34fbf407d497 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,65 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 + +## \[2.7.6\] - 2023-10-13 + +### Changed + +- Enabled nginx proxy buffering + () + +- Helm: set memory request for keydb +- Supervisord: + - added `autorestart=true` option for all workers + - unified program names to use dashes as delimiter instead of mixed '_' and '-' + - minor improvements to supervisor configurations + () + +### Removed + +- Removed gitter link from about modal + () + +### Fixed + +- Persist image filters across jobs + () + +- Splitting skeleton tracks on jobs + () + +- Uploading skeleton tracks in COCO Keypoints format + () + +- Fixed Siammask tracker error on grayscale images + () + +- Fixed memory leak on client side when event listener was not removed together with its context + () + +- Fixed crash related to issue tries to mount to not existing parent + () + +- Added 'notranslate' markers to avoid issues caused by extension translators + () + +- Getting CS content when S3 bucket contains manually created directories + () + +### Security + +- Security upgrade opencv-python-headless from 4.5.5.62 to 4.8.1.78 + () + +- Added X-Frame-Options: deny + () + +### Fixed + +- Optimized huge memory consumption when working with masks in the interface + () + ## \[2.7.5\] - 2023-10-09 diff --git a/changelog.d/20231006_155231_persist_image_filters.md b/changelog.d/20231006_155231_persist_image_filters.md deleted file mode 100644 index ca10b538dd37..000000000000 --- a/changelog.d/20231006_155231_persist_image_filters.md +++ /dev/null @@ -1,4 +0,0 @@ -### Fixed - -- Persist image filters across jobs - () diff --git a/changelog.d/20231009_165414_roman_snyk_fix_7429062f3bf9ab5eb080c5cceabd5d6a.md b/changelog.d/20231009_165414_roman_snyk_fix_7429062f3bf9ab5eb080c5cceabd5d6a.md deleted file mode 100644 index 3e8951f308d8..000000000000 --- a/changelog.d/20231009_165414_roman_snyk_fix_7429062f3bf9ab5eb080c5cceabd5d6a.md +++ /dev/null @@ -1,4 +0,0 @@ -### Security - -- Security upgrade opencv-python-headless from 4.5.5.62 to 4.8.1.78 - () diff --git a/changelog.d/20231010_113810_sizow.k.d_fix_tracks_splitting.md b/changelog.d/20231010_113810_sizow.k.d_fix_tracks_splitting.md deleted file mode 100644 index 4dd4a1e2d07e..000000000000 --- a/changelog.d/20231010_113810_sizow.k.d_fix_tracks_splitting.md +++ /dev/null @@ -1,4 +0,0 @@ -### Fixed - -- Splitting skeleton tracks on jobs - () diff --git a/changelog.d/20231011_153117_sizow.k.d_fix_coco_tracks_uploading.md b/changelog.d/20231011_153117_sizow.k.d_fix_coco_tracks_uploading.md deleted file mode 100644 index 869cfb3deeec..000000000000 --- a/changelog.d/20231011_153117_sizow.k.d_fix_coco_tracks_uploading.md +++ /dev/null @@ -1,4 +0,0 @@ -### Fixed - -- Uploading skeleton tracks in COCO Keypoints format - () diff --git a/changelog.d/20231011_153251_andrey_fix_siammask.md b/changelog.d/20231011_153251_andrey_fix_siammask.md deleted file mode 100644 index 1be8c98b6c1d..000000000000 --- a/changelog.d/20231011_153251_andrey_fix_siammask.md +++ /dev/null @@ -1,4 +0,0 @@ -### Fixed - -- Fixed Siammask tracker error on grayscale images - () diff --git a/changelog.d/20231012_095633_klakhov_fix_memory.md b/changelog.d/20231012_095633_klakhov_fix_memory.md deleted file mode 100644 index 7e7d1786af23..000000000000 --- a/changelog.d/20231012_095633_klakhov_fix_memory.md +++ /dev/null @@ -1,4 +0,0 @@ -### Fixed - -- Fixed memory leak on client side when event listener was not removed together with its context - () diff --git a/changelog.d/20231012_105902_sekachev.bs_fixed_crash.md b/changelog.d/20231012_105902_sekachev.bs_fixed_crash.md deleted file mode 100644 index 3435233bb5e3..000000000000 --- a/changelog.d/20231012_105902_sekachev.bs_fixed_crash.md +++ /dev/null @@ -1,4 +0,0 @@ -### Fixed - -- Fixed crash related to issue tries to mount to not existing parent - () diff --git a/changelog.d/20231012_113210_andrey_update_nginx_config.md b/changelog.d/20231012_113210_andrey_update_nginx_config.md deleted file mode 100644 index f189b1d104a9..000000000000 --- a/changelog.d/20231012_113210_andrey_update_nginx_config.md +++ /dev/null @@ -1,4 +0,0 @@ -### Changed - -- Enabled nginx proxy buffering - () diff --git a/changelog.d/20231012_123219_andrey_x_frame_options.md b/changelog.d/20231012_123219_andrey_x_frame_options.md deleted file mode 100644 index 176133b36493..000000000000 --- a/changelog.d/20231012_123219_andrey_x_frame_options.md +++ /dev/null @@ -1,4 +0,0 @@ -### Security - -- Added X-Frame-Options: deny - () diff --git a/changelog.d/20231012_131418_sekachev.bs_fixed_google_translator.md b/changelog.d/20231012_131418_sekachev.bs_fixed_google_translator.md deleted file mode 100644 index 56201060baff..000000000000 --- a/changelog.d/20231012_131418_sekachev.bs_fixed_google_translator.md +++ /dev/null @@ -1,4 +0,0 @@ -### Fixed - -- Added 'notranslate' markers to avoid issues caused by extension translators - () diff --git a/changelog.d/20231012_145036_maria_fix_getting_cs_content_when_s3_contains_empty_dirs.md b/changelog.d/20231012_145036_maria_fix_getting_cs_content_when_s3_contains_empty_dirs.md deleted file mode 100644 index 7ac19bf69e4d..000000000000 --- a/changelog.d/20231012_145036_maria_fix_getting_cs_content_when_s3_contains_empty_dirs.md +++ /dev/null @@ -1,4 +0,0 @@ -### Fixed - -- Getting CS content when S3 bucket contains manually created directories - () diff --git a/changelog.d/20231012_181301_andrey_fix_worker_restart.md b/changelog.d/20231012_181301_andrey_fix_worker_restart.md deleted file mode 100644 index 18e905453fba..000000000000 --- a/changelog.d/20231012_181301_andrey_fix_worker_restart.md +++ /dev/null @@ -1,8 +0,0 @@ -### Changed - -- Helm: set memory request for keydb -- Supervisord: - - added `autorestart=true` option for all workers - - unified program names to use dashes as delimiter instead of mixed '_' and '-' - - minor improvements to supervisor configurations - () diff --git a/changelog.d/20231013_095118_boris_optimize_masks.md b/changelog.d/20231013_095118_boris_optimize_masks.md deleted file mode 100644 index 2fdd3cc643a6..000000000000 --- a/changelog.d/20231013_095118_boris_optimize_masks.md +++ /dev/null @@ -1,4 +0,0 @@ -### Fixed - -- Optimized huge memory consumption when working with masks in the interface - () diff --git a/changelog.d/20231013_110048_klakhov_remove_need_help.md b/changelog.d/20231013_110048_klakhov_remove_need_help.md deleted file mode 100644 index c08a984c754e..000000000000 --- a/changelog.d/20231013_110048_klakhov_remove_need_help.md +++ /dev/null @@ -1,4 +0,0 @@ -### Removed - -- Removed gitter link from about modal - () diff --git a/cvat-cli/requirements/base.txt b/cvat-cli/requirements/base.txt index 8024a5ce2b7f..1b4894170014 100644 --- a/cvat-cli/requirements/base.txt +++ b/cvat-cli/requirements/base.txt @@ -1,3 +1,3 @@ -cvat-sdk~=2.8.0 +cvat-sdk~=2.7.6 Pillow>=10.0.1 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 7035cc17c429..d91f62f701a1 100644 --- a/cvat-cli/src/cvat_cli/version.py +++ b/cvat-cli/src/cvat_cli/version.py @@ -1 +1 @@ -VERSION = "2.8.0" +VERSION = "2.7.6" diff --git a/cvat-sdk/gen/generate.sh b/cvat-sdk/gen/generate.sh index 77f513803a68..e20666f30be6 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.8.0" +VERSION="2.7.6" 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 989bc3512008..7e61d20eae56 100644 --- a/cvat/__init__.py +++ b/cvat/__init__.py @@ -4,6 +4,6 @@ from cvat.utils.version import get_version -VERSION = (2, 8, 0, 'alpha', 0) +VERSION = (2, 7, 6, 'final', 0) __version__ = get_version(VERSION) diff --git a/cvat/schema.yml b/cvat/schema.yml index 2dc187c5ff63..7666ed09ecf6 100644 --- a/cvat/schema.yml +++ b/cvat/schema.yml @@ -1,7 +1,7 @@ openapi: 3.0.3 info: title: CVAT REST API - version: 2.8.0 + version: 2.7.6 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 3a558b5904a6..8d3edd914ebe 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -34,7 +34,7 @@ services: cvat_server: container_name: cvat_server - image: cvat/server:${CVAT_VERSION:-dev} + image: cvat/server:${CVAT_VERSION:-v2.7.6} restart: always depends_on: - cvat_redis @@ -73,7 +73,7 @@ services: cvat_utils: container_name: cvat_utils - image: cvat/server:${CVAT_VERSION:-dev} + image: cvat/server:${CVAT_VERSION:-v2.7.6} restart: always depends_on: - cvat_redis @@ -98,7 +98,7 @@ services: cvat_worker_import: container_name: cvat_worker_import - image: cvat/server:${CVAT_VERSION:-dev} + image: cvat/server:${CVAT_VERSION:-v2.7.6} restart: always depends_on: - cvat_redis @@ -121,7 +121,7 @@ services: cvat_worker_export: container_name: cvat_worker_export - image: cvat/server:${CVAT_VERSION:-dev} + image: cvat/server:${CVAT_VERSION:-v2.7.6} restart: always depends_on: - cvat_redis @@ -144,7 +144,7 @@ services: cvat_worker_annotation: container_name: cvat_worker_annotation - image: cvat/server:${CVAT_VERSION:-dev} + image: cvat/server:${CVAT_VERSION:-v2.7.6} restart: always depends_on: - cvat_redis @@ -167,7 +167,7 @@ services: cvat_worker_webhooks: container_name: cvat_worker_webhooks - image: cvat/server:${CVAT_VERSION:-dev} + image: cvat/server:${CVAT_VERSION:-v2.7.6} restart: always depends_on: - cvat_redis @@ -191,7 +191,7 @@ services: cvat_worker_quality_reports: container_name: cvat_worker_quality_reports - image: cvat/server:${CVAT_VERSION:-dev} + image: cvat/server:${CVAT_VERSION:-v2.7.6} restart: always depends_on: - cvat_redis @@ -213,7 +213,7 @@ services: cvat_worker_analytics_reports: container_name: cvat_worker_analytics_reports - image: cvat/server:${CVAT_VERSION:-dev} + image: cvat/server:${CVAT_VERSION:-v2.7.6} restart: always depends_on: - cvat_redis @@ -236,7 +236,7 @@ services: cvat_ui: container_name: cvat_ui - image: cvat/ui:${CVAT_VERSION:-dev} + image: cvat/ui:${CVAT_VERSION:-v2.7.6} restart: always depends_on: - cvat_server diff --git a/helm-chart/values.yaml b/helm-chart/values.yaml index c20649192780..ba6b8479ee3f 100644 --- a/helm-chart/values.yaml +++ b/helm-chart/values.yaml @@ -104,7 +104,7 @@ cvat: additionalVolumeMounts: [] replicas: 1 image: cvat/server - tag: dev + tag: v2.7.6 imagePullPolicy: Always permissionFix: enabled: true @@ -128,7 +128,7 @@ cvat: frontend: replicas: 1 image: cvat/ui - tag: dev + tag: v2.7.6 imagePullPolicy: Always labels: {} # test: test From 6eead0d5499559d4801e4e4fa1385189ceeea231 Mon Sep 17 00:00:00 2001 From: Andrey Zhavoronkov Date: Fri, 13 Oct 2023 16:39:25 +0300 Subject: [PATCH 2/4] Fix CHANGELOG --- CHANGELOG.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 34fbf407d497..155e2644106a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,11 +25,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 () - Helm: set memory request for keydb -- Supervisord: + () + +- Supervisord (): - added `autorestart=true` option for all workers - unified program names to use dashes as delimiter instead of mixed '_' and '-' - minor improvements to supervisor configurations - () ### Removed From 3c05e8479d4113470c1164349253a67e8767b1ec Mon Sep 17 00:00:00 2001 From: Andrey Zhavoronkov Date: Fri, 13 Oct 2023 18:35:53 +0300 Subject: [PATCH 3/4] fixed changelog --- CHANGELOG.md | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 155e2644106a..79d3dda929a8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -63,6 +63,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Getting CS content when S3 bucket contains manually created directories () +- Optimized huge memory consumption when working with masks in the interface + () + ### Security - Security upgrade opencv-python-headless from 4.5.5.62 to 4.8.1.78 @@ -71,11 +74,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Added X-Frame-Options: deny () -### Fixed - -- Optimized huge memory consumption when working with masks in the interface - () - ## \[2.7.5\] - 2023-10-09 From fae72e0736a2d5eb2e82a569f415b9589c6ec0dd Mon Sep 17 00:00:00 2001 From: Andrey Zhavoronkov Date: Mon, 16 Oct 2023 09:47:26 +0300 Subject: [PATCH 4/4] prepare to new version --- 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 1b4894170014..8024a5ce2b7f 100644 --- a/cvat-cli/requirements/base.txt +++ b/cvat-cli/requirements/base.txt @@ -1,3 +1,3 @@ -cvat-sdk~=2.7.6 +cvat-sdk~=2.8.0 Pillow>=10.0.1 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 d91f62f701a1..7035cc17c429 100644 --- a/cvat-cli/src/cvat_cli/version.py +++ b/cvat-cli/src/cvat_cli/version.py @@ -1 +1 @@ -VERSION = "2.7.6" +VERSION = "2.8.0" diff --git a/cvat-sdk/gen/generate.sh b/cvat-sdk/gen/generate.sh index e20666f30be6..77f513803a68 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.7.6" +VERSION="2.8.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 7e61d20eae56..989bc3512008 100644 --- a/cvat/__init__.py +++ b/cvat/__init__.py @@ -4,6 +4,6 @@ from cvat.utils.version import get_version -VERSION = (2, 7, 6, 'final', 0) +VERSION = (2, 8, 0, 'alpha', 0) __version__ = get_version(VERSION) diff --git a/cvat/schema.yml b/cvat/schema.yml index 7666ed09ecf6..2dc187c5ff63 100644 --- a/cvat/schema.yml +++ b/cvat/schema.yml @@ -1,7 +1,7 @@ openapi: 3.0.3 info: title: CVAT REST API - version: 2.7.6 + version: 2.8.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 8d3edd914ebe..3a558b5904a6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -34,7 +34,7 @@ services: cvat_server: container_name: cvat_server - image: cvat/server:${CVAT_VERSION:-v2.7.6} + image: cvat/server:${CVAT_VERSION:-dev} restart: always depends_on: - cvat_redis @@ -73,7 +73,7 @@ services: cvat_utils: container_name: cvat_utils - image: cvat/server:${CVAT_VERSION:-v2.7.6} + image: cvat/server:${CVAT_VERSION:-dev} restart: always depends_on: - cvat_redis @@ -98,7 +98,7 @@ services: cvat_worker_import: container_name: cvat_worker_import - image: cvat/server:${CVAT_VERSION:-v2.7.6} + image: cvat/server:${CVAT_VERSION:-dev} restart: always depends_on: - cvat_redis @@ -121,7 +121,7 @@ services: cvat_worker_export: container_name: cvat_worker_export - image: cvat/server:${CVAT_VERSION:-v2.7.6} + image: cvat/server:${CVAT_VERSION:-dev} restart: always depends_on: - cvat_redis @@ -144,7 +144,7 @@ services: cvat_worker_annotation: container_name: cvat_worker_annotation - image: cvat/server:${CVAT_VERSION:-v2.7.6} + image: cvat/server:${CVAT_VERSION:-dev} restart: always depends_on: - cvat_redis @@ -167,7 +167,7 @@ services: cvat_worker_webhooks: container_name: cvat_worker_webhooks - image: cvat/server:${CVAT_VERSION:-v2.7.6} + image: cvat/server:${CVAT_VERSION:-dev} restart: always depends_on: - cvat_redis @@ -191,7 +191,7 @@ services: cvat_worker_quality_reports: container_name: cvat_worker_quality_reports - image: cvat/server:${CVAT_VERSION:-v2.7.6} + image: cvat/server:${CVAT_VERSION:-dev} restart: always depends_on: - cvat_redis @@ -213,7 +213,7 @@ services: cvat_worker_analytics_reports: container_name: cvat_worker_analytics_reports - image: cvat/server:${CVAT_VERSION:-v2.7.6} + image: cvat/server:${CVAT_VERSION:-dev} restart: always depends_on: - cvat_redis @@ -236,7 +236,7 @@ services: cvat_ui: container_name: cvat_ui - image: cvat/ui:${CVAT_VERSION:-v2.7.6} + 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 ba6b8479ee3f..c20649192780 100644 --- a/helm-chart/values.yaml +++ b/helm-chart/values.yaml @@ -104,7 +104,7 @@ cvat: additionalVolumeMounts: [] replicas: 1 image: cvat/server - tag: v2.7.6 + tag: dev imagePullPolicy: Always permissionFix: enabled: true @@ -128,7 +128,7 @@ cvat: frontend: replicas: 1 image: cvat/ui - tag: v2.7.6 + tag: dev imagePullPolicy: Always labels: {} # test: test