update datumaro

cvat-ai · Jan 3, 2025 · e5ee778 · e5ee778
1 parent ddea4f3
commit e5ee778
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/cvat/apps/dataset_manager/formats/cityscapes.py b/cvat/apps/dataset_manager/formats/cityscapes.py
@@ -6,7 +6,7 @@
 import os.path as osp
 
 from datumaro.components.dataset import Dataset
-from datumaro.plugins.cityscapes_format import write_label_map
+from datumaro.plugins.data_formats.cityscapes import write_label_map
 from pyunpack import Archive
 
 from cvat.apps.dataset_manager.bindings import (GetCVATDataExtractor, detect_dataset,

diff --git a/cvat/apps/dataset_manager/formats/coco.py b/cvat/apps/dataset_manager/formats/coco.py
@@ -7,7 +7,7 @@
 
 from datumaro.components.dataset import Dataset
 from datumaro.components.annotation import AnnotationType
-from datumaro.plugins.coco_format.importer import CocoImporter
+from datumaro.plugins.data_formats.coco.importer import CocoImporter
 
 from cvat.apps.dataset_manager.bindings import (
     GetCVATDataExtractor, NoMediaInAnnotationFileError, import_dm_annotations, detect_dataset

diff --git a/cvat/apps/dataset_manager/formats/cvat.py b/cvat/apps/dataset_manager/formats/cvat.py
@@ -17,7 +17,7 @@
 from datumaro.components.dataset import Dataset, DatasetItem
 from datumaro.components.extractor import (DEFAULT_SUBSET_NAME, Extractor,
                                            Importer)
-from datumaro.plugins.cvat_format.extractor import CvatImporter as _CvatImporter
+from datumaro.plugins.data_formats.cvat.base import CvatImporter as _CvatImporter
 
 from datumaro.util.image import Image
 from defusedxml import ElementTree

diff --git a/cvat/apps/dataset_manager/formats/kitti.py b/cvat/apps/dataset_manager/formats/kitti.py
@@ -6,7 +6,7 @@
 import os.path as osp
 
 from datumaro.components.dataset import Dataset
-from datumaro.plugins.kitti_format.format import KittiPath, write_label_map
+from datumaro.plugins.data_formats.kitti.format import KittiPath, write_label_map
 
 from pyunpack import Archive
 

diff --git a/cvat/apps/dataset_manager/formats/openimages.py b/cvat/apps/dataset_manager/formats/openimages.py
@@ -7,7 +7,7 @@
 import os.path as osp
 
 from datumaro.components.dataset import Dataset, DatasetItem
-from datumaro.plugins.open_images_format import OpenImagesPath
+from datumaro.plugins.data_formats.open_images import OpenImagesPath
 from datumaro.util.image import DEFAULT_IMAGE_META_FILE_NAME
 from pyunpack import Archive
 

diff --git a/cvat/requirements/base.in b/cvat/requirements/base.in
@@ -12,7 +12,7 @@ azure-storage-blob==12.13.0
 boto3==1.17.61
 clickhouse-connect==0.6.8
 coreapi==2.3.3
-datumaro @ git+https://github.com/cvat-ai/datumaro.git@63f01e6524113a109a68db021a052131b778c546
+datumaro @ git+https://github.com/cvat-ai/datumaro.git@5d87b33caa26daa025b1b925eb41faddb688cef2
 dj-pagination==2.5.0
 # Despite direct indication allauth in requirements we should keep 'with_social' for dj-rest-auth
 # to avoid possible further versions conflicts (we use registration functionality)

diff --git a/cvat/requirements/base.txt b/cvat/requirements/base.txt
@@ -56,7 +56,7 @@ cryptography==44.0.0
     #   pyjwt
 cycler==0.12.1
     # via matplotlib
-datumaro @ git+https://github.com/cvat-ai/datumaro.git@63f01e6524113a109a68db021a052131b778c546
+datumaro @ git+https://github.com/cvat-ai/datumaro.git@5d87b33caa26daa025b1b925eb41faddb688cef2
     # via -r cvat/requirements/base.in
 defusedxml==0.7.1
     # via