fix continious integration workflows (#963)

obss · Nov 5, 2023 · e161468 · e161468
1 parent b115f08
commit e161468
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 181 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -20,7 +20,7 @@ jobs:
     strategy:
       matrix:
         operating-system: [ubuntu-latest, windows-latest, macos-latest]
-        python-version: [3.7, 3.8, 3.9, '3.10']
+        python-version: [3.8, 3.9, '3.10']
       fail-fast: false
 
     steps:
@@ -90,29 +90,29 @@ jobs:
           pip install mmcv==2.0.0 -f https://download.openmmlab.com/mmcv/dist/cpu/torch1.13.0/index.html
           pip install mmdet==3.0.0
 
-      - name: Install YOLOv5(7.0.9)
+      - name: Install YOLOv5(7.0.13)
         run: >
-          pip install yolov5==7.0.9
+          pip install yolov5==7.0.13
 
       - name: Install DeepSparse
         run: >
           pip install deepsparse
 
-      - name: Install Transformers(4.25.1)
+      - name: Install Transformers(4.35.0)
         run: >
-          pip install transformers==4.25.1
+          pip install transformers==4.35.0
 
-      - name: Install pycocotools(2.0.6)
+      - name: Install pycocotools(2.0.7)
         run: >
-          pip install pycocotools==2.0.6
+          pip install pycocotools==2.0.7
 
-      - name: Install ultralytics
+      - name: Install ultralytics(8.0.207)
         run: >
-          pip install ultralytics==8.0.99
+          pip install ultralytics==8.0.207
 
-      - name: Install super-gradients
+      - name: Install super-gradients(3.3.1)
         run: >
-          pip install super-gradients==3.1.2
+          pip install super-gradients==3.3.1
 
       - name: Unittest for SAHI+YOLOV5/MMDET/Detectron2 on all platforms
         run: |

diff --git a/.github/workflows/ci_torch1.10.yml b/.github/workflows/ci_torch1.10.yml
diff --git a/.github/workflows/package_testing.yml b/.github/workflows/package_testing.yml
@@ -11,7 +11,7 @@ jobs:
     strategy:
       matrix:
         operating-system: [ubuntu-latest, windows-latest, macos-latest]
-        python-version: [3.7, 3.8, 3.9]
+        python-version: [3.8, 3.9, '3.10']
       fail-fast: false
 
     steps:
@@ -55,21 +55,22 @@ jobs:
           matrix.operating-system == 'ubuntu-latest' ||
           matrix.operating-system == 'windows-latest'
         run: >
-          pip install torch==1.10.2+cpu torchvision==0.11.3+cpu
+          pip install torch==1.13.1+cpu torchvision==0.14.1+cpu
           -f https://download.pytorch.org/whl/torch_stable.html
 
-      - name: Install PyTorch(1.10.1) and TorchVision(0.11.2) on MacOS
+      - name: Install PyTorch on MacOS
         if: matrix.operating-system == 'macos-latest'
-        run: pip install torch==1.10.1 torchvision==0.11.2
+        run: pip install torch==1.13.1 torchvision==0.14.1
 
-      - name: Install MMDetection(2.28.1) with MMCV(1.7.0)
+      - name: Install MMDetection(3.0.0) with MMCV(2.0.0)
         run: >
-          pip install mmcv-full==1.7.0 -f https://download.openmmlab.com/mmcv/dist/cpu/torch1.10.0/index.html
-          pip install mmdet==2.28.1
+          pip install mmengine==0.7.3
+          pip install mmcv==2.0.0 -f https://download.openmmlab.com/mmcv/dist/cpu/torch1.13.0/index.html
+          pip install mmdet==3.0.0
 
-      - name: Install YOLOv5(7.0.9)
+      - name: Install YOLOv5(7.0.13)
         run: >
-          pip install yolov5==7.0.9
+          pip install yolov5==7.0.13
 
       - name: Install DeepSparse
         run: >
@@ -79,21 +80,21 @@ jobs:
         run: >
           python -m pip install detectron2 -f https://dl.fbaipublicfiles.com/detectron2/wheels/cpu/torch1.10/index.html
 
-      - name: Install Transformers(4.25.1)
+      - name: Install Transformers(4.35.0)
         run: >
-          pip install transformers==4.25.1
+          pip install transformers==4.35.0
 
-      - name: Install pycocotools(2.0.6)
+      - name: Install pycocotools(2.0.7)
         run: >
-          pip install pycocotools==2.0.6
+          pip install pycocotools==2.0.7
 
-      - name: Install ultralytics
+      - name: Install ultralytics(8.0.207)
         run: >
-          pip install ultralytics==8.0.99
+          pip install ultralytics==8.0.207
 
-      - name: Install super-gradients
+      - name: Install super-gradients(3.3.1)
         run: >
-          pip install super-gradients==3.1.2
+          pip install super-gradients==3.3.1
 
       - name: Install latest SAHI package
         run: >

diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,4 @@
-opencv-python>=4.2.0.32
+opencv-python<=4.8
 shapely>=1.8.0
 tqdm>=4.48.2
 pillow>=8.2.0

diff --git a/setup.py b/setup.py
@@ -36,7 +36,7 @@ def get_version():
     python_requires=">=3.6",
     install_requires=get_requirements(),
     extras_require={
-        "tests": ["mmdet==2.28.1", "pycocotools==2.0.6"],
+        "tests": ["mmdet==3.0.0", "pycocotools==2.0.6"],
         "dev": [
             "black==22.3.0",
             "flake8==3.9.2",
@@ -51,10 +51,10 @@ def get_version():
         "Intended Audience :: Developers",
         "Intended Audience :: Science/Research",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
+        "Programming Language :: Python :: 3.11",
         "Topic :: Software Development :: Libraries",
         "Topic :: Software Development :: Libraries :: Python Modules",
     ],