From 8bc3bcdb6cc495a560a1efa4006b928c3da3d8fe Mon Sep 17 00:00:00 2001 From: Yunchu Lee Date: Mon, 6 Nov 2023 21:26:48 +0900 Subject: [PATCH 1/4] tighten dependency constratint only adapting latest patches --- requirements/api.txt | 12 ++++++------ requirements/base.txt | 16 ++++++++-------- requirements/classification.txt | 2 +- requirements/detection.txt | 4 ++-- requirements/dev.txt | 14 +++++++------- requirements/docs.txt | 14 +++++++------- requirements/openvino.txt | 2 +- requirements/segmentation.txt | 4 ++-- requirements/visual_prompting.txt | 2 +- 9 files changed, 35 insertions(+), 35 deletions(-) diff --git a/requirements/api.txt b/requirements/api.txt index c9968e9184f..2148d603747 100644 --- a/requirements/api.txt +++ b/requirements/api.txt @@ -1,12 +1,12 @@ # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # API Requirements. # -attrs>=21.2.0 +attrs==23.1.* networkx>=2.6,<=2.8.0 numpy>=1.21.0,<=1.23.4 # np.bool was removed in 1.24.0 which was used in openvino runtime -omegaconf>=2.1.1 -opencv-python>=4.5 -pymongo -scikit-learn>=1.0.2 +omegaconf==2.3.* +opencv-python==4.8.1.* +pymongo==4.6.* +scikit-learn==1.3.* Shapely>=1.7.1,<=1.8.0 imagesize==1.4.1 -dill>=0.3.6 +dill==0.3.* diff --git a/requirements/base.txt b/requirements/base.txt index f4682fc6150..41e1decce9e 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -1,12 +1,12 @@ # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # Base Algo Requirements. # -natsort>=6.0.0 -prettytable -protobuf>=3.20.0 +natsort==8.4.* +prettytable==3.9.* +protobuf==3.20.* pyyaml datumaro==1.5.1rc3 -psutil -scipy>=1.8 -bayesian-optimization>=1.2.0 -tensorboard>=2.11.0 -multiprocess +psutil==5.9.* +scipy==1.10.* +bayesian-optimization==1.4.* +tensorboard==2.15.* +multiprocess==0.70.* diff --git a/requirements/classification.txt b/requirements/classification.txt index facc2dca543..bfe35197d9c 100644 --- a/requirements/classification.txt +++ b/requirements/classification.txt @@ -4,5 +4,5 @@ mmcv-full==1.7.0 mmcls==0.25.0 timm==0.6.12 mmdeploy==0.14.0 -pytorchcv +pytorchcv==0.0.67 yapf<0.40.0 # it should be removed after https://github.com/google/yapf/issues/1118 is solved diff --git a/requirements/detection.txt b/requirements/detection.txt index 9118ffec5c1..e8023cf5439 100644 --- a/requirements/detection.txt +++ b/requirements/detection.txt @@ -2,10 +2,10 @@ # Detection Requirements. mmcv-full==1.7.0 mmdet==2.28.1 -pytorchcv +pytorchcv==0.0.67 mmcls==0.25.0 timm==0.6.12 mmdeploy==0.14.0 mmengine==0.7.4 -scikit-image +scikit-image==0.22.* yapf<0.40.0 # it should be removed after https://github.com/google/yapf/issues/1118 is solved diff --git a/requirements/dev.txt b/requirements/dev.txt index d6648af378e..3966fdcf396 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -1,12 +1,12 @@ # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # Development Requirements. # pre-commit==2.20.0 -pylint -pytest -coverage -pytest-timeout -pytest-mock +pylint==3.0.* +pytest==7.4.* +coverage==7.3.* +pytest-timeout==2.2.* +pytest-mock==3.12.* onnx==1.13.0 onnxruntime==1.14.1 -pytest-csv -tox>=4.5.1.1 +pytest-csv==3.0.* +tox==4.11.* diff --git a/requirements/docs.txt b/requirements/docs.txt index 3f5c106da4b..f3cb3ec5100 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -1,10 +1,10 @@ -furo -myst-parser +furo==2023.3.* +myst-parser==1.0.* sphinx==5.3.0 pydata-sphinx-theme==0.12.0 -sphinx-tabs -sphinx-panels +sphinx-tabs==3.4.* +sphinx-panels==0.4.* sphinx-copybutton==0.5.0 -sphinx-autoapi -sphinxemoji -nbsphinx +sphinx-autoapi==2.1.* +sphinxemoji==0.2.* +nbsphinx==0.9.* diff --git a/requirements/openvino.txt b/requirements/openvino.txt index 4a1494bb460..e91ed69252a 100644 --- a/requirements/openvino.txt +++ b/requirements/openvino.txt @@ -5,4 +5,4 @@ onnx==1.13.0 openvino-model-api==0.1.6 openvino==2023.0 openvino-dev==2023.0 -openvino-telemetry>=2022.1.0 +openvino-telemetry==2023.2.* diff --git a/requirements/segmentation.txt b/requirements/segmentation.txt index 17820fdbe16..5c6ac9afbae 100644 --- a/requirements/segmentation.txt +++ b/requirements/segmentation.txt @@ -2,9 +2,9 @@ # Segmentation Requirements. mmcv-full==1.7.0 mmsegmentation==0.30.0 -scikit-image +scikit-image==0.22.* mmdeploy==0.14.0 timm==0.6.12 -pytorchcv +pytorchcv==0.0.67 einops==0.6.1 yapf<0.40.0 # it should be removed after https://github.com/google/yapf/issues/1118 is solved diff --git a/requirements/visual_prompting.txt b/requirements/visual_prompting.txt index ea9c9b50de1..56bf275f6f0 100644 --- a/requirements/visual_prompting.txt +++ b/requirements/visual_prompting.txt @@ -1,4 +1,4 @@ # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # Visual Prompting Requirements. -scikit-image +scikit-image==0.22.* pytorch-lightning>=1.7.0,<1.10.0 From 5f2d318500b78d68da7c117d950de0ada11881b7 Mon Sep 17 00:00:00 2001 From: Yunchu Lee Date: Tue, 7 Nov 2023 09:36:35 +0900 Subject: [PATCH 2/4] adjust scikit-image version w.r.t python version --- requirements/detection.txt | 3 ++- requirements/segmentation.txt | 3 ++- requirements/visual_prompting.txt | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/requirements/detection.txt b/requirements/detection.txt index e8023cf5439..2078a1c27f2 100644 --- a/requirements/detection.txt +++ b/requirements/detection.txt @@ -7,5 +7,6 @@ mmcls==0.25.0 timm==0.6.12 mmdeploy==0.14.0 mmengine==0.7.4 -scikit-image==0.22.* +scikit-image==0.22.*; python_version >= '3.9' +scikit-image==0.21.*; python_version < '3.9' yapf<0.40.0 # it should be removed after https://github.com/google/yapf/issues/1118 is solved diff --git a/requirements/segmentation.txt b/requirements/segmentation.txt index 5c6ac9afbae..77ed909f370 100644 --- a/requirements/segmentation.txt +++ b/requirements/segmentation.txt @@ -2,7 +2,8 @@ # Segmentation Requirements. mmcv-full==1.7.0 mmsegmentation==0.30.0 -scikit-image==0.22.* +scikit-image==0.22.*; python_version >= '3.9' +scikit-image==0.21.*; python_version < '3.9' mmdeploy==0.14.0 timm==0.6.12 pytorchcv==0.0.67 diff --git a/requirements/visual_prompting.txt b/requirements/visual_prompting.txt index 56bf275f6f0..3b24505aca2 100644 --- a/requirements/visual_prompting.txt +++ b/requirements/visual_prompting.txt @@ -1,4 +1,5 @@ # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # Visual Prompting Requirements. -scikit-image==0.22.* +scikit-image==0.22.*; python_version >= '3.9' +scikit-image==0.21.*; python_version < '3.9' pytorch-lightning>=1.7.0,<1.10.0 From ec737ec7e02cb5432139d5e72d6b9785940b788a Mon Sep 17 00:00:00 2001 From: Yunchu Lee Date: Tue, 7 Nov 2023 13:11:13 +0900 Subject: [PATCH 3/4] adjust tensorboard version w.r.t python version --- requirements/base.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/requirements/base.txt b/requirements/base.txt index 41e1decce9e..aad13eace7b 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -8,5 +8,6 @@ datumaro==1.5.1rc3 psutil==5.9.* scipy==1.10.* bayesian-optimization==1.4.* -tensorboard==2.15.* +tensorboard==2.15.*; python_version >= '3.9' +tensorboard==2.14.*; python_version < '3.9' multiprocess==0.70.* From 58e9e620a31282d7a7385f44db4c88f02f93bf97 Mon Sep 17 00:00:00 2001 From: Yunchu Lee Date: Tue, 7 Nov 2023 18:07:12 +0900 Subject: [PATCH 4/4] remove version specifier for scikit-image --- requirements/detection.txt | 3 +-- requirements/segmentation.txt | 3 +-- requirements/visual_prompting.txt | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/requirements/detection.txt b/requirements/detection.txt index 2078a1c27f2..ddcc33f1347 100644 --- a/requirements/detection.txt +++ b/requirements/detection.txt @@ -7,6 +7,5 @@ mmcls==0.25.0 timm==0.6.12 mmdeploy==0.14.0 mmengine==0.7.4 -scikit-image==0.22.*; python_version >= '3.9' -scikit-image==0.21.*; python_version < '3.9' +scikit-image # specifying different version w.r.t python_version is not effect yapf<0.40.0 # it should be removed after https://github.com/google/yapf/issues/1118 is solved diff --git a/requirements/segmentation.txt b/requirements/segmentation.txt index 77ed909f370..fdda6fa9cde 100644 --- a/requirements/segmentation.txt +++ b/requirements/segmentation.txt @@ -2,8 +2,7 @@ # Segmentation Requirements. mmcv-full==1.7.0 mmsegmentation==0.30.0 -scikit-image==0.22.*; python_version >= '3.9' -scikit-image==0.21.*; python_version < '3.9' +scikit-image # specifying different version w.r.t python_version is not effect mmdeploy==0.14.0 timm==0.6.12 pytorchcv==0.0.67 diff --git a/requirements/visual_prompting.txt b/requirements/visual_prompting.txt index 3b24505aca2..5b5762e841a 100644 --- a/requirements/visual_prompting.txt +++ b/requirements/visual_prompting.txt @@ -1,5 +1,4 @@ # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # Visual Prompting Requirements. -scikit-image==0.22.*; python_version >= '3.9' -scikit-image==0.21.*; python_version < '3.9' +scikit-image # specifying different version w.r.t python_version is not effect pytorch-lightning>=1.7.0,<1.10.0