Merge branch 'develop' into kl/interaction-handler-listeners

CHANGELOG.md

@@ -5,7 +5,31 @@ 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.7.0] - Unreleased
+## \[2.0.0] - Unreleased
+### Added
+
+- Add additional environment variables for Nuclio configuration (<https://github.com/openvinotoolkit/cvat/pull/3894>)
+- Add KITTI segmentation and detection format (<https://github.com/openvinotoolkit/cvat/pull/3757>)
+- Add LFW format (<https://github.com/openvinotoolkit/cvat/pull/3770>)
+- Add Cityscapes format (<https://github.com/openvinotoolkit/cvat/pull/3758>)
+- Add Open Images V6 format (<https://github.com/openvinotoolkit/cvat/pull/3679>)
+
+### Changed
+- TDB
+
+### Deprecated
+- TDB
+
+### Removed
+- TDB
+
+### Fixed
+- TDB
+
+### Security
+- TDB
+
+## \[1.7.0] - 2021-11-15
 
 ### Added
 
@@ -16,10 +40,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Add a tutorial on attaching cloud storage AWS-S3 (<https://github.com/openvinotoolkit/cvat/pull/3745>)
   and Azure Blob Container (<https://github.com/openvinotoolkit/cvat/pull/3778>)
 - The feature to remove annotations in a specified range of frames (<https://github.com/openvinotoolkit/cvat/pull/3617>)
-- Add KITTI segmentation and detection format (<https://github.com/openvinotoolkit/cvat/pull/3757>)
-- Add LFW format (<https://github.com/openvinotoolkit/cvat/pull/3770>)
-- Add Cityscapes format (<https://github.com/openvinotoolkit/cvat/pull/3758>)
-- Add Open Images V6 format (<https://github.com/openvinotoolkit/cvat/pull/3679>)
 
 ### Changed
 
@@ -28,14 +48,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Migration from NPM 6 to NPM 7 (<https://github.com/openvinotoolkit/cvat/pull/3773>)
 - Update Datumaro dependency to 0.2.0 (<https://github.com/openvinotoolkit/cvat/pull/3813>)
 
-### Deprecated
-
-- TDB
-
-### Removed
-
-- TDB
-
 ### Fixed
 
 - Fixed JSON transform issues in network requests (<https://github.com/openvinotoolkit/cvat/pull/3706>)

cvat/__init__.py

@@ -4,6 +4,6 @@
 
 from cvat.utils.version import get_version
 
-VERSION = (1, 7, 0, 'alpha', 0)
+VERSION = (2, 0, 0, 'alpha', 0)
 
 __version__ = get_version(VERSION)

cvat/settings/base.py

@@ -262,10 +262,10 @@ def add_ssh_keys():
 }
 
 NUCLIO = {
-    'SCHEME': 'http',
-    'HOST': 'localhost',
-    'PORT': 8070,
-    'DEFAULT_TIMEOUT': 120
+    'SCHEME': os.getenv('CVAT_NUCLIO_SCHEME', 'http'),
+    'HOST': os.getenv('CVAT_NUCLIO_HOST', 'localhost'),
+    'PORT': os.getenv('CVAT_NUCLIO_PORT', 8070),
+    'DEFAULT_TIMEOUT': os.getenv('CVAT_NUCLIO_DEFAULT_TIMEOUT', 120)
 }
 
 RQ_SHOW_ADMIN_LINK = True

site/content/en/docs/manual/advanced/ai-tools.md

@@ -124,7 +124,7 @@ Supported DL models are not bound to the label and can be used for any objects.
 - All annotated objects will be automatically tracked when you move to the next frame.
   For tracking, use `Next` button on the top panel or the `F` button to move on to the next frame.
 
-  ![Annotation using a tracker](/images/tracker_siammask_DETRAC.gif)
+  ![Annotation using a tracker](/images/tracker_siammask_detrac.gif)
 
 - You can enable/disable tracking using `tracker switcher` on sidebar.
 

tests/cypress/integration/canvas3d_functionality_2/case_56_canvas3d_functionality_basic_actions.js

@@ -184,8 +184,7 @@ context('Canvas 3D functionality. Basic actions.', () => {
             cy.get('.cvat-player-first-button').click(); // Return to first frame
         });
 
-        // FIXME: this test was temporarily excluded
-        it.skip('Testing perspective visual regressions.', () => {
+        it('Testing perspective hotkeys visual regressions.', () => {
             testPerspectiveChangeOnKeyPress('u', 'before_press_altU', 'after_press_altU');
             testPerspectiveChangeOnKeyPress('o', 'before_press_altO', 'after_press_altO');
             testPerspectiveChangeOnKeyPress('i', 'before_press_altI', 'after_press_altI');
@@ -196,6 +195,10 @@ context('Canvas 3D functionality. Basic actions.', () => {
             testPerspectiveChangeOnArrowKeyPress('{downarrow}', 'before_press_downarrow', 'after_press_downarrow');
             testPerspectiveChangeOnArrowKeyPress('{leftarrow}', 'before_press_leftarrow', 'after_press_leftarrow');
             testPerspectiveChangeOnArrowKeyPress('{rightarrow}', 'before_press_rightarrow', 'after_press_rightarrow');
+        });
+
+        // Temporarily disabling the test
+        it.skip('Testing perspective wheel visual regressions.', () => {
             testPerspectiveChangeOnWheel('perspective_before_wheel', 'perspective_after_wheel');
         });