Skip to content

Commit

Permalink
Update datumaro dependency (cvat-ai#7716)
Browse files Browse the repository at this point in the history
<!-- Raise an issue to propose your change
(https://github.com/opencv/cvat/issues).
It helps to avoid duplication of efforts from multiple independent
contributors.
Discuss your ideas with maintainers to be sure that changes will be
approved and merged.
Read the [Contribution
guide](https://opencv.github.io/cvat/docs/contributing/). -->

<!-- Provide a general summary of your changes in the Title above -->

### Motivation and context
<!-- Why is this change required? What problem does it solve? If it
fixes an open
issue, please link to the issue here. Describe your changes in detail,
add
screenshots. -->

Closes cvat-ai#7703
Related: cvat-ai#7258
Related: cvat-ai#7125
Related: cvat-ai#7699

Changes:
cvat-ai/datumaro@8a14a99...82982b1

- 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?
<!-- Please describe in detail how you tested your changes.
Include details of your testing environment, and the tests you ran to
see how your change affects other areas of the code, etc. -->

### Checklist
<!-- Go over all the following points, and put an `x` in all the boxes
that apply.
If an item isn't applicable for some reason, then ~~explicitly
strikethrough~~ the whole
line. If you don't do that, GitHub will show incorrect progress for the
pull request.
If you're unsure about any of these, don't hesitate to ask. We're here
to help! -->
- [ ] I submit my changes into the `develop` branch
- [ ] I have created a changelog fragment <!-- see top comment in
CHANGELOG.md -->
- [ ] 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.
  • Loading branch information
zhiltsov-max authored Apr 5, 2024
1 parent f1db0fd commit 70a7cc0
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 4 deletions.
7 changes: 7 additions & 0 deletions changelog.d/20240404_122043_mzhiltso_update_datumaro_dep.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
### Fixed

- Labels in WiderFace dataset example
(<https://github.com/opencv/cvat/pull/7716>)
- Export without images in Datumaro format -
no empty "media" and "point_cloud" fields should be present
(<https://github.com/opencv/cvat/pull/7716>)
2 changes: 1 addition & 1 deletion cvat/requirements/base.in
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions cvat/requirements/base.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# SHA1:3ac9fd027a6df758454893273509039ee719e819
# SHA1:324d0ff72d2920a7d7c735fd480ddb30424c06ec
#
# This file is autogenerated by pip-compile-multi
# To update, run:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 70a7cc0

Please sign in to comment.