From d3c99bcbae518fda3519adce7fde530a6ad6a6c1 Mon Sep 17 00:00:00 2001
From: Andreas Holm <60451789+holm10@users.noreply.github.com>
Date: Fri, 12 Jul 2024 15:46:24 -0700
Subject: [PATCH] Test updated Forthon verison

---
 .github/workflows/build-test-wheel.yml | 16 ++++++----------
 pyproject.toml                         |  8 ++++----
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/build-test-wheel.yml b/.github/workflows/build-test-wheel.yml
index c0740774..880dcbcf 100644
--- a/.github/workflows/build-test-wheel.yml
+++ b/.github/workflows/build-test-wheel.yml
@@ -21,7 +21,7 @@ jobs:
     - name: Install pip dependencies
       run: |
         python -m pip install --upgrade pip
-        python -m pip install forthon numpy==1.26.4 h5py
+        python -m pip install "forthon>=0.10.7" numpy h5py
         python -m pip install flake8
         python -m pip install pytest-isolate pytest-xdist
     - name: Build UEDGE
@@ -48,7 +48,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-13, macos-14] 
-        pyver: [cp38, cp39, cp310, cp311, cp312]
+        pyver: [cp37, cp38, cp39, cp310, cp311, cp312]
 
     steps:
       - name: Checks out repo
@@ -74,9 +74,8 @@ jobs:
         uses: pypa/cibuildwheel@v2.17.0
         env:
             CIBW_BUILD: ${{matrix.pyver}}-*
-            CIBW_SKIP: cp37-*
             CIBW_ARCHS_LINUX: auto
-            CIBW_BEFORE_BUILD: pip install numpy forthon 'build<0.10.0'
+            CIBW_BEFORE_BUILD: pip install numpy 'forthon>=0.10.7' 'build<0.10.0'
 
       - name: Upload Artifacts
         uses: actions/upload-artifact@v4
@@ -118,8 +117,7 @@ jobs:
         uses: pypa/cibuildwheel@v2.17.0
         env:
             CIBW_BUILD: pp*
-            CIBW_SKIP: cp37-*
-            CIBW_BEFORE_BUILD: pip install numpy forthon 'build<0.10.0'
+            CIBW_BEFORE_BUILD: pip install numpy 'forthon>=0.10.7' 'build<0.10.0'
 
       - name: Upload Artifacts
         uses: actions/upload-artifact@v4
@@ -151,9 +149,8 @@ jobs:
         uses: pypa/cibuildwheel@v2.17.0
         env:
             CIBW_BUILD: ${{matrix.pyver}}-*
-            CIBW_SKIP: cp37-*
             CIBW_ARCHS: ${{matrix.arch}}
-            CIBW_BEFORE_BUILD: pip install numpy forthon 'build<0.10.0'
+            CIBW_BEFORE_BUILD: pip install numpy 'forthon>=0.10.7' 'build<0.10.0'
 
       - name: Upload Artifacts
         uses: actions/upload-artifact@v4
@@ -181,8 +178,7 @@ jobs:
         uses: pypa/cibuildwheel@v2.17.0
         env:
             CIBW_BUILD: pp*
-            CIBW_SKIP: cp37-*
-            CIBW_BEFORE_BUILD: pip install numpy forthon 'build<0.10.0'
+            CIBW_BEFORE_BUILD: pip install numpy 'forthon>=0.10.7' 'build<0.10.0'
 
       - name: Upload Artifacts
         uses: actions/upload-artifact@v4
diff --git a/pyproject.toml b/pyproject.toml
index e59a4fc7..fc8edf5b 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,8 +1,8 @@
 [build-system]
 requires = [
         "setuptools >= 61.0", 
-        "forthon", 
-        "numpy<2; python_version>='3.9'"
+        "forthon>=0.10.7", 
+        "numpy"
     ]
 build-backend = "setuptools.build_meta"
 
@@ -12,8 +12,8 @@ dynamic = ["version"]
 #version = "8.1.0-beta.0"
 name = "uedge"
 dependencies = [
-    "forthon",
-    "numpy<2; python_version>='3.9'",
+    "forthon>=0.10.7",
+    "numpy"
 ]
 requires-python = ">= 3.8" # TODO: verify
 authors = [