From 240dd96ee7e6024a95f7fbb1e39c01fe2e2dd624 Mon Sep 17 00:00:00 2001 From: Johannes Mueller Date: Thu, 20 Feb 2025 15:21:55 +0100 Subject: [PATCH 1/2] Uplift scipy version restriction and restrict tsfresh>=0.21.0 Fix #155, follow blue-yonder/tsfresh#1097 Signed-off-by: Johannes Mueller --- setup.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.cfg b/setup.cfg index 3829a2f0..e4f96311 100644 --- a/setup.cfg +++ b/setup.cfg @@ -48,7 +48,7 @@ python_requires = >=3.9 # For more information, check out https://semver.org/. install_requires = numpy>=1.23.5 - scipy<1.15.0 + scipy pandas>=2.2 h5py!=3.7.0 @@ -98,7 +98,7 @@ analysis = pep8-naming tsfresh = - tsfresh + tsfresh>=0.21.0 numba>=0.60 all = %(tsfresh)s From 0bd41770738b7ed6732068d99ace4814753cefb6 Mon Sep 17 00:00:00 2001 From: Johannes Mueller Date: Fri, 21 Feb 2025 08:29:08 +0100 Subject: [PATCH 2/2] Adjust test case of failing beta calculation scipy>=1.15 Obviously the optimization behavior in scipy>=1.15 changed slightly Signed-off-by: Johannes Mueller --- tests/strength/test_parameter_calculations.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/strength/test_parameter_calculations.py b/tests/strength/test_parameter_calculations.py index c3273463..206af97b 100644 --- a/tests/strength/test_parameter_calculations.py +++ b/tests/strength/test_parameter_calculations.py @@ -39,7 +39,7 @@ def test_compute_beta_success(P_A, expected_beta): assert np.isclose(beta, expected_beta) -@pytest.mark.parametrize("P_A", [-1,0,1,2]) +@pytest.mark.parametrize("P_A", [-1.0, 0.0, 1.01, 2.0]) def test_compute_beta_fails(P_A): expected_error_message = f"Could not compute the value of beta for P_A={P_A}, " \