From cda1ccaedf6d91456ff8df20f6a6f0e46708a2c3 Mon Sep 17 00:00:00 2001 From: Paul Jonas Jost <70631928+PaulJonasJost@users.noreply.github.com> Date: Tue, 30 Jul 2024 09:57:11 +0200 Subject: [PATCH] Handle numpy 2.0 with older packages (#1433) * Remove <2.0 in hopes of all problems being resolved. *fingers crossed* * Only require in test numpy < 2.0 --- setup.cfg | 2 +- tox.ini | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 2bd27b133..f0f618828 100644 --- 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 index 4d4d5225e..94479aced 100644 --- 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