CI&CD: pin opencv version

bigcat88 · Feb 23, 2023 · 78a42f8 · 78a42f8
1 parent 0bac138
commit 78a42f8
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 24 deletions.
diff --git a/.github/workflows/analysis-coverage.yml b/.github/workflows/analysis-coverage.yml
@@ -95,8 +95,7 @@ jobs:
         run: |
           brew uninstall --force --ignore-dependencies imagemagick libheif
           brew install --formula ./libheif/macos/libheif.rb
-          python3 -m pip install opencv-python coverage
-          python3 -m pip -v install ".[tests]"
+          python3 -m pip -v install ".[dev]"
 
       - name: LibHeif info
         run: python3 -c "import pillow_heif; print(pillow_heif.libheif_info())"
@@ -156,8 +155,8 @@ jobs:
 
       - name: Install from source
         run: |
-          python -m pip install opencv-python coverage pillow==8.4.0
-          python -m pip -v install ".[tests]"
+          python -m pip install pillow==8.4.0
+          python -m pip -v install ".[dev]"
 
       - name: LibHeif info
         run: python -c "import pillow_heif; print(pillow_heif.libheif_info())"

diff --git a/.github/workflows/test-wheels-pi_heif.yml b/.github/workflows/test-wheels-pi_heif.yml
@@ -25,7 +25,6 @@ jobs:
           { "os": "debian", "ver": "11", "arch": "arm/v7" },
           { "os": "alpine", "ver": "3.15", "arch": "amd64" },
           { "os": "alpine", "ver": "3.15", "arch": "arm64" },
-          { "os": "alpine", "ver": "3.15", "arch": "arm/v7" },
           { "os": "alpine", "ver": "3.16", "arch": "amd64" },
           { "os": "alpine", "ver": "3.16", "arch": "arm64" },
           { "os": "alpine", "ver": "3.16", "arch": "arm/v7" },
@@ -95,7 +94,7 @@ jobs:
 
       - name: Preparations
         run: |
-          python3 -m pip install pytest pillow numpy pympler defusedxml opencv-python
+          python3 -m pip install pytest pillow numpy pympler defusedxml
           python3 -m pip install --only-binary=:all: pi-heif
 
       - name: Test wheel
@@ -127,10 +126,6 @@ jobs:
           python3 -m pip install pytest pillow numpy pympler defusedxml
           python3 -m pip install --only-binary=:all: pi-heif
 
-      - name: Install OpenCV for CPython
-        if: startsWith(matrix.python-version, '3.')
-        run: python3 -m pip install opencv-python
-
       - name: Test wheel
         run: |
           export TEST_DECODE_THREADS=0
@@ -162,10 +157,6 @@ jobs:
           python3 -m pip install pytest pillow numpy pympler defusedxml
           python3 -m pip install --only-binary=:all: pi-heif
 
-      - name: Install OpenCV for CPython
-        if: startsWith(matrix.python-version, '3.')
-        run: python3 -m pip install opencv-python
-
       - name: Test wheel
         run: |
           python3 .github/transform_to-pi_heif.py

diff --git a/.github/workflows/test-wheels.yml b/.github/workflows/test-wheels.yml
@@ -97,7 +97,7 @@ jobs:
 
       - name: Preparations
         run: |
-          python3 -m pip install pytest pillow numpy pympler defusedxml opencv-python
+          python3 -m pip install pytest pillow numpy pympler defusedxml
           python3 -m pip install --only-binary=:all: pillow_heif
 
       - name: Test wheel
@@ -127,10 +127,6 @@ jobs:
           python3 -m pip install pytest pillow numpy pympler defusedxml
           python3 -m pip install --only-binary=:all: pillow_heif
 
-      - name: Install OpenCV for CPython
-        if: startsWith(matrix.python-version, '3.')
-        run: python3 -m pip install opencv-python
-
       - name: Test wheel
         run: |
           export TEST_DECODE_THREADS=0
@@ -161,10 +157,6 @@ jobs:
           python3 -m pip install pytest pillow numpy pympler defusedxml
           python3 -m pip install --only-binary=:all: pillow_heif
 
-      - name: Install OpenCV for CPython
-        if: startsWith(matrix.python-version, '3.')
-        run: python3 -m pip install opencv-python
-
       - name: Test wheel
         run: |
           export PH_FULL_ACTION=1

diff --git a/setup.cfg b/setup.cfg
@@ -60,7 +60,7 @@ dev =
     packaging
     numpy
     pympler
-    opencv-python
+    opencv-python==4.7.0.68
     pre-commit
     pylint
     coverage