Skip to content

Commit ba00423

Browse files
committed
Fix tests
1 parent ea48630 commit ba00423

File tree

2 files changed

+13
-8
lines changed

2 files changed

+13
-8
lines changed

pvlib/iotools/meteonorm.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ def _parse_meteonorm(response, interval_index, map_variables):
325325
data.index = pd.IntervalIndex.from_arrays(
326326
left=pd.to_datetime(response.json()['start_times']),
327327
right=pd.to_datetime(response.json()['end_times']),
328-
closed='both',
328+
closed='left',
329329
)
330330
else:
331331
data.index = pd.to_datetime(response.json()['start_times'])

tests/iotools/test_meteonorm.py

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -236,18 +236,20 @@ def expected_meteonorm_tmy_meta():
236236
'surface_azimuth': 90,
237237
'surface_tilt': 20,
238238
'time_zone': 1,
239-
'latitude': 50,
240-
'longitude': 10,
239+
'lat': 50,
240+
'lon': 10,
241241
}
242242
return meta
243243

244244

245245
@pytest.fixture
246-
def expected_meteonorm_tmy_index():
246+
def expected_meteonorm_tmy_interval_index():
247247
index = pd.date_range(
248248
'2005-01-01', periods=8760, freq='1h', tz=3600)
249249
index.freq = None
250-
return index
250+
interval_index = pd.IntervalIndex.from_arrays(
251+
index, index + pd.Timedelta(hours=1), closed='left')
252+
return interval_index
251253

252254

253255
@pytest.fixture
@@ -271,15 +273,17 @@ def expected_metenorm_tmy_data():
271273
index = pd.date_range(
272274
'2005-01-01', periods=12, freq='1h', tz=3600)
273275
index.freq = None
274-
expected = pd.DataFrame(expected, index=index, columns=columns)
276+
interval_index = pd.IntervalIndex.from_arrays(
277+
index, index + pd.Timedelta(hours=1), closed='left')
278+
expected = pd.DataFrame(expected, index=interval_index, columns=columns)
275279
return expected
276280

277281

278282
@pytest.mark.remote_data
279283
@pytest.mark.flaky(reruns=RERUNS, reruns_delay=RERUNS_DELAY)
280284
def test_get_meteonorm_tmy(
281285
demo_api_key, demo_url, expected_meteonorm_tmy_meta,
282-
expected_metenorm_tmy_data, expected_meteonorm_tmy_index):
286+
expected_metenorm_tmy_data, expected_meteonorm_tmy_interval_index):
283287
data, meta = pvlib.iotools.get_meteonorm_tmy(
284288
latitude=50, longitude=10,
285289
api_key=demo_api_key,
@@ -301,4 +305,5 @@ def test_get_meteonorm_tmy(
301305
url=demo_url)
302306
assert meta == expected_meteonorm_tmy_meta
303307
pd.testing.assert_frame_equal(data.iloc[:12], expected_metenorm_tmy_data)
304-
pd.testing.assert_index_equal(data.index, expected_meteonorm_tmy_index)
308+
pd.testing.assert_index_equal(
309+
data.index, expected_meteonorm_tmy_interval_index)

0 commit comments

Comments
 (0)