4
4
5
5
import os
6
6
from pvlib .iotools import psm3
7
- from conftest import needs_pandas_0_22 , DATA_DIR
7
+ from conftest import DATA_DIR
8
8
import numpy as np
9
9
import pandas as pd
10
10
import pytest
@@ -70,7 +70,6 @@ def assert_psm3_equal(header, data, expected):
70
70
assert (data .index .tzinfo .zone == 'Etc/GMT%+d' % - header ['Time Zone' ])
71
71
72
72
73
- @needs_pandas_0_22
74
73
@pytest .mark .flaky (reruns = 5 , reruns_delay = 2 )
75
74
def test_get_psm3_tmy (nrel_api_key ):
76
75
"""test get_psm3 with a TMY"""
@@ -80,7 +79,6 @@ def test_get_psm3_tmy(nrel_api_key):
80
79
assert_psm3_equal (header , data , expected )
81
80
82
81
83
- @needs_pandas_0_22
84
82
@pytest .mark .flaky (reruns = 5 , reruns_delay = 2 )
85
83
def test_get_psm3_singleyear (nrel_api_key ):
86
84
"""test get_psm3 with a single year"""
@@ -90,7 +88,6 @@ def test_get_psm3_singleyear(nrel_api_key):
90
88
assert_psm3_equal (header , data , expected )
91
89
92
90
93
- @needs_pandas_0_22
94
91
@pytest .mark .flaky (reruns = 5 , reruns_delay = 2 )
95
92
def test_get_psm3_check_leap_day (nrel_api_key ):
96
93
_ , data_2012 = psm3 .get_psm3 (LATITUDE , LONGITUDE , nrel_api_key ,
@@ -105,7 +102,6 @@ def test_get_psm3_check_leap_day(nrel_api_key):
105
102
(LATITUDE , LONGITUDE , nrel_api_key , 'bad' , 60 ),
106
103
(LATITUDE , LONGITUDE , nrel_api_key , '2017' , 15 ),
107
104
])
108
- @needs_pandas_0_22
109
105
@pytest .mark .flaky (reruns = 5 , reruns_delay = 2 )
110
106
def test_get_psm3_tmy_errors (
111
107
latitude , longitude , api_key , names , interval
@@ -134,15 +130,13 @@ def io_input(request):
134
130
return obj
135
131
136
132
137
- @needs_pandas_0_22
138
133
def test_parse_psm3 (io_input ):
139
134
"""test parse_psm3"""
140
135
header , data = psm3 .parse_psm3 (io_input )
141
136
expected = pd .read_csv (YEAR_TEST_DATA )
142
137
assert_psm3_equal (header , data , expected )
143
138
144
139
145
- @needs_pandas_0_22
146
140
def test_read_psm3 ():
147
141
"""test read_psm3"""
148
142
header , data = psm3 .read_psm3 (MANUAL_TEST_DATA )
0 commit comments