@@ -236,18 +236,20 @@ def expected_meteonorm_tmy_meta():
236
236
'surface_azimuth' : 90 ,
237
237
'surface_tilt' : 20 ,
238
238
'time_zone' : 1 ,
239
- 'latitude ' : 50 ,
240
- 'longitude ' : 10 ,
239
+ 'lat ' : 50 ,
240
+ 'lon ' : 10 ,
241
241
}
242
242
return meta
243
243
244
244
245
245
@pytest .fixture
246
- def expected_meteonorm_tmy_index ():
246
+ def expected_meteonorm_tmy_interval_index ():
247
247
index = pd .date_range (
248
248
'2005-01-01' , periods = 8760 , freq = '1h' , tz = 3600 )
249
249
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
251
253
252
254
253
255
@pytest .fixture
@@ -271,15 +273,17 @@ def expected_metenorm_tmy_data():
271
273
index = pd .date_range (
272
274
'2005-01-01' , periods = 12 , freq = '1h' , tz = 3600 )
273
275
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 )
275
279
return expected
276
280
277
281
278
282
@pytest .mark .remote_data
279
283
@pytest .mark .flaky (reruns = RERUNS , reruns_delay = RERUNS_DELAY )
280
284
def test_get_meteonorm_tmy (
281
285
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 ):
283
287
data , meta = pvlib .iotools .get_meteonorm_tmy (
284
288
latitude = 50 , longitude = 10 ,
285
289
api_key = demo_api_key ,
@@ -301,4 +305,5 @@ def test_get_meteonorm_tmy(
301
305
url = demo_url )
302
306
assert meta == expected_meteonorm_tmy_meta
303
307
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