Skip to content

Commit b0ac666

Browse files
authored
Compatibility with pandas 2.0.0 (#1672)
* cast to datetime64[s] in ecmwf test * fix for older pandas
1 parent 4c24be0 commit b0ac666

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

pvlib/tests/iotools/test_ecmwf_macc.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@
55
import os
66
import datetime
77
import numpy as np
8+
import pandas as pd
89
import pytest
9-
from ..conftest import requires_netCDF4, DATA_DIR
10+
from ..conftest import requires_netCDF4, DATA_DIR, assert_index_equal
1011
from pvlib.iotools import ecmwf_macc
1112

1213
TESTDATA = 'aod550_tcwv_20121101_test.nc'
@@ -54,10 +55,9 @@ def test_read_ecmwf_macc(expected_test_data):
5455
"""Test reading ECMWF_MACC data from netCDF4 file."""
5556
data = ecmwf_macc.read_ecmwf_macc(
5657
expected_test_data, 38, -122)
57-
expected_times = [
58-
1351738800, 1351749600, 1351760400, 1351771200, 1351782000, 1351792800,
59-
1351803600, 1351814400]
60-
assert np.allclose(data.index.view(np.int64) // 1000000000, expected_times)
58+
expected_times = pd.date_range('2012-11-01 03:00', '2012-11-02 00:00',
59+
freq='3h').astype("datetime64[ns]")
60+
assert_index_equal(data.index.astype("datetime64[ns]"), expected_times)
6161
expected_aod = np.array([
6262
0.39531226, 0.22371339, 0.18373083, 0.15010143, 0.130809, 0.11172834,
6363
0.09741255, 0.0921606])

0 commit comments

Comments
 (0)