diff --git a/CHANGELOG.md b/CHANGELOG.md index bf337acfca1e..8d58fca178a8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 + +## \[2.7.99\] - 2023-10-11 + +### Fixed + +- Persist image filters across jobs + () + +### Security + +- Security upgrade opencv-python-headless from 4.5.5.62 to 4.8.1.78 + () + ## \[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/cvat-cli/requirements/base.txt b/cvat-cli/requirements/base.txt index 8024a5ce2b7f..ac36e405e69a 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.99 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..e65cdd1d6986 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.99" diff --git a/cvat-sdk/gen/generate.sh b/cvat-sdk/gen/generate.sh index 77f513803a68..15445b3cf430 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.99" 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..7a71d53b86bb 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, 99, 'final', 0) __version__ = get_version(VERSION) diff --git a/cvat/schema.yml b/cvat/schema.yml index 2dc187c5ff63..81fd13bb60e5 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.99 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..31354e95dcb7 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.99} 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.99} 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.99} 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.99} 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.99} 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.99} 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.99} 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.99} 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.99} restart: always depends_on: - cvat_server diff --git a/helm-chart/values.yaml b/helm-chart/values.yaml index e993400e1b4e..47181a6ecd68 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.99 imagePullPolicy: Always permissionFix: enabled: true @@ -128,7 +128,7 @@ cvat: frontend: replicas: 1 image: cvat/ui - tag: dev + tag: v2.7.99 imagePullPolicy: Always labels: {} # test: test