Skip to content

Commit

Permalink
updating datumaro (#8838)
Browse files Browse the repository at this point in the history
<!-- Raise an issue to propose your change
(https://github.com/cvat-ai/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://docs.cvat.ai/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. -->

### 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/cvat-ai/cvat/tree/develop/cvat-canvas#versioning),

[cvat-core](https://github.com/cvat-ai/cvat/tree/develop/cvat-core#versioning),

[cvat-data](https://github.com/cvat-ai/cvat/tree/develop/cvat-data#versioning)
and

[cvat-ui](https://github.com/cvat-ai/cvat/tree/develop/cvat-ui#versioning))

### License

- [ ] I submit _my code changes_ under the same [MIT License](
https://github.com/cvat-ai/cvat/blob/develop/LICENSE) that covers the
project.
  Feel free to contact the maintainers if that's a concern.


<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->

## Summary by CodeRabbit

- **New Features**
- Updated various dependencies to their latest versions, ensuring
improved performance and compatibility.

- **Bug Fixes**
- General maintenance updates may include bug fixes from the updated
packages.

- **Documentation**
- Updated requirements files to reflect the new dependency versions
across different environments (base, development, production, and
dataset manifest).

<!-- end of auto-generated comment: release notes by coderabbit.ai -->
  • Loading branch information
Eldies authored Dec 18, 2024
1 parent 851fb7d commit ba475a9
Show file tree
Hide file tree
Showing 5 changed files with 44 additions and 44 deletions.
2 changes: 1 addition & 1 deletion cvat/requirements/base.in
Original file line number Diff line number Diff line change
Expand Up @@ -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@e612d1bfb76a3c3d3d545187338c841a246619fb
datumaro @ git+https://github.com/cvat-ai/datumaro.git@bf0374689df50599a34a4f220b9e5329aca695ce
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
62 changes: 31 additions & 31 deletions cvat/requirements/base.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# SHA1:275a663d91764ea3126531729179a07e95b657e8
# SHA1:1bed6e1afea11473b164df79d7d166f419074359
#
# This file is autogenerated by pip-compile-multi
# To update, run:
Expand All @@ -8,14 +8,14 @@
-r ../../utils/dataset_manifest/requirements.txt
asgiref==3.8.1
# via django
async-timeout==4.0.3
async-timeout==5.0.1
# via redis
attrs==21.4.0
# via
# -r cvat/requirements/base.in
# datumaro
# jsonschema
azure-core==1.31.0
azure-core==1.32.0
# via
# azure-storage-blob
# msrest
Expand All @@ -29,14 +29,14 @@ botocore==1.20.112
# s3transfer
cachetools==5.5.0
# via google-auth
certifi==2024.8.30
certifi==2024.12.14
# via
# clickhouse-connect
# msrest
# requests
cffi==1.17.1
# via cryptography
charset-normalizer==3.3.2
charset-normalizer==3.4.0
# via requests
click==8.1.7
# via rq
Expand All @@ -50,25 +50,25 @@ coreschema==0.0.4
# via coreapi
crontab==1.0.1
# via rq-scheduler
cryptography==43.0.1
cryptography==44.0.0
# via
# azure-storage-blob
# pyjwt
cycler==0.12.1
# via matplotlib
datumaro @ git+https://github.com/cvat-ai/datumaro.git@e612d1bfb76a3c3d3d545187338c841a246619fb
datumaro @ git+https://github.com/cvat-ai/datumaro.git@bf0374689df50599a34a4f220b9e5329aca695ce
# via -r cvat/requirements/base.in
defusedxml==0.7.1
# via
# datumaro
# python3-openid
deprecated==1.2.14
deprecated==1.2.15
# via limits
dj-pagination==2.5.0
# via -r cvat/requirements/base.in
dj-rest-auth[with-social]==5.0.2
# via -r cvat/requirements/base.in
django==4.2.16
django==4.2.17
# via
# -r cvat/requirements/base.in
# dj-rest-auth
Expand Down Expand Up @@ -116,17 +116,17 @@ easyprocess==1.1
# via pyunpack
entrypoint2==1.1
# via pyunpack
fonttools==4.54.1
fonttools==4.55.3
# via matplotlib
freezegun==1.5.1
# via rq-scheduler
furl==2.1.0
# via -r cvat/requirements/base.in
google-api-core==2.20.0
google-api-core==2.24.0
# via
# google-cloud-core
# google-cloud-storage
google-auth==2.35.0
google-auth==2.37.0
# via
# google-api-core
# google-cloud-core
Expand All @@ -139,7 +139,7 @@ google-crc32c==1.6.0
# via google-resumable-media
google-resumable-media==2.7.2
# via google-cloud-storage
googleapis-common-protos==1.65.0
googleapis-common-protos==1.66.0
# via google-api-core
h5py==3.12.1
# via datumaro
Expand All @@ -148,10 +148,10 @@ idna==3.10
importlib-metadata==8.5.0
# via clickhouse-connect
importlib-resources==6.4.5
# via limits
# via nibabel
inflection==0.5.1
# via drf-spectacular
isodate==0.6.1
isodate==0.7.2
# via
# msrest
# python3-saml
Expand All @@ -167,7 +167,7 @@ jsonschema==4.17.3
# via drf-spectacular
kiwisolver==1.4.7
# via matplotlib
limits==3.13.0
limits==3.14.1
# via python-logstash-async
lxml==5.3.0
# via
Expand All @@ -177,7 +177,7 @@ lxml==5.3.0
# xmlsec
lz4==4.3.3
# via clickhouse-connect
markupsafe==2.1.5
markupsafe==3.0.2
# via jinja2
matplotlib==3.8.4
# via
Expand All @@ -187,17 +187,17 @@ mmh3==5.0.1
# via pottery
msrest==0.7.1
# via azure-storage-blob
networkx==3.3
networkx==3.4.2
# via datumaro
nibabel==5.2.1
nibabel==5.3.2
# via datumaro
oauthlib==3.2.2
# via requests-oauthlib
orderedmultidict==1.0.1
# via furl
orjson==3.10.7
orjson==3.10.12
# via datumaro
packaging==24.1
packaging==24.2
# via
# limits
# matplotlib
Expand All @@ -211,9 +211,9 @@ pdf2image==1.14.0
# via -r cvat/requirements/base.in
pottery==3.0.0
# via -r cvat/requirements/base.in
proto-plus==1.24.0
proto-plus==1.25.0
# via google-api-core
protobuf==5.28.2
protobuf==5.29.1
# via
# google-api-core
# googleapis-common-protos
Expand All @@ -236,11 +236,11 @@ pycocotools==2.0.8
# via datumaro
pycparser==2.22
# via cffi
pyjwt[crypto]==2.9.0
pyjwt[crypto]==2.10.1
# via django-allauth
pylogbeat==2.0.1
# via python-logstash-async
pyparsing==3.1.4
pyparsing==3.2.0
# via matplotlib
pyrsistent==0.20.0
# via jsonschema
Expand Down Expand Up @@ -308,7 +308,7 @@ rsa==4.9
# via google-auth
ruamel-yaml==0.18.6
# via datumaro
ruamel-yaml-clib==0.2.8
ruamel-yaml-clib==0.2.12
# via ruamel-yaml
rules==3.5
# via -r cvat/requirements/base.in
Expand All @@ -318,14 +318,13 @@ scipy==1.13.1
# via datumaro
shapely==1.7.1
# via -r cvat/requirements/base.in
six==1.16.0
six==1.17.0
# via
# azure-core
# furl
# isodate
# orderedmultidict
# python-dateutil
sqlparse==0.5.1
sqlparse==0.5.3
# via django
tensorboardx==2.6.2.2
# via datumaro
Expand All @@ -335,6 +334,7 @@ typing-extensions==4.12.2
# azure-core
# datumaro
# limits
# nibabel
# pottery
tzdata==2024.2
# via pandas
Expand All @@ -347,13 +347,13 @@ urllib3==1.26.20
# botocore
# clickhouse-connect
# requests
wrapt==1.16.0
wrapt==1.17.0
# via deprecated
xmlsec==1.3.14
# via
# -r cvat/requirements/base.in
# python3-saml
zipp==3.20.2
zipp==3.21.0
# via importlib-metadata
zstandard==0.23.0
# via clickhouse-connect
10 changes: 5 additions & 5 deletions cvat/requirements/development.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ astroid==2.11.7
# via pylint
autopep8==2.3.1
# via django-silk
black==24.8.0
black==24.10.0
# via -r cvat/requirements/development.in
dill==0.3.9
# via pylint
django-extensions==3.0.8
# via -r cvat/requirements/development.in
django-silk==5.2.0
django-silk==5.3.2
# via -r cvat/requirements/development.in
gprof2dot==2024.6.6
# via django-silk
Expand Down Expand Up @@ -51,16 +51,16 @@ rope==0.17.0
# via -r cvat/requirements/development.in
snakeviz==2.1.0
# via -r cvat/requirements/development.in
tomli==2.0.2
tomli==2.2.1
# via
# autopep8
# black
# pylint
tomlkit==0.13.2
# via pylint
tornado==6.4.1
tornado==6.4.2
# via snakeviz

# The following packages are considered to be unsafe in a requirements file:
setuptools==75.1.0
setuptools==75.6.0
# via astroid
10 changes: 5 additions & 5 deletions cvat/requirements/production.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,25 +6,25 @@
# pip-compile-multi
#
-r base.txt
anyio==4.6.0
anyio==4.7.0
# via watchfiles
coverage==7.2.3
# via -r cvat/requirements/production.in
exceptiongroup==1.2.2
# via anyio
h11==0.14.0
# via uvicorn
httptools==0.6.1
httptools==0.6.4
# via uvicorn
python-dotenv==1.0.1
# via uvicorn
sniffio==1.3.1
# via anyio
uvicorn[standard]==0.22.0
# via -r cvat/requirements/production.in
uvloop==0.20.0
uvloop==0.21.0
# via uvicorn
watchfiles==0.24.0
watchfiles==1.0.3
# via uvicorn
websockets==13.1
websockets==14.1
# via uvicorn
4 changes: 2 additions & 2 deletions utils/dataset_manifest/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ numpy==1.22.4
# via opencv-python-headless
opencv-python-headless==4.10.0.84
# via -r utils/dataset_manifest/requirements.in
pillow==10.4.0
pillow==11.0.0
# via -r utils/dataset_manifest/requirements.in
tqdm==4.66.5
tqdm==4.67.1
# via -r utils/dataset_manifest/requirements.in

0 comments on commit ba475a9

Please sign in to comment.