Merge pull request #154 from joezuntz/numpy2

Allow numpy version 2
joezuntz · Nov 29, 2024 · 102cf35 · 102cf35
2 parents 6cc9374 + 98df4f9
commit 102cf35
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -84,13 +84,18 @@ jobs:
     - name: Install python dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install -v .
+        if [[ "${{ matrix.os }}" == "macos-13" || "${{ matrix.python-version }}" == '3.7' || "${{ matrix.python-version}}" == '3.8' ]]; then
+          pip install "numpy<2"
+        else
+          pip install "numpy>=2"
+        fi
+        pip install -vv .
         pip install --no-binary=mpi4py mpi4py astropy pytest pytest-cov getdist
 
     - name: Install PocoMC
       if: matrix.python-version != '3.7'
       run: |
-        pip install pocomc==1.2.2
+        pip install pocomc==1.2.6
 
     - name: Test nautilus alone
       if: (matrix.python-version == '3.12' || matrix.python-version == '3.11' || matrix.python-version =='3.10') && (matrix.os == 'macos-13')

diff --git a/requirements.txt b/requirements.txt
@@ -1,7 +1,7 @@
 pyyaml
 future
 emcee
-numpy < 2
+numpy
 scipy
 matplotlib
 pybind11

diff --git a/setup.py b/setup.py
@@ -182,7 +182,7 @@ def run(self):
 requirements = [
     "pyyaml",
     "emcee",
-    "numpy<2",
+    "numpy",
     "scipy",
     "matplotlib",
     "pybind11",