Merge pull request hotosm#164 from hotosm/master

Upstream Branch
jeafreezy · Sep 24, 2023 · 5d8b724 · 5d8b724
2 parents c43b809 + c72ca40
commit 5d8b724
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/.github/workflows/backend_build.yml b/.github/workflows/backend_build.yml
@@ -3,6 +3,7 @@ on:
   push:
     branches:
       - master
+      - fix/build
   pull_request:
     branches:
       - master
@@ -104,11 +105,17 @@ jobs:
           pip install numpy
           pip install GDAL==$(gdal-config --version) --global-option=build_ext --global-option="-I/usr/include/gdal"
 
+      - name : Check Opencv version
+        run: |
+          pip freeze | grep opencv
+          pip install opencv-python-headless==4.7.0.68
+
       - name: Run tests
         env:
           TESTING_TOKEN: ${{ secrets.TESTING_TOKEN }}
         run: |
           cd backend/
+          
 
           export TESTING_TOKEN=$TESTING_TOKEN
           python manage.py makemigrations

diff --git a/backend/docker/ramp/docker-requirements.txt b/backend/docker/ramp/docker-requirements.txt
@@ -40,7 +40,8 @@ munch==2.5.0
 munkres==1.1.4
 networkx
 numpy
-opencv-python==4.5.5.64
+opencv-python<=4.5.5.64
+opencv-python-headless<=4.7.0.68
 packaging==21.3
 pandas
 partd==1.2.0