Merge remote-tracking branch 'upstream/develop' into dkru/cypress-test-check-email-verification

CHANGELOG.md

@@ -26,6 +26,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 
 - Django templates for email and user guide (<https://github.com/openvinotoolkit/cvat/pull/2412>)
+- Saving relative paths in dummy chunks instead of absolute(<https://github.com/openvinotoolkit/cvat/pull/2424>)
 
 ### Security
 

cvat-core/package-lock.json

@@ -1867,9 +1867,9 @@
       "integrity": "sha512-3YDiu347mtVtjpyV3u5kVqQLP242c06zwDOgpeRnybmXlYYsLbtTrUBUm8i8srONt+FWobl5aibnU1030PeeuA=="
     },
     "axios": {
-      "version": "0.20.0",
+      "version": "0.21.0",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-0.20.0.tgz",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.0.tgz",
-      "integrity": "sha512-ANA4rr2BDcmmAQLOKft2fufrtuvlqR+cXNNinUmvfeSNCOF98PZL+7M/v1zIdGo7OLjEA9J2gXJL+j4zGsl0bA==",
+      "integrity": "sha512-fmkJBknJKoZwem3/IKSSLpkdNXZeBu5Q7GA/aRsr2btgrptmSCxi2oFjZHqGdK9DoTil9PIHlPIZw2EcRJXRvw==",
       "requires": {
         "follow-redirects": "^1.10.0"
       }

cvat-core/package.json

@@ -33,7 +33,7 @@
     "webpack-cli": "^3.3.2"
   },
   "dependencies": {
-    "axios": "^0.20.0",
+    "axios": "^0.21.0",
     "browser-or-node": "^1.2.1",
     "cvat-data": "../cvat-data",
     "detect-browser": "^5.2.0",

cvat/apps/engine/task.py

@@ -354,7 +354,7 @@ def _create_thread(tid, data):
                     img_sizes = []
                     with open(db_data.get_dummy_chunk_path(chunk_number), 'w') as dummy_chunk:
                         for path, frame_id in chunk_paths:
-                            dummy_chunk.write(path + '\n')
+                            dummy_chunk.write(os.path.relpath(path, upload_dir) + '\n')
                             img_sizes.append(extractor.get_image_size(frame_id))
 
                     db_images.extend([

serverless/openvino/dextr/nuclio/function.yaml

@@ -1,5 +1,5 @@
 metadata:
-  name: openvino.dextr
+  name: openvino-dextr
   namespace: cvat
   annotations:
     name: DEXTR

serverless/openvino/omz/intel/person-reidentification-retail-300/nuclio/function.yaml

@@ -1,5 +1,5 @@
 metadata:
-  name: openvino.omz.intel.person-reidentification-retail-0300
+  name: openvino-omz-intel-person-reidentification-retail-0300
   namespace: cvat
   annotations:
     name: Person reidentification

serverless/openvino/omz/intel/semantic-segmentation-adas-0001/nuclio/function.yaml

@@ -1,5 +1,5 @@
 metadata:
-  name: openvino.omz.semantic-segmentation-adas-0001
+  name: openvino-omz-semantic-segmentation-adas-0001
   namespace: cvat
   annotations:
     name: Semantic segmentation for ADAS

serverless/openvino/omz/intel/text-detection-0004/nuclio/function.yaml

@@ -1,5 +1,5 @@
 metadata:
-  name: openvino.omz.intel.text-detection-0004
+  name: openvino-omz-intel-text-detection-0004
   namespace: cvat
   annotations:
     name: Text detection v4

serverless/openvino/omz/public/faster_rcnn_inception_v2_coco/nuclio/function.yaml

@@ -1,5 +1,5 @@
 metadata:
-  name: openvino.omz.public.faster_rcnn_inception_v2_coco
+  name: openvino-omz-public-faster_rcnn_inception_v2_coco
   namespace: cvat
   annotations:
     name: Faster RCNN

serverless/openvino/omz/public/mask_rcnn_inception_resnet_v2_atrous_coco/nuclio/function.yaml

@@ -2,7 +2,7 @@
 # have enough memory (more than 4GB). Look here how to do that
 # https://stackoverflow.com/questions/44417159/docker-process-killed-with-cryptic-killed-message
 metadata:
-  name: openvino.omz.public.mask_rcnn_inception_resnet_v2_atrous_coco
+  name: openvino-mask-rcnn-inception-resnet-v2-atrous-coco
   namespace: cvat
   annotations:
     name: Mask RCNN

serverless/openvino/omz/public/yolo-v3-tf/nuclio/function.yaml

@@ -1,5 +1,5 @@
 metadata:
-  name: openvino.omz.public.yolo-v3-tf
+  name: openvino-omz-public-yolo-v3-tf
   namespace: cvat
   annotations:
     name: YOLO v3

serverless/pytorch/foolwood/siammask/nuclio/function.yaml

@@ -1,5 +1,5 @@
 metadata:
-  name: pth.foolwood.siammask
+  name: pth-foolwood-siammask
   namespace: cvat
   annotations:
     name: SiamMask

serverless/pytorch/saic-vul/fbrs/nuclio/function.yaml

@@ -1,5 +1,5 @@
 metadata:
-  name: pth.saic-vul.fbrs
+  name: pth-saic-vul-fbrs
   namespace: cvat
   annotations:
     name: f-BRS

serverless/tensorflow/faster_rcnn_inception_v2_coco/nuclio/function.yaml

@@ -1,5 +1,5 @@
 metadata:
-  name: tf.faster_rcnn_inception_v2_coco
+  name: tf-faster-rcnn-inception-v2-coco
   namespace: cvat
   annotations:
     name: Faster RCNN via Tensorflow

serverless/tensorflow/matterport/mask_rcnn/nuclio/function.yaml

@@ -1,5 +1,5 @@
 metadata:
-  name: tf.matterport.mask_rcnn
+  name: tf-matterport-mask-rcnn
   namespace: cvat
   annotations:
     name: Mask RCNN via Tensorflow