From 75a03d1bf1f87a011c41e2413224c7b885ebff75 Mon Sep 17 00:00:00 2001 From: Roman Donchenko Date: Mon, 31 Jul 2023 18:27:05 +0300 Subject: [PATCH] Sort requirements .in files to make them easier to navigate --- cvat/requirements/base.in | 70 ++++++++++++++------------ cvat/requirements/base.txt | 2 +- cvat/requirements/development.in | 8 +-- cvat/requirements/production.in | 7 ++- cvat/requirements/testing.in | 3 +- utils/dataset_manifest/requirements.in | 2 +- 6 files changed, 50 insertions(+), 42 deletions(-) diff --git a/cvat/requirements/base.in b/cvat/requirements/base.in index 8c43a2d0f2e6..16cd4c3bc6c6 100644 --- a/cvat/requirements/base.in +++ b/cvat/requirements/base.in @@ -1,53 +1,57 @@ -r ../../utils/dataset_manifest/requirements.in attrs==21.4.0 -Django~=4.2.1 -django-auth-ldap==2.2.0 -django-compressor==4.3.1 +av==9.2.0 +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@ff83c00c2c1bc4b8fdfcc55067fcab0a9b5b6b11 +dj-pagination==2.5.0 +dj-rest-auth[with_social]==2.2.7 + # dj-rest-auth[with_social] includes django-allauth but with version range: >=0.40.0,<0.53.0 # This does not suit us in the case when one of the previous allauth version was installed. # 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) # https://dj-rest-auth.readthedocs.io/en/latest/installation.html#registration-optional django-allauth>=0.52.0 -dj-rest-auth[with_social]==2.2.7 + +django-auth-ldap==2.2.0 +django-compressor==4.3.1 +django-cors-headers==3.5.0 +django-crum==0.7.9 +django-filter==2.4.0 +django-health-check==3.17.0 django-rq==2.3.2 -Pillow==9.3.0 +django-sendfile2==0.7.0 +Django~=4.2.1 +djangorestframework~=3.14.0 +dnspython==2.2.0 +drf-spectacular>=0.26.2 +furl==2.1.0 +GitPython~=3.1 +google-cloud-storage==1.42.0 +natsort==8.0.0 numpy==1.22.0 +opencv-python-headless==4.5.5.62 + +# The package is used by pyunpack as a command line tool to support multiple +# archives. Don't use as a python module because it has GPL license. +patool==1.12 + +pdf2image==1.14.0 +Pillow==9.3.0 +psutil==5.9.4 +psycopg2-binary==2.9.5 python-ldap==3.4.3 +python-logstash-async==2.5.0 pytz==2020.1 pyunpack==0.2.1 redis==4.5.4 requests~=2.26 -rq==1.5.2 rq-scheduler==0.10.0 -django-sendfile2==0.7.0 -dj-pagination==2.5.0 -python-logstash-async==2.5.0 +rq==1.5.2 rules>=3.3 -GitPython~=3.1 -coreapi==2.3.3 -django-filter==2.4.0 -djangorestframework~=3.14.0 -drf-spectacular>=0.26.2 Shapely==1.7.1 -pdf2image==1.14.0 -opencv-python-headless==4.5.5.62 -django-cors-headers==3.5.0 -furl==2.1.0 -av==9.2.0 tensorflow==2.11.1 # Optional requirement of Datumaro. Use tensorflow-macos==2.8.0 for Mac M1 -# The package is used by pyunpack as a command line tool to support multiple -# archives. Don't use as a python module because it has GPL license. -patool==1.12 -boto3==1.17.61 -azure-storage-blob==12.13.0 -google-cloud-storage==1.42.0 -git+https://github.com/cvat-ai/datumaro.git@ff83c00c2c1bc4b8fdfcc55067fcab0a9b5b6b11 -natsort==8.0.0 -dnspython==2.2.0 -django-health-check==3.17.0 -psutil==5.9.4 -clickhouse-connect==0.6.8 -django-crum==0.7.9 -psycopg2-binary==2.9.5 diff --git a/cvat/requirements/base.txt b/cvat/requirements/base.txt index 54afdaf129bd..f3e82c34ebf2 100644 --- a/cvat/requirements/base.txt +++ b/cvat/requirements/base.txt @@ -1,4 +1,4 @@ -# SHA1:39ecb07f2a59817ea1c9492587f393bdaadb4468 +# SHA1:b4a177c55f0172c771a0139f2b9708842a312a65 # # This file is autogenerated by pip-compile-multi # To update, run: diff --git a/cvat/requirements/development.in b/cvat/requirements/development.in index 66ce788b1c9f..3ac4e7b88799 100644 --- a/cvat/requirements/development.in +++ b/cvat/requirements/development.in @@ -1,10 +1,10 @@ -r base.in -pylint==2.14.5 +black==23.3.0 +django-extensions==3.0.8 +django-silk==5.0.3 pylint-django==2.5.3 pylint-plugin-utils==0.7 +pylint==2.14.5 rope==0.17.0 -django-extensions==3.0.8 snakeviz==2.1.0 -django-silk==5.0.3 -black==23.3.0 \ No newline at end of file diff --git a/cvat/requirements/production.in b/cvat/requirements/production.in index c349f996c947..808bfcb77481 100644 --- a/cvat/requirements/production.in +++ b/cvat/requirements/production.in @@ -1,4 +1,7 @@ -r base.in -uvicorn[standard]==0.22.0 -coverage==7.2.3 # to collect the coverage for REST API tests. + +# To collect the coverage for REST API tests. # It will be enabled only if COVERAGE_PROCESS_START env is defined. +coverage==7.2.3 + +uvicorn[standard]==0.22.0 diff --git a/cvat/requirements/testing.in b/cvat/requirements/testing.in index e2c70b149ea2..52aef23f3a99 100644 --- a/cvat/requirements/testing.in +++ b/cvat/requirements/testing.in @@ -1,3 +1,4 @@ -r development.in -fakeredis==2.10.3 + coverage==7.2.3 +fakeredis==2.10.3 diff --git a/utils/dataset_manifest/requirements.in b/utils/dataset_manifest/requirements.in index f88d90ff2254..a5a7b3bae83c 100644 --- a/utils/dataset_manifest/requirements.in +++ b/utils/dataset_manifest/requirements.in @@ -1,5 +1,5 @@ av==9.2.0 # Pinned for the whole CVAT +natsort>=8.0.0 opencv-python-headless>=4.4.0.42 Pillow==9.3.0 tqdm>=4.58.0 -natsort>=8.0.0