CI: Try scipy 1.13.x

modelon-community · Jun 17, 2024 · 2bf0ad9 · 2bf0ad9
1 parent 1c59b59
commit 2bf0ad9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -15,7 +15,7 @@ jobs:
         python-version: '3.9.x'
     - name: Setup Python
       run: |
-        python3 -m pip install Cython numpy scipy==1.12.0 matplotlib nose-py3 setuptools==69.1.0
+        python3 -m pip install Cython "numpy<2" scipy matplotlib nose-py3 setuptools==69.1.0
     - name: Install system
       run: |
         sudo apt-get -y install cmake liblapack-dev libsuitesparse-dev libhypre-dev
@@ -40,9 +40,10 @@ jobs:
         sudo make install
     - name: Install assimulo
       run: |
-        git clone --depth 1 -b Assimulo-3.5.0 https://github.com/modelon-community/Assimulo /tmp/Assimulo
+        git clone --depth 1 -b Assimulo-3.5.1 https://github.com/modelon-community/Assimulo /tmp/Assimulo
         cd /tmp/Assimulo
-        python3 setup.py install --user --sundials-home=/usr --blas-home=/usr/lib/x86_64-linux-gnu/ --lapack-home=/usr/lib/x86_64-linux-gnu/ --superlu-home=/usr --extra-fortran-compile-flags="-fallow-argument-mismatch"
+        rm setup.cfg
+        python3 setup.py install --user --sundials-home=/usr --blas-home=/usr/lib/x86_64-linux-gnu/ --lapack-home=/usr/lib/x86_64-linux-gnu/ --superlu-home=/usr
     - name: Install fmilib
       run: |
         cd /tmp

diff --git a/setup.cfg b/setup.cfg
@@ -8,7 +8,7 @@ python_requires = >=3.9
 
 install_requires =
     numpy >= 1.19.5
-    scipy >= 1.10.1, < 1.13
+    scipy >= 1.10.1
     cython >= 3.0.7
     nose-py3 >= 1.6.3
     matplotlib > 3