From f35ff9609731aec1de431e41b2584eba09d79334 Mon Sep 17 00:00:00 2001 From: Wolfgang Preimesberger Date: Wed, 13 Nov 2024 14:50:37 +0100 Subject: [PATCH] Rebuild with numpy 2.0.2 --- setup.cfg | 4 ++-- tests/test_validation_framework/__init__.py | 1 - tests/test_validation_framework/test_metric_calculators.py | 3 ++- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/setup.cfg b/setup.cfg index 1eb76520..0c47e903 100644 --- a/setup.cfg +++ b/setup.cfg @@ -32,9 +32,9 @@ package_dir = install_requires = importlib-metadata; python_version<"3.8" numpy>=2.0 + numba scipy>=0.12 pandas>=0.23.0 - matplotlib>=1.2.0 netCDF4>=1.0.1,!=1.6.2 pygeogrids pygeobase>=0.6.0 @@ -44,7 +44,6 @@ install_requires = repurpose>=0.13.1 cadati>=0.0.2 Cython>=0.29.21 - numba scikit-learn # The usage of test_requires is discouraged, see `Dependency Management` docs # tests_require = pytest; pytest-cov @@ -69,6 +68,7 @@ testing = sphinx_rtd_theme ascat>=2.0 ismn==1.3.4 + matplotlib pytest pytest-cov pytest-mpl diff --git a/tests/test_validation_framework/__init__.py b/tests/test_validation_framework/__init__.py index 40a96afc..e69de29b 100644 --- a/tests/test_validation_framework/__init__.py +++ b/tests/test_validation_framework/__init__.py @@ -1 +0,0 @@ -# -*- coding: utf-8 -*- diff --git a/tests/test_validation_framework/test_metric_calculators.py b/tests/test_validation_framework/test_metric_calculators.py index f0c1ff4b..f2bc3490 100644 --- a/tests/test_validation_framework/test_metric_calculators.py +++ b/tests/test_validation_framework/test_metric_calculators.py @@ -797,8 +797,9 @@ def make_testdata_random(): return make_datasets(df), expected + @pytest.mark.parametrize( - "testdata_generator", [testdata_known_results, testdata_random] + "testdata_generator", [make_testdata_known_results, make_testdata_random] ) @pytest.mark.parametrize("metrics_adapter", [MonthsMetricsAdapter]) # todo def test_PairwiseIntercomparisonMetrics_adapted(testdata_generator,