add linux specific installs for opencv dependencies

leftfield-geospatial · May 16, 2024 · adc2e46 · adc2e46
1 parent b1c3995
commit adc2e46
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 16 deletions.
diff --git a/.github/workflows/install-test-conda-forge.yml b/.github/workflows/install-test-conda-forge.yml
@@ -33,6 +33,12 @@ jobs:
           conda install orthority>=0.4.0
           conda list
 
+      - name: Install OpenCV Linux dependencies
+        if: matrix.os == 'ubuntu-latest'
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y libegl1 libopengl0
+
       - name: Test CLI
         timeout-minutes: 5
         run: |

diff --git a/.github/workflows/run-unit-tests_conda-forge.yml b/.github/workflows/run-unit-tests_conda-forge.yml
@@ -32,22 +32,6 @@ jobs:
         activate-environment: orthority-test
         conda-solver: libmamba
 
-    - name: Install dependencies
-      # Note that conda-forge OpenCV 4.9 package has *GL dependencies that are not satisfied by
-      # GitHub's Ubuntu image, so 'opencv-python-headless' is installed with pip below.
-      run: |
-        conda info
-        conda install -c conda-forge rasterio click tqdm pyyaml fsspec requests aiohttp pytest pytest-cov
-        pip install opencv-python-headless
-        conda list
-
-    - name: Install OpenCV Linux dependencies
-      if: matrix.os == 'ubuntu-latest'
-      run: |
-      # Fix cv2 ImportError: 'libEGL.so.1: cannot open shared object file: No such file or directory'
-        sudo apt-get update
-        sudo apt-get install -y libegl1 libopengl0
-
     - name: Run unit tests
       run: |
         python -m pytest --cov=orthority --cov-report=term-missing --cov-report=xml:coverage.xml ./tests