From 9dfc0a2f5ceb97670919b2b27974bb9856b606f3 Mon Sep 17 00:00:00 2001
From: rejbasket <39080670+rejbasket@users.noreply.github.com>
Date: Sun, 2 Oct 2022 14:45:57 +0200
Subject: Rejbasket/scipy fix (#1842)

* updates to workflow and requirements

* Update requirements.txt

removed pip flags causing build to fail

Co-authored-by: rejbasket <rejbasket@users.noreply.github.com>
---
 .github/workflows/build.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to '.github/workflows')

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b9663c4b..778bd3aa 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -26,9 +26,9 @@ jobs:
         id: pip-cache
         with:
           path: ~/.cache/pip
-          key: ${{ runner.os }}-18.04-pip-${{ hashFiles('**/requirements.txt') }}
+          key: ${{ runner.os }}-20.04-pip-${{ hashFiles('**/requirements.txt') }}
           restore-keys: |
-            ${{ runner.os }}-18.04-pip-
+            ${{ runner.os }}-20.04-pip-
 
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
@@ -52,13 +52,13 @@ jobs:
           sudo apt-get install gettext
 
           # for wxPython
-          sudo apt install glib-networking libsdl1.2-dev
+          sudo apt install glib-networking libsdl1.2-dev libsdl2-2.0-0
 
           # for PyGObject
           sudo apt install libgirepository1.0-dev libcairo2-dev
 
           # for shapely
-          sudo apt install libgeos-dev build-essential libgtk-3-dev
+          sudo apt install build-essential libgtk-3-dev
 
           uname -a
           python --version
@@ -78,7 +78,7 @@ jobs:
           # scipy gives us a ELF error when stripped
           sudo apt-get install gcc g++ gfortran python3-dev libopenblas-dev liblapack-dev
           python -m pip uninstall --yes scipy
-          python -m pip install scipy --no-binary scipy
+          python -m pip install scipy==1.9.0 --no-binary scipy
 
           echo "${{ env.pythonLocation }}\bin" >> $GITHUB_PATH
       - shell: bash
-- 
cgit v1.3.1