From fd02481e368511a35c3e279c6b610611ea6e58cd Mon Sep 17 00:00:00 2001 From: Kevin Anderson Date: Tue, 21 Feb 2023 09:54:14 -0500 Subject: [PATCH 1/2] cast to datetime64[s] in ecmwf test --- pvlib/tests/iotools/test_ecmwf_macc.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pvlib/tests/iotools/test_ecmwf_macc.py b/pvlib/tests/iotools/test_ecmwf_macc.py index b3387817ef..79a36cac48 100644 --- a/pvlib/tests/iotools/test_ecmwf_macc.py +++ b/pvlib/tests/iotools/test_ecmwf_macc.py @@ -57,7 +57,8 @@ def test_read_ecmwf_macc(expected_test_data): expected_times = [ 1351738800, 1351749600, 1351760400, 1351771200, 1351782000, 1351792800, 1351803600, 1351814400] - assert np.allclose(data.index.view(np.int64) // 1000000000, expected_times) + assert np.allclose(data.index.astype("datetime64[s]").view(np.int64), + expected_times) expected_aod = np.array([ 0.39531226, 0.22371339, 0.18373083, 0.15010143, 0.130809, 0.11172834, 0.09741255, 0.0921606]) From 2ab78fb32ecf2a79d3502fd5e9514e8f7acde297 Mon Sep 17 00:00:00 2001 From: Kevin Anderson Date: Tue, 4 Apr 2023 09:25:47 -0400 Subject: [PATCH 2/2] fix for older pandas --- pvlib/tests/iotools/test_ecmwf_macc.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pvlib/tests/iotools/test_ecmwf_macc.py b/pvlib/tests/iotools/test_ecmwf_macc.py index 79a36cac48..bec3d0aafd 100644 --- a/pvlib/tests/iotools/test_ecmwf_macc.py +++ b/pvlib/tests/iotools/test_ecmwf_macc.py @@ -5,8 +5,9 @@ import os import datetime import numpy as np +import pandas as pd import pytest -from ..conftest import requires_netCDF4, DATA_DIR +from ..conftest import requires_netCDF4, DATA_DIR, assert_index_equal from pvlib.iotools import ecmwf_macc TESTDATA = 'aod550_tcwv_20121101_test.nc' @@ -54,11 +55,9 @@ def test_read_ecmwf_macc(expected_test_data): """Test reading ECMWF_MACC data from netCDF4 file.""" data = ecmwf_macc.read_ecmwf_macc( expected_test_data, 38, -122) - expected_times = [ - 1351738800, 1351749600, 1351760400, 1351771200, 1351782000, 1351792800, - 1351803600, 1351814400] - assert np.allclose(data.index.astype("datetime64[s]").view(np.int64), - expected_times) + expected_times = pd.date_range('2012-11-01 03:00', '2012-11-02 00:00', + freq='3h').astype("datetime64[ns]") + assert_index_equal(data.index.astype("datetime64[ns]"), expected_times) expected_aod = np.array([ 0.39531226, 0.22371339, 0.18373083, 0.15010143, 0.130809, 0.11172834, 0.09741255, 0.0921606])