updating datumaro (#8370)

cvat/apps/dataset_manager/tests/test_rest_api_formats.py

@@ -25,7 +25,6 @@
 from unittest.mock import MagicMock, patch, DEFAULT as MOCK_DEFAULT
 
 from attr import define, field
-from datumaro import AnnotationType, Points
 from datumaro.components.dataset import Dataset
 from datumaro.components.operations import ExactComparator
 from datumaro.util.test_utils import TestDir
@@ -100,8 +99,8 @@ def generate_video_file(filename, width=1280, height=720, duration=1, fps=25, co
 
 
 def compare_datasets(expected: Dataset, actual: Dataset):
-    # we need this function to allow for a bit of variation in a rotation attribute and in skeleton elements order
-    comparator = ExactComparator(ignored_fields=["elements"], ignored_attrs=["rotation"])
+    # we need this function to allow for a bit of variation in the rotation attribute
+    comparator = ExactComparator(ignored_attrs=["rotation"])
     _, unmatched, expected_extra, actual_extra, errors = comparator.compare_datasets(
         expected, actual
     )
@@ -116,10 +115,6 @@ def compare_datasets(expected: Dataset, actual: Dataset):
                 abs(ann_a.attributes.get("rotation", 0) - ann_b.attributes.get("rotation", 0))
                 < 0.01
             )
-            if ann_a.type == AnnotationType.skeleton:
-                elements_a = sorted(filter(lambda p: p.visibility[0] != Points.Visibility.absent, ann_a.elements), key=lambda s: s.label)
-                elements_b = sorted(filter(lambda p: p.visibility[0] != Points.Visibility.absent, ann_b.elements), key=lambda s: s.label)
-                assert elements_a == elements_b
 
 
 class _DbTestBase(ApiTestBase):

cvat/requirements/base.in

@@ -6,7 +6,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@125840fc6b28875cce4c85626a5c36bb9e0d2a83
+datumaro @ git+https://github.com/cvat-ai/datumaro.git@393cb666529067060ff57e30cb6e448669274f35
 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)

cvat/requirements/base.txt

@@ -1,4 +1,4 @@
-# SHA1:e4ac293d721d613911f12dc1095ab4dced2072d8
+# SHA1:576a1a528bac33626df6c8d11c983263f7a175eb
 #
 # This file is autogenerated by pip-compile-multi
 # To update, run:
@@ -57,7 +57,7 @@ cryptography==43.0.0
     #   pyjwt
 cycler==0.12.1
     # via matplotlib
-datumaro @ git+https://github.com/cvat-ai/datumaro.git@125840fc6b28875cce4c85626a5c36bb9e0d2a83
+datumaro @ git+https://github.com/cvat-ai/datumaro.git@393cb666529067060ff57e30cb6e448669274f35
     # via -r cvat/requirements/base.in
 defusedxml==0.7.1
     # via
@@ -123,7 +123,7 @@ freezegun==1.5.1
     # via rq-scheduler
 furl==2.1.0
     # via -r cvat/requirements/base.in
-google-api-core==2.19.1
+google-api-core==2.19.2
     # via
     #   google-cloud-core
     #   google-cloud-storage
@@ -140,15 +140,15 @@ google-crc32c==1.5.0
     # via google-resumable-media
 google-resumable-media==2.7.2
     # via google-cloud-storage
-googleapis-common-protos==1.63.2
+googleapis-common-protos==1.65.0
     # via google-api-core
 h5py==3.11.0
     # via datumaro
-idna==3.7
+idna==3.8
     # via requests
-importlib-metadata==8.2.0
+importlib-metadata==8.4.0
     # via clickhouse-connect
-importlib-resources==6.4.3
+importlib-resources==6.4.4
     # via limits
 inflection==0.5.1
     # via drf-spectacular
@@ -214,7 +214,7 @@ pottery==3.0.0
     # via -r cvat/requirements/base.in
 proto-plus==1.24.0
     # via google-api-core
-protobuf==5.27.3
+protobuf==5.27.4
     # via
     #   google-api-core
     #   googleapis-common-protos
@@ -241,7 +241,7 @@ pyjwt[crypto]==2.9.0
     # via django-allauth
 pylogbeat==2.0.1
     # via python-logstash-async
-pyparsing==3.1.2
+pyparsing==3.1.4
     # via matplotlib
 pyrsistent==0.20.0
     # via jsonschema
@@ -355,7 +355,7 @@ xmlsec==1.3.14
     # via
     #   -r cvat/requirements/base.in
     #   python3-saml
-zipp==3.20.0
+zipp==3.20.1
     # via importlib-metadata
 zstandard==0.23.0
     # via clickhouse-connect

cvat/requirements/development.txt

@@ -65,5 +65,5 @@ tornado==6.4.1
     # via snakeviz
 
 # The following packages are considered to be unsafe in a requirements file:
-setuptools==72.2.0
+setuptools==74.0.0
     # via astroid

cvat/requirements/production.txt

@@ -27,7 +27,7 @@ uvicorn[standard]==0.22.0
     # via -r cvat/requirements/production.in
 uvloop==0.20.0
     # via uvicorn
-watchfiles==0.23.0
+watchfiles==0.24.0
     # via uvicorn
-websockets==12.0
+websockets==13.0
     # via uvicorn