Skip to content

Commit aed4ead

Browse files
wholmgrenwholmgren
committed
allow py3 conda failures. pep8
1 parent 1d610ff commit aed4ead

File tree

1 file changed

+27
-20
lines changed

1 file changed

+27
-20
lines changed

‎pvlib/test/test_modelchain.py

Lines changed: 27 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,10 @@
66
from pvlib.pvsystem import PVSystem
77
from pvlib.location import Location
88

9-
from pandas.util.testing import assert_series_equal, assert_frame_equal
10-
from nose.tools import with_setup, raises
9+
from pandas.util.testing import assert_series_equal
10+
from nose.tools import raises
11+
12+
from . import incompatible_conda_linux_py3
1113

1214
# should store this test data locally, but for now...
1315
sam_data = {}
@@ -91,7 +93,7 @@ def singlediode_setup():
9193
def test_ModelChain_creation():
9294
system = PVSystem()
9395
location = Location(32.2, -111, altitude=700)
94-
mc = ModelChain(system, location)
96+
ModelChain(system, location)
9597

9698

9799
def test_orientation_strategy():
@@ -111,7 +113,7 @@ def run_orientation_strategy(strategy, expected):
111113

112114
# the || accounts for the coercion of 'None' to None
113115
assert (mc.orientation_strategy == strategy or
114-
mc.orientation_strategy == None)
116+
mc.orientation_strategy is None)
115117
assert system.surface_tilt == expected[0]
116118
assert system.surface_azimuth == expected[1]
117119

@@ -124,11 +126,12 @@ def test_run_model_ModelChain():
124126
mc.run_model()
125127

126128

129+
@incompatible_conda_linux_py3
127130
def test_run_model():
128131
times = pd.date_range('20160101 1200-0700', periods=2, freq='6H')
129132
expected = {}
130133
expected[SAPM] = \
131-
pd.Series(np.array([ 1.82033564e+02, -2.00000000e-02]), index=times)
134+
pd.Series(np.array([1.82033564e+02, -2.00000000e-02]), index=times)
132135
expected[SingleDiode] = \
133136
pd.Series(np.array([179.720353871, np.nan]), index=times)
134137

@@ -140,13 +143,14 @@ def run_test(mc):
140143
yield run_test, mc
141144

142145

146+
@incompatible_conda_linux_py3
143147
def test_run_model_with_irradiance():
144148
times = pd.date_range('20160101 1200-0700', periods=2, freq='6H')
145149
irradiance = pd.DataFrame(
146150
{'dni': [900, 0], 'ghi': [600, 50], 'dhi': [150, 50]}, index=times)
147151
expected = {}
148152
expected[SAPM] = \
149-
pd.Series(np.array([ 1.90054749e+02, -2.00000000e-02]), index=times)
153+
pd.Series(np.array([1.90054749e+02, -2.00000000e-02]), index=times)
150154
expected[SingleDiode] = \
151155
pd.Series(np.array([186.979595403, 7.89417460232]), index=times)
152156

@@ -158,12 +162,13 @@ def run_test(mc):
158162
yield run_test, mc
159163

160164

165+
@incompatible_conda_linux_py3
161166
def test_run_model_with_weather():
162167
times = pd.date_range('20160101 1200-0700', periods=2, freq='6H')
163168
weather = pd.DataFrame({'wind_speed': 5, 'temp_air': 10}, index=times)
164169
expected = {}
165170
expected[SAPM] = \
166-
pd.Series(np.array([ 1.99952400e+02, -2.00000000e-02]), index=times)
171+
pd.Series(np.array([1.99952400e+02, -2.00000000e-02]), index=times)
167172
expected[SingleDiode] = \
168173
pd.Series(np.array([198.13564009, np.nan]), index=times)
169174

@@ -190,7 +195,8 @@ def test_basic_chain_required():
190195
modules = sam_data['sandiamod']
191196
module_parameters = modules['Canadian_Solar_CS5P_220M___2009_']
192197
inverters = sam_data['cecinverter']
193-
inverter_parameters = inverters['ABB__MICRO_0_25_I_OUTD_US_208_208V__CEC_2014_']
198+
inverter_parameters = \
199+
inverters['ABB__MICRO_0_25_I_OUTD_US_208_208V__CEC_2014_']
194200

