Merge branch 'develop' into prepare_release_0.5.3

ICB-DCM · Jul 30, 2024 · 6cce7f3 · 6cce7f3
2 parents ddbb319 + cda1cca
commit 6cce7f3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/setup.cfg b/setup.cfg
@@ -47,7 +47,7 @@ keywords =
 
 [options]
 install_requires =
-    numpy >= 1.19.1, != 1.24.0, < 2.0
+    numpy >= 1.19.1, != 1.24.0
     scipy >= 1.5.2
     pandas >= 1.5.0
     cloudpickle >= 1.5.0

diff --git a/tox.ini b/tox.ini
@@ -64,6 +64,8 @@ description =
 
 [testenv:windows]
 extras = test
+deps =
+    numpy < 2.0
 commands =
     pytest \
         test/base/test_prior.py \
@@ -98,6 +100,8 @@ description =
 
 [testenv:optimize]
 extras = test,dlib,ipopt,pyswarm,cma,nlopt,fides,mpi,pyswarms,petab
+deps =
+    numpy < 2.0
 commands =
     pytest --cov=pypesto --cov-report=xml --cov-append \
         test/optimize