From d95cbcee35bb447a78080fba20dbc10d7bf0f15f Mon Sep 17 00:00:00 2001 From: Maria Khrustaleva Date: Tue, 5 Mar 2024 11:37:20 +0100 Subject: [PATCH] Update used rq version 1.15.1 -> 1.16 --- cvat/requirements/base.in | 2 +- cvat/requirements/base.txt | 92 +++++++++++++------------ cvat/requirements/development.txt | 20 +++--- cvat/requirements/production.txt | 20 +++--- cvat/rq_patching.py | 2 +- utils/dataset_manifest/requirements.txt | 6 +- 6 files changed, 74 insertions(+), 68 deletions(-) diff --git a/cvat/requirements/base.in b/cvat/requirements/base.in index e9b37657ed7e..9c9a170534cf 100644 --- a/cvat/requirements/base.in +++ b/cvat/requirements/base.in @@ -48,6 +48,6 @@ pyunpack==0.2.1 redis==4.5.4 requests~=2.26 rq-scheduler==0.13.1 -rq==1.15.1 +rq==1.16 rules>=3.3 Shapely==1.7.1 diff --git a/cvat/requirements/base.txt b/cvat/requirements/base.txt index 3b10c67bc585..80dc80f6b225 100644 --- a/cvat/requirements/base.txt +++ b/cvat/requirements/base.txt @@ -1,4 +1,4 @@ -# SHA1:55af6f61daa4ceab3e9aa358d3109c7af9660c0a +# SHA1:d1c348b5e3d643a1d910735314e91a467e543ca6 # # This file is autogenerated by pip-compile-multi # To update, run: @@ -15,7 +15,7 @@ attrs==21.4.0 # -r cvat/requirements/base.in # datumaro # jsonschema -azure-core==1.29.4 +azure-core==1.30.1 # via # azure-storage-blob # msrest @@ -27,22 +27,22 @@ botocore==1.20.112 # via # boto3 # s3transfer -cachetools==5.3.1 +cachetools==5.3.3 # via google-auth -certifi==2023.7.22 +certifi==2024.2.2 # via # clickhouse-connect # msrest # requests cffi==1.16.0 # via cryptography -charset-normalizer==3.3.0 +charset-normalizer==3.3.2 # via requests click==8.1.7 # via rq clickhouse-connect==0.6.8 # via -r cvat/requirements/base.in -contourpy==1.1.1 +contourpy==1.2.0 # via matplotlib coreapi==2.3.3 # via -r cvat/requirements/base.in @@ -50,7 +50,7 @@ coreschema==0.0.4 # via coreapi crontab==1.0.1 # via rq-scheduler -cryptography==42.0.4 +cryptography==42.0.5 # via # azure-storage-blob # pyjwt @@ -66,9 +66,11 @@ deprecated==1.2.14 # via limits dj-pagination==2.5.0 # via -r cvat/requirements/base.in -dj-rest-auth[with_social]==2.2.7 - # via -r cvat/requirements/base.in -django==4.2.6 +dj-rest-auth[with-social]==2.2.7 + # via + # -r cvat/requirements/base.in + # dj-rest-auth +django==4.2.11 # via # -r cvat/requirements/base.in # dj-rest-auth @@ -87,7 +89,7 @@ django-allauth==0.52.0 # via # -r cvat/requirements/base.in # dj-rest-auth -django-appconf==1.0.5 +django-appconf==1.0.6 # via django-compressor django-auth-ldap==2.2.0 # via -r cvat/requirements/base.in @@ -116,38 +118,38 @@ easyprocess==1.1 # via pyunpack entrypoint2==1.1 # via pyunpack -fonttools==4.43.1 +fonttools==4.49.0 # via matplotlib -freezegun==1.2.2 +freezegun==1.4.0 # via rq-scheduler furl==2.1.0 # via -r cvat/requirements/base.in -google-api-core==2.12.0 +google-api-core==2.17.1 # via # google-cloud-core # google-cloud-storage -google-auth==2.23.3 +google-auth==2.28.1 # via # google-api-core # google-cloud-core # google-cloud-storage -google-cloud-core==2.3.3 +google-cloud-core==2.4.1 # via google-cloud-storage google-cloud-storage==1.42.0 # via -r cvat/requirements/base.in google-crc32c==1.5.0 # via google-resumable-media -google-resumable-media==2.6.0 +google-resumable-media==2.7.0 # via google-cloud-storage -googleapis-common-protos==1.60.0 +googleapis-common-protos==1.62.0 # via google-api-core h5py==3.10.0 # via datumaro -idna==3.4 +idna==3.6 # via requests -importlib-metadata==6.8.0 +importlib-metadata==7.0.1 # via clickhouse-connect -importlib-resources==6.1.0 +importlib-resources==6.1.2 # via limits inflection==0.5.1 # via drf-spectacular @@ -165,29 +167,29 @@ jsonschema==4.17.3 # via drf-spectacular kiwisolver==1.4.5 # via matplotlib -limits==3.6.0 +limits==3.9.0 # via python-logstash-async -lxml==4.9.3 +lxml==5.1.0 # via datumaro -lz4==4.3.2 +lz4==4.3.3 # via clickhouse-connect -markupsafe==2.1.3 +markupsafe==2.1.5 # via jinja2 -matplotlib==3.8.0 +matplotlib==3.8.3 # via # datumaro # pycocotools msrest==0.7.1 # via azure-storage-blob -networkx==3.1 +networkx==3.2.1 # via datumaro -nibabel==5.1.0 +nibabel==5.2.1 # via datumaro oauthlib==3.2.2 # via requests-oauthlib orderedmultidict==1.0.1 # via furl -orjson==3.9.8 +orjson==3.9.15 # via datumaro packaging==23.2 # via @@ -195,13 +197,13 @@ packaging==23.2 # matplotlib # nibabel # tensorboardx -pandas==2.1.1 +pandas==2.2.1 # via datumaro patool==1.12 # via -r cvat/requirements/base.in pdf2image==1.14.0 # via -r cvat/requirements/base.in -protobuf==3.19.6 +protobuf==4.25.3 # via # google-api-core # googleapis-common-protos @@ -210,7 +212,7 @@ psutil==5.9.4 # via -r cvat/requirements/base.in psycopg2-binary==2.9.5 # via -r cvat/requirements/base.in -pyasn1==0.5.0 +pyasn1==0.5.1 # via # pyasn1-modules # python-ldap @@ -224,14 +226,16 @@ pycocotools==2.0.7 pycparser==2.21 # via cffi pyjwt[crypto]==2.8.0 - # via django-allauth + # via + # django-allauth + # pyjwt pylogbeat==2.0.1 # via python-logstash-async pyparsing==3.1.1 # via matplotlib -pyrsistent==0.19.3 +pyrsistent==0.20.0 # via jsonschema -python-dateutil==2.8.2 +python-dateutil==2.9.0.post0 # via # botocore # freezegun @@ -246,7 +250,7 @@ python-logstash-async==2.5.0 # via -r cvat/requirements/base.in python3-openid==3.2.0 # via django-allauth -pytz==2020.1 +pytz==2024.1 # via # clickhouse-connect # djangorestframework @@ -282,7 +286,7 @@ requests-oauthlib==1.3.1 # msrest rjsmin==1.2.1 # via django-compressor -rq==1.15.1 +rq==1.16.0 # via # -r cvat/requirements/base.in # django-rq @@ -291,7 +295,7 @@ rq-scheduler==0.13.1 # via -r cvat/requirements/base.in rsa==4.9 # via google-auth -ruamel-yaml==0.17.35 +ruamel-yaml==0.18.6 # via datumaro ruamel-yaml-clib==0.2.8 # via ruamel-yaml @@ -299,7 +303,7 @@ rules==3.3 # via -r cvat/requirements/base.in s3transfer==0.4.2 # via boto3 -scipy==1.11.3 +scipy==1.12.0 # via datumaro shapely==1.7.1 # via -r cvat/requirements/base.in @@ -312,15 +316,15 @@ six==1.16.0 # python-dateutil sqlparse==0.4.4 # via django -tensorboardx==2.6 +tensorboardx==2.6.2.2 # via datumaro -typing-extensions==4.8.0 +typing-extensions==4.10.0 # via # asgiref # azure-core # datumaro # limits -tzdata==2023.3 +tzdata==2024.1 # via pandas uritemplate==4.1.1 # via @@ -331,9 +335,9 @@ urllib3==1.26.18 # botocore # clickhouse-connect # requests -wrapt==1.15.0 +wrapt==1.16.0 # via deprecated zipp==3.17.0 # via importlib-metadata -zstandard==0.21.0 +zstandard==0.22.0 # via clickhouse-connect diff --git a/cvat/requirements/development.txt b/cvat/requirements/development.txt index 995112dbc937..3625cd7745bd 100644 --- a/cvat/requirements/development.txt +++ b/cvat/requirements/development.txt @@ -10,9 +10,9 @@ astroid==2.11.7 # via pylint autopep8==2.0.4 # via django-silk -black==24.1.1 +black==24.2.0 # via -r cvat/requirements/development.in -dill==0.3.7 +dill==0.3.8 # via pylint django-extensions==3.0.8 # via -r cvat/requirements/development.in @@ -20,21 +20,21 @@ django-silk==5.0.3 # via -r cvat/requirements/development.in gprof2dot==2022.7.29 # via django-silk -isort==5.12.0 +isort==5.13.2 # via pylint -lazy-object-proxy==1.9.0 +lazy-object-proxy==1.10.0 # via astroid mccabe==0.7.0 # via pylint mypy-extensions==1.0.0 # via black -pathspec==0.11.2 +pathspec==0.12.1 # via black -platformdirs==3.11.0 +platformdirs==4.2.0 # via # black # pylint -pycodestyle==2.11.0 +pycodestyle==2.11.1 # via autopep8 pylint==2.14.5 # via @@ -56,11 +56,11 @@ tomli==2.0.1 # autopep8 # black # pylint -tomlkit==0.12.1 +tomlkit==0.12.4 # via pylint -tornado==6.3.3 +tornado==6.4 # via snakeviz # The following packages are considered to be unsafe in a requirements file: -setuptools==68.2.2 +setuptools==69.1.1 # via astroid diff --git a/cvat/requirements/production.txt b/cvat/requirements/production.txt index a919444f96cf..0bea0b968b15 100644 --- a/cvat/requirements/production.txt +++ b/cvat/requirements/production.txt @@ -6,25 +6,27 @@ # pip-compile-multi # -r base.txt -anyio==4.0.0 +anyio==4.3.0 # via watchfiles coverage==7.2.3 # via -r cvat/requirements/production.in -exceptiongroup==1.1.3 +exceptiongroup==1.2.0 # via anyio h11==0.14.0 # via uvicorn -httptools==0.6.0 +httptools==0.6.1 # via uvicorn -python-dotenv==1.0.0 +python-dotenv==1.0.1 # via uvicorn -sniffio==1.3.0 +sniffio==1.3.1 # via anyio uvicorn[standard]==0.22.0 - # via -r cvat/requirements/production.in -uvloop==0.17.0 + # via + # -r cvat/requirements/production.in + # uvicorn +uvloop==0.19.0 # via uvicorn -watchfiles==0.20.0 +watchfiles==0.21.0 # via uvicorn -websockets==11.0.3 +websockets==12.0 # via uvicorn diff --git a/cvat/rq_patching.py b/cvat/rq_patching.py index fcf5bc2f6d89..5bc130d70dee 100644 --- a/cvat/rq_patching.py +++ b/cvat/rq_patching.py @@ -71,5 +71,5 @@ def custom_started_job_registry_cleanup(self, timestamp: Optional[float] = None) def update_started_job_registry_cleanup() -> None: # don't forget to check if the issue https://github.com/rq/rq/issues/2006 has been resolved in upstream - assert VERSION == '1.15.1' + assert VERSION == '1.16' rq.registry.StartedJobRegistry.cleanup = custom_started_job_registry_cleanup diff --git a/utils/dataset_manifest/requirements.txt b/utils/dataset_manifest/requirements.txt index f5a34a49dc7c..6210dac1d64d 100644 --- a/utils/dataset_manifest/requirements.txt +++ b/utils/dataset_manifest/requirements.txt @@ -11,9 +11,9 @@ natsort==8.0.0 # via -r utils/dataset_manifest/requirements.in numpy==1.22.4 # via opencv-python-headless -opencv-python-headless==4.8.1.78 +opencv-python-headless==4.9.0.80 # via -r utils/dataset_manifest/requirements.in -pillow==10.1.0 +pillow==10.2.0 # via -r utils/dataset_manifest/requirements.in -tqdm==4.66.1 +tqdm==4.66.2 # via -r utils/dataset_manifest/requirements.in