195201
dc, ac = modelchain.basic_chain(times, latitude, longitude,
196202
module_parameters, inverter_parameters,
@@ -202,20 +208,20 @@ def test_basic_chain_alt_az():
202208
end='20160101 1800-0700', freq='6H')
203209
latitude = 32.2
204210
longitude = -111
205-
altitude = 700
206211
surface_tilt = 0
207212
surface_azimuth = 0
208213
modules = sam_data['sandiamod']
209214
module_parameters = modules['Canadian_Solar_CS5P_220M___2009_']
210215
inverters = sam_data['cecinverter']
211-
inverter_parameters = inverters['ABB__MICRO_0_25_I_OUTD_US_208_208V__CEC_2014_']
216+
inverter_parameters = \
217+
inverters['ABB__MICRO_0_25_I_OUTD_US_208_208V__CEC_2014_']
212218

213219
dc, ac = modelchain.basic_chain(times, latitude, longitude,
214220
module_parameters, inverter_parameters,
215221
surface_tilt=surface_tilt,
216222
surface_azimuth=surface_azimuth)
217223

218-
expected = pd.Series(np.array([ 1.14490928477e+02, -2.00000000e-02]),
224+
expected = pd.Series(np.array([1.14490928477e+02, -2.00000000e-02]),
219225
index=times)
220226
assert_series_equal(ac, expected)
221227

@@ -229,14 +235,14 @@ def test_basic_chain_strategy():
229235
modules = sam_data['sandiamod']
230236
module_parameters = modules['Canadian_Solar_CS5P_220M___2009_']
231237
inverters = sam_data['cecinverter']
232-
inverter_parameters = inverters['ABB__MICRO_0_25_I_OUTD_US_208_208V__CEC_2014_']
238+
inverter_parameters = \
239+
inverters['ABB__MICRO_0_25_I_OUTD_US_208_208V__CEC_2014_']
233240

234-
dc, ac = modelchain.basic_chain(times, latitude, longitude,
235-
module_parameters, inverter_parameters,
236-
orientation_strategy='south_at_latitude_tilt',
237-
altitude=altitude)
241+
dc, ac = modelchain.basic_chain(
242+
times, latitude, longitude, module_parameters, inverter_parameters,
243+
orientation_strategy='south_at_latitude_tilt', altitude=altitude)
238244

239-
expected = pd.Series(np.array([ 1.82033563543e+02, -2.00000000e-02]),
245+
expected = pd.Series(np.array([1.82033563543e+02, -2.00000000e-02]),
240246
index=times)
241247
assert_series_equal(ac, expected)
242248

@@ -252,15 +258,16 @@ def test_basic_chain_altitude_pressure():
252258
modules = sam_data['sandiamod']
253259
module_parameters = modules['Canadian_Solar_CS5P_220M___2009_']
254260
inverters = sam_data['cecinverter']
255-
inverter_parameters = inverters['ABB__MICRO_0_25_I_OUTD_US_208_208V__CEC_2014_']
261+
inverter_parameters = \
262+
inverters['ABB__MICRO_0_25_I_OUTD_US_208_208V__CEC_2014_']
256263

257264
dc, ac = modelchain.basic_chain(times, latitude, longitude,
258265
module_parameters, inverter_parameters,
259266
surface_tilt=surface_tilt,
260267
surface_azimuth=surface_azimuth,
261268
pressure=93194)
262269

263-
expected = pd.Series(np.array([ 1.15771428788e+02, -2.00000000e-02]),
270+
expected = pd.Series(np.array([1.15771428788e+02, -2.00000000e-02]),
264271
index=times)
265272
assert_series_equal(ac, expected)
266273

@@ -270,6 +277,6 @@ def test_basic_chain_altitude_pressure():
270277
surface_azimuth=surface_azimuth,
271278
altitude=altitude)
272279

273-
expected = pd.Series(np.array([ 1.15771428788e+02, -2.00000000e-02]),
280+
expected = pd.Series(np.array([1.15771428788e+02, -2.00000000e-02]),
274281
index=times)
275282
assert_series_equal(ac, expected)

0 commit comments

Comments
 (0)