From 4cd502422b5b0d63637bcb79948d35dfa4e87b19 Mon Sep 17 00:00:00 2001 From: Kevin Anderson Date: Wed, 26 Jan 2022 19:06:51 -0500 Subject: [PATCH 1/3] fix #126 --- pvanalytics/features/clearsky.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pvanalytics/features/clearsky.py b/pvanalytics/features/clearsky.py index e1fc5b0f..2554ad88 100644 --- a/pvanalytics/features/clearsky.py +++ b/pvanalytics/features/clearsky.py @@ -62,7 +62,7 @@ def reno(ghi, ghi_clearsky): """ delta = ghi.index.to_series().diff() - delta_minutes = delta[1] / np.timedelta64(1, '60s') + delta_minutes = delta[1].total_seconds() / 60 if delta_minutes > 15: raise ValueError('clearsky requires regular time intervals ' 'of 15m or less') From 09e93a0af2313b71a1a7ceb1dc4bef085f6b40bc Mon Sep 17 00:00:00 2001 From: Kevin Anderson Date: Wed, 26 Jan 2022 19:07:08 -0500 Subject: [PATCH 2/3] fix #105 --- pvanalytics/tests/features/test_clearsky.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pvanalytics/tests/features/test_clearsky.py b/pvanalytics/tests/features/test_clearsky.py index 3e752772..e34a0670 100644 --- a/pvanalytics/tests/features/test_clearsky.py +++ b/pvanalytics/tests/features/test_clearsky.py @@ -1,10 +1,14 @@ """Tests for feature labeling functions.""" import pytest import pandas as pd +import pvlib from pvanalytics.features import clearsky +from pkg_resources import parse_version +is_old_pvlib = parse_version(pvlib.__version__) < parse_version("0.9.0") -@pytest.mark.skip(reason="GH #105") + +@pytest.mark.skipif(is_old_pvlib, reason="GH #105") @pytest.mark.filterwarnings("ignore:Support for multi-dimensional indexing") def test_reno_identical(quadratic): """Identical clearsky and measured irradiance all True""" @@ -14,7 +18,7 @@ def test_reno_identical(quadratic): assert clearsky.reno(quadratic, quadratic).all() -@pytest.mark.skip(reason="GH #105") +@pytest.mark.skipif(is_old_pvlib, reason="GH #105") @pytest.mark.filterwarnings("ignore:Support for multi-dimensional indexing") @pytest.mark.filterwarnings("ignore:invalid value encountered in") def test_reno_begining_end(quadratic): From 51d1623868b007e5bbff2bb17957765f0eea0287 Mon Sep 17 00:00:00 2001 From: Kevin Anderson Date: Wed, 26 Jan 2022 19:21:29 -0500 Subject: [PATCH 3/3] whatsnew --- docs/whatsnew/0.1.1.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/whatsnew/0.1.1.rst b/docs/whatsnew/0.1.1.rst index adfb37a7..cf57d3e5 100644 --- a/docs/whatsnew/0.1.1.rst +++ b/docs/whatsnew/0.1.1.rst @@ -24,6 +24,8 @@ Bug Fixes * Prohibit pandas versions in the 1.1.x series to avoid an issue in ``.groupby().rolling()``. Newer versions starting in 1.2.0 and older versions going back to 0.24.0 are still allowed. (:issue:`82`, :pull:`118`) +* Fixed an issue with :py:func:`pvanalytics.features.clearsky.reno` in recent + pandas versions (:issue:`125`, :pull:`128`) Contributors ~~~~~~~~~~~~