From 6a2a8ca53bc941e85019f9e50fe07ad440444c9b Mon Sep 17 00:00:00 2001
From: "cvat-bot[bot]" <147643061+cvat-bot[bot]@users.noreply.github.com>
Date: Mon, 6 Nov 2023 14:38:52 +0000
Subject: [PATCH 1/2] Prepare release v2.8.2
---
CHANGELOG.md | 8 ++++++++
...6_112434_boris_fixed_opencv_runtime_init.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 ++--
9 files changed, 24 insertions(+), 20 deletions(-)
delete mode 100644 changelog.d/20231106_112434_boris_fixed_opencv_runtime_init.md
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 882b1f2e2dd..99ee3a72413 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
+
+## \[2.8.2\] - 2023-11-06
+
+### Fixed
+
+- OpenCV runtime initialization
+ ()
+
## \[2.8.1\] - 2023-11-03
diff --git a/changelog.d/20231106_112434_boris_fixed_opencv_runtime_init.md b/changelog.d/20231106_112434_boris_fixed_opencv_runtime_init.md
deleted file mode 100644
index aa0b2a5bcc0..00000000000
--- a/changelog.d/20231106_112434_boris_fixed_opencv_runtime_init.md
+++ /dev/null
@@ -1,4 +0,0 @@
-### Fixed
-
-- OpenCV runtime initialization
- ()
diff --git a/cvat-cli/requirements/base.txt b/cvat-cli/requirements/base.txt
index 022f624fcdb..4340f67c7f8 100644
--- a/cvat-cli/requirements/base.txt
+++ b/cvat-cli/requirements/base.txt
@@ -1,3 +1,3 @@
-cvat-sdk~=2.9.0
+cvat-sdk~=2.8.2
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 481582eb75b..63baf9a22aa 100644
--- a/cvat-cli/src/cvat_cli/version.py
+++ b/cvat-cli/src/cvat_cli/version.py
@@ -1 +1 @@
-VERSION = "2.9.0"
+VERSION = "2.8.2"
diff --git a/cvat-sdk/gen/generate.sh b/cvat-sdk/gen/generate.sh
index e6985656e74..01f7593341c 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.9.0"
+VERSION="2.8.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 9ba067504a4..a1d197ac10e 100644
--- a/cvat/__init__.py
+++ b/cvat/__init__.py
@@ -4,6 +4,6 @@
from cvat.utils.version import get_version
-VERSION = (2, 9, 0, 'alpha', 0)
+VERSION = (2, 8, 2, 'final', 0)
__version__ = get_version(VERSION)
diff --git a/cvat/schema.yml b/cvat/schema.yml
index 98d761e69ae..3a45acdd616 100644
--- a/cvat/schema.yml
+++ b/cvat/schema.yml
@@ -1,7 +1,7 @@
openapi: 3.0.3
info:
title: CVAT REST API
- version: 2.9.0
+ version: 2.8.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 65909fd1682..2c175704225 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -43,7 +43,7 @@ services:
cvat_server:
container_name: cvat_server
- image: cvat/server:${CVAT_VERSION:-dev}
+ image: cvat/server:${CVAT_VERSION:-v2.8.2}
restart: always
depends_on:
- cvat_redis
@@ -77,7 +77,7 @@ services:
cvat_utils:
container_name: cvat_utils
- image: cvat/server:${CVAT_VERSION:-dev}
+ image: cvat/server:${CVAT_VERSION:-v2.8.2}
restart: always
depends_on:
- cvat_redis
@@ -97,7 +97,7 @@ services:
cvat_worker_import:
container_name: cvat_worker_import
- image: cvat/server:${CVAT_VERSION:-dev}
+ image: cvat/server:${CVAT_VERSION:-v2.8.2}
restart: always
depends_on:
- cvat_redis
@@ -115,7 +115,7 @@ services:
cvat_worker_export:
container_name: cvat_worker_export
- image: cvat/server:${CVAT_VERSION:-dev}
+ image: cvat/server:${CVAT_VERSION:-v2.8.2}
restart: always
depends_on:
- cvat_redis
@@ -133,7 +133,7 @@ services:
cvat_worker_annotation:
container_name: cvat_worker_annotation
- image: cvat/server:${CVAT_VERSION:-dev}
+ image: cvat/server:${CVAT_VERSION:-v2.8.2}
restart: always
depends_on:
- cvat_redis
@@ -152,7 +152,7 @@ services:
cvat_worker_webhooks:
container_name: cvat_worker_webhooks
- image: cvat/server:${CVAT_VERSION:-dev}
+ image: cvat/server:${CVAT_VERSION:-v2.8.2}
restart: always
depends_on:
- cvat_redis
@@ -171,7 +171,7 @@ services:
cvat_worker_quality_reports:
container_name: cvat_worker_quality_reports
- image: cvat/server:${CVAT_VERSION:-dev}
+ image: cvat/server:${CVAT_VERSION:-v2.8.2}
restart: always
depends_on:
- cvat_redis
@@ -189,7 +189,7 @@ services:
cvat_worker_analytics_reports:
container_name: cvat_worker_analytics_reports
- image: cvat/server:${CVAT_VERSION:-dev}
+ image: cvat/server:${CVAT_VERSION:-v2.8.2}
restart: always
depends_on:
- cvat_redis
@@ -207,7 +207,7 @@ services:
cvat_ui:
container_name: cvat_ui
- image: cvat/ui:${CVAT_VERSION:-dev}
+ image: cvat/ui:${CVAT_VERSION:-v2.8.2}
restart: always
depends_on:
- cvat_server
diff --git a/helm-chart/values.yaml b/helm-chart/values.yaml
index b9986e7bc24..32523da0bab 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.8.2
imagePullPolicy: Always
permissionFix:
enabled: true
@@ -128,7 +128,7 @@ cvat:
frontend:
replicas: 1
image: cvat/ui
- tag: dev
+ tag: v2.8.2
imagePullPolicy: Always
labels: {}
# test: test
From fda007ba656bf8c7fd19bfab91832492b85af0d9 Mon Sep 17 00:00:00 2001
From: "cvat-bot[bot]" <147643061+cvat-bot[bot]@users.noreply.github.com>
Date: Mon, 6 Nov 2023 15:45:08 +0000
Subject: [PATCH 2/2] Update develop after v2.8.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 4340f67c7f8..022f624fcdb 100644
--- a/cvat-cli/requirements/base.txt
+++ b/cvat-cli/requirements/base.txt
@@ -1,3 +1,3 @@
-cvat-sdk~=2.8.2
+cvat-sdk~=2.9.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 63baf9a22aa..481582eb75b 100644
--- a/cvat-cli/src/cvat_cli/version.py
+++ b/cvat-cli/src/cvat_cli/version.py
@@ -1 +1 @@
-VERSION = "2.8.2"
+VERSION = "2.9.0"
diff --git a/cvat-sdk/gen/generate.sh b/cvat-sdk/gen/generate.sh
index 01f7593341c..e6985656e74 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.2"
+VERSION="2.9.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 a1d197ac10e..9ba067504a4 100644
--- a/cvat/__init__.py
+++ b/cvat/__init__.py
@@ -4,6 +4,6 @@
from cvat.utils.version import get_version
-VERSION = (2, 8, 2, 'final', 0)
+VERSION = (2, 9, 0, 'alpha', 0)
__version__ = get_version(VERSION)
diff --git a/cvat/schema.yml b/cvat/schema.yml
index 3a45acdd616..98d761e69ae 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.2
+ version: 2.9.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 2c175704225..65909fd1682 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -43,7 +43,7 @@ services:
cvat_server:
container_name: cvat_server
- image: cvat/server:${CVAT_VERSION:-v2.8.2}
+ image: cvat/server:${CVAT_VERSION:-dev}
restart: always
depends_on:
- cvat_redis
@@ -77,7 +77,7 @@ services:
cvat_utils:
container_name: cvat_utils
- image: cvat/server:${CVAT_VERSION:-v2.8.2}
+ image: cvat/server:${CVAT_VERSION:-dev}
restart: always
depends_on:
- cvat_redis
@@ -97,7 +97,7 @@ services:
cvat_worker_import:
container_name: cvat_worker_import
- image: cvat/server:${CVAT_VERSION:-v2.8.2}
+ image: cvat/server:${CVAT_VERSION:-dev}
restart: always
depends_on:
- cvat_redis
@@ -115,7 +115,7 @@ services:
cvat_worker_export:
container_name: cvat_worker_export
- image: cvat/server:${CVAT_VERSION:-v2.8.2}
+ image: cvat/server:${CVAT_VERSION:-dev}
restart: always
depends_on:
- cvat_redis
@@ -133,7 +133,7 @@ services:
cvat_worker_annotation:
container_name: cvat_worker_annotation
- image: cvat/server:${CVAT_VERSION:-v2.8.2}
+ image: cvat/server:${CVAT_VERSION:-dev}
restart: always
depends_on:
- cvat_redis
@@ -152,7 +152,7 @@ services:
cvat_worker_webhooks:
container_name: cvat_worker_webhooks
- image: cvat/server:${CVAT_VERSION:-v2.8.2}
+ image: cvat/server:${CVAT_VERSION:-dev}
restart: always
depends_on:
- cvat_redis
@@ -171,7 +171,7 @@ services:
cvat_worker_quality_reports:
container_name: cvat_worker_quality_reports
- image: cvat/server:${CVAT_VERSION:-v2.8.2}
+ image: cvat/server:${CVAT_VERSION:-dev}
restart: always
depends_on:
- cvat_redis
@@ -189,7 +189,7 @@ services:
cvat_worker_analytics_reports:
container_name: cvat_worker_analytics_reports
- image: cvat/server:${CVAT_VERSION:-v2.8.2}
+ image: cvat/server:${CVAT_VERSION:-dev}
restart: always
depends_on:
- cvat_redis
@@ -207,7 +207,7 @@ services:
cvat_ui:
container_name: cvat_ui
- image: cvat/ui:${CVAT_VERSION:-v2.8.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 32523da0bab..b9986e7bc24 100644
--- a/helm-chart/values.yaml
+++ b/helm-chart/values.yaml
@@ -104,7 +104,7 @@ cvat:
additionalVolumeMounts: []
replicas: 1
image: cvat/server
- tag: v2.8.2
+ tag: dev
imagePullPolicy: Always
permissionFix:
enabled: true
@@ -128,7 +128,7 @@ cvat:
frontend:
replicas: 1
image: cvat/ui
- tag: v2.8.2
+ tag: dev
imagePullPolicy: Always
labels: {}
# test: test