From 381c068f4963e0848750f2c6d8fb0573df7eac65 Mon Sep 17 00:00:00 2001
From: Nikita Manovich <nikita.manovich@intel.com>
Date: Mon, 6 Sep 2021 16:06:40 +0300
Subject: [PATCH 1/3] Updated changelog and version of the server.

---
 CHANGELOG.md     | 38 ++++++++++++++++++++++++++++----------
 cvat/__init__.py |  2 +-
 2 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ba874209..75109b67 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,7 +5,33 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## \[1.6.0] - Unreleased
+## \[1.7.0] - Unreleased
+
+### Added
+
+- TDB
+
+### Changed
+
+- TDB
+
+### Deprecated
+
+- TDB
+
+### Removed
+
+- TDB
+
+### Fixed
+
+- TDB
+
+### Security
+
+- TDB
+
+## \[1.6.0] - 2021-09-15
 
 ### Added
 
@@ -26,10 +52,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Cloud storage creating and updating (<https://github.com/openvinotoolkit/cvat/pull/3386>)
 - Way of working with cloud storage content (<https://github.com/openvinotoolkit/cvat/pull/3386>)
 
-### Deprecated
-
-- TDB
-
 ### Removed
 
 - Support TEMP_KEY_SECRET_KEY_TOKEN_SET for AWS S3 cloud storage (<https://github.com/openvinotoolkit/cvat/pull/3386>)
@@ -40,10 +62,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fixed task creating CLI parameter (<https://github.com/openvinotoolkit/cvat/pull/3519>)
 - Fixed import for MOTS format (<https://github.com/openvinotoolkit/cvat/pull/3612>)
 
-### Security
-
-- TDB
-
 ## \[1.5.0] - 2021-08-02
 
 ### Added
@@ -885,7 +903,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## Template
 
 ```
-## [Unreleased]
+## \[Unreleased]
 ### Added
 - TDB
 
diff --git a/cvat/__init__.py b/cvat/__init__.py
index 9c9b39e4..e01f98d3 100644
--- a/cvat/__init__.py
+++ b/cvat/__init__.py
@@ -4,6 +4,6 @@
 
 from cvat.utils.version import get_version
 
-VERSION = (1, 6, 0, 'alpha', 0)
+VERSION = (1, 6, 0, 'final', 0)
 
 __version__ = get_version(VERSION)

From 1cc2b593a8759b61955e823510f6cd35ffaa69f1 Mon Sep 17 00:00:00 2001
From: Evgeny Talanin <evgeny.talanin@intel.com>
Date: Fri, 17 Sep 2021 11:30:34 +0300
Subject: [PATCH 2/3] Fix encoding (#3684)

---
 ... => case_85_canvas3d_functionality_cuboid_cancel_drawing.js} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename tests/cypress/integration/canvas3d_functionality/{case_85_canvas3d_functionality_cuboid_сancel_drawing.js => case_85_canvas3d_functionality_cuboid_cancel_drawing.js} (97%)

diff --git a/tests/cypress/integration/canvas3d_functionality/case_85_canvas3d_functionality_cuboid_сancel_drawing.js b/tests/cypress/integration/canvas3d_functionality/case_85_canvas3d_functionality_cuboid_cancel_drawing.js
similarity index 97%
rename from tests/cypress/integration/canvas3d_functionality/case_85_canvas3d_functionality_cuboid_сancel_drawing.js
rename to tests/cypress/integration/canvas3d_functionality/case_85_canvas3d_functionality_cuboid_cancel_drawing.js
index 8302d8b5..59771df7 100644
--- a/tests/cypress/integration/canvas3d_functionality/case_85_canvas3d_functionality_cuboid_сancel_drawing.js
+++ b/tests/cypress/integration/canvas3d_functionality/case_85_canvas3d_functionality_cuboid_cancel_drawing.js
@@ -9,7 +9,7 @@ import { taskName, labelName } from '../../support/const_canvas3d';
 context('Canvas 3D functionality. Cancel drawing.', () => {
     const caseId = '85';
     const screenshotsPath =
-        'cypress/screenshots/canvas3d_functionality/case_85_canvas3d_functionality_cuboid_сancel_drawing.js';
+        'cypress/screenshots/canvas3d_functionality/case_85_canvas3d_functionality_cuboid_cancel_drawing.js';
 
     before(() => {
         cy.openTask(taskName);

From 476b2fcf992612768d302d1edb8808122f5f2cf0 Mon Sep 17 00:00:00 2001
From: Nikita Manovich <nikita.manovich@intel.com>
Date: Fri, 17 Sep 2021 12:24:47 +0300
Subject: [PATCH 3/3] Update release date

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 75109b67..de2884d3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -31,7 +31,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - TDB
 
-## \[1.6.0] - 2021-09-15
+## \[1.6.0] - 2021-09-17
 
 ### Added