From 70a7cc0944ea1684defce29687d56529f7a24455 Mon Sep 17 00:00:00 2001 From: Maxim Zhiltsov Date: Fri, 5 Apr 2024 17:08:34 +0300 Subject: [PATCH] Update datumaro dependency (#7716) ### Motivation and context Closes https://github.com/opencv/cvat/pull/7703 Related: https://github.com/opencv/cvat/issues/7258 Related: https://github.com/opencv/cvat/pull/7125 Related: https://github.com/opencv/cvat/pull/7699 Changes: https://github.com/cvat-ai/datumaro/compare/8a14a99fe17f19d98595a2a4a74ab459051cc23b...82982b16b178eb3f39c707795bb68a3306610abf - Fixed WiderFace dataset example - Fixed export without images in Datumaro format - no empty `media` and `point_cloud` fields should be in the results ### How has this been tested? ### Checklist - [ ] I submit my changes into the `develop` branch - [ ] I have created a changelog fragment - [ ] I have updated the documentation accordingly - [ ] I have added tests to cover my changes - [ ] I have linked related issues (see [GitHub docs]( https://help.github.com/en/github/managing-your-work-on-github/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword)) - [ ] I have increased versions of npm packages if it is necessary ([cvat-canvas](https://github.com/opencv/cvat/tree/develop/cvat-canvas#versioning), [cvat-core](https://github.com/opencv/cvat/tree/develop/cvat-core#versioning), [cvat-data](https://github.com/opencv/cvat/tree/develop/cvat-data#versioning) and [cvat-ui](https://github.com/opencv/cvat/tree/develop/cvat-ui#versioning)) ### License - [ ] I submit _my code changes_ under the same [MIT License]( https://github.com/opencv/cvat/blob/develop/LICENSE) that covers the project. Feel free to contact the maintainers if that's a concern. --- .../20240404_122043_mzhiltso_update_datumaro_dep.md | 7 +++++++ cvat/requirements/base.in | 2 +- cvat/requirements/base.txt | 6 +++--- 3 files changed, 11 insertions(+), 4 deletions(-) create mode 100644 changelog.d/20240404_122043_mzhiltso_update_datumaro_dep.md diff --git a/changelog.d/20240404_122043_mzhiltso_update_datumaro_dep.md b/changelog.d/20240404_122043_mzhiltso_update_datumaro_dep.md new file mode 100644 index 000000000000..0b98f8285851 --- /dev/null +++ b/changelog.d/20240404_122043_mzhiltso_update_datumaro_dep.md @@ -0,0 +1,7 @@ +### Fixed + +- Labels in WiderFace dataset example + () +- Export without images in Datumaro format - + no empty "media" and "point_cloud" fields should be present + () diff --git a/cvat/requirements/base.in b/cvat/requirements/base.in index 12c8dc1b0cb8..e187d2327dda 100644 --- a/cvat/requirements/base.in +++ b/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@8a14a99fe17f19d98595a2a4a74ab459051cc23b +datumaro @ git+https://github.com/cvat-ai/datumaro.git@82982b16b178eb3f39c707795bb68a3306610abf 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 index 73ecc148dec3..949cc17a3418 100644 --- a/cvat/requirements/base.txt +++ b/cvat/requirements/base.txt @@ -1,4 +1,4 @@ -# SHA1:3ac9fd027a6df758454893273509039ee719e819 +# SHA1:324d0ff72d2920a7d7c735fd480ddb30424c06ec # # This file is autogenerated by pip-compile-multi # To update, run: @@ -56,7 +56,7 @@ cryptography==42.0.5 # pyjwt cycler==0.12.1 # via matplotlib -datumaro @ git+https://github.com/cvat-ai/datumaro.git@8a14a99fe17f19d98595a2a4a74ab459051cc23b +datumaro @ git+https://github.com/cvat-ai/datumaro.git@82982b16b178eb3f39c707795bb68a3306610abf # via -r cvat/requirements/base.in defusedxml==0.7.1 # via @@ -173,7 +173,7 @@ lz4==4.3.3 # via clickhouse-connect markupsafe==2.1.5 # via jinja2 -matplotlib==3.8.3 +matplotlib==3.8.4 # via # datumaro # pycocotools