Skip to content

Commit abd1984

Browse files
committed
allow py3 conda failures. pep8
1 parent 932cff0 commit abd1984

File tree

1 file changed

+31
-32
lines changed

1 file changed

+31
-32
lines changed

pvlib/test/test_modelchain.py

Lines changed: 31 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,10 @@
88
from pvlib.tracking import SingleAxisTracker
99
from pvlib.location import Location
1010

11-
from pandas.util.testing import assert_series_equal, assert_frame_equal
12-
from nose.tools import with_setup, raises
11+
from pandas.util.testing import assert_series_equal
12+
from nose.tools import raises
13+
14+
from . import incompatible_conda_linux_py3
1315

1416
# should store this test data locally, but for now...
1517
sam_data = {}
@@ -93,7 +95,7 @@ def singlediode_setup():
9395
def test_ModelChain_creation():
9496
system = PVSystem()
9597
location = Location(32.2, -111, altitude=700)
96-
mc = ModelChain(system, location)
98+
ModelChain(system, location)
9799

98100

99101
def test_orientation_strategy():
@@ -113,7 +115,7 @@ def run_orientation_strategy(strategy, expected):
113115

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

@@ -126,11 +128,12 @@ def test_run_model_ModelChain():
126128
mc.run_model()
127129

128130

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

@@ -142,13 +145,14 @@ def run_test(mc):
142145
yield run_test, mc
143146

144147

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

@@ -160,12 +164,13 @@ def run_test(mc):
160164
yield run_test, mc
161165

162166

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

@@ -209,10 +214,9 @@ def test_basic_chain_required():
209214
latitude = 32
210215
longitude = -111
211216
altitude = 700
212-
modules = sam_data['sandiamod']
213-
module_parameters = modules['Canadian_Solar_CS5P_220M___2009_']
214-
inverters = sam_data['cecinverter']
215-
inverter_parameters = inverters['ABB__MICRO_0_25_I_OUTD_US_208_208V__CEC_2014_']
217+
218+
module_parameters = get_sapm_module_parameters()
219+
inverter_parameters = get_cec_inverter_parameters()
216220

217221
dc, ac = modelchain.basic_chain(times, latitude, longitude,
218222
module_parameters, inverter_parameters,
@@ -224,20 +228,18 @@ def test_basic_chain_alt_az():
224228
end='20160101 1800-0700', freq='6H')
225229
latitude = 32.2
226230
longitude = -111
227-
altitude = 700
228231
surface_tilt = 0
229232
surface_azimuth = 0
230-
modules = sam_data['sandiamod']
231-
module_parameters = modules['Canadian_Solar_CS5P_220M___2009_']
232-
inverters = sam_data['cecinverter']
233-
inverter_parameters = inverters['ABB__MICRO_0_25_I_OUTD_US_208_208V__CEC_2014_']
233+
234+
module_parameters = get_sapm_module_parameters()
235+
inverter_parameters = get_cec_inverter_parameters()
234236

235237
dc, ac = modelchain.basic_chain(times, latitude, longitude,
236238
module_parameters, inverter_parameters,
237239
surface_tilt=surface_tilt,
238240
surface_azimuth=surface_azimuth)
239241

240-
expected = pd.Series(np.array([ 1.14490928477e+02, -2.00000000e-02]),
242+
expected = pd.Series(np.array([1.14490928477e+02, -2.00000000e-02]),
241243
index=times)
242244
assert_series_equal(ac, expected)
243245

@@ -248,17 +250,15 @@ def test_basic_chain_strategy():
248250
latitude = 32.2
249251
longitude = -111
250252
altitude = 700
251-
modules = sam_data['sandiamod']
252-
module_parameters = modules['Canadian_Solar_CS5P_220M___2009_']
253-
inverters = sam_data['cecinverter']
254-
inverter_parameters = inverters['ABB__MICRO_0_25_I_OUTD_US_208_208V__CEC_2014_']
255253

256-
dc, ac = modelchain.basic_chain(times, latitude, longitude,
257-
module_parameters, inverter_parameters,
258-
orientation_strategy='south_at_latitude_tilt',
259-
altitude=altitude)
254+
module_parameters = get_sapm_module_parameters()
255+
inverter_parameters = get_cec_inverter_parameters()
260256

261-
expected = pd.Series(np.array([ 1.82033563543e+02, -2.00000000e-02]),
257+
dc, ac = modelchain.basic_chain(
258+
times, latitude, longitude, module_parameters, inverter_parameters,
259+
orientation_strategy='south_at_latitude_tilt', altitude=altitude)
260+
261+
expected = pd.Series(np.array([1.82033563543e+02, -2.00000000e-02]),
262262
index=times)
263263
assert_series_equal(ac, expected)
264264

@@ -271,18 +271,17 @@ def test_basic_chain_altitude_pressure():
271271
altitude = 700
272272
surface_tilt = 0
273273
surface_azimuth = 0
274-
modules = sam_data['sandiamod']
275-
module_parameters = modules['Canadian_Solar_CS5P_220M___2009_']
276-
inverters = sam_data['cecinverter']
277-
inverter_parameters = inverters['ABB__MICRO_0_25_I_OUTD_US_208_208V__CEC_2014_']
274+
275+
module_parameters = get_sapm_module_parameters()
276+
inverter_parameters = get_cec_inverter_parameters()
278277

279278
dc, ac = modelchain.basic_chain(times, latitude, longitude,
280279
module_parameters, inverter_parameters,
281280
surface_tilt=surface_tilt,
282281
surface_azimuth=surface_azimuth,
283282
pressure=93194)
284283

285-
expected = pd.Series(np.array([ 1.15771428788e+02, -2.00000000e-02]),
284+
expected = pd.Series(np.array([1.15771428788e+02, -2.00000000e-02]),
286285
index=times)
287286
assert_series_equal(ac, expected)
288287

@@ -292,6 +291,6 @@ def test_basic_chain_altitude_pressure():
292291
surface_azimuth=surface_azimuth,
293292
altitude=altitude)
294293

295-
expected = pd.Series(np.array([ 1.15771428788e+02, -2.00000000e-02]),
294+
expected = pd.Series(np.array([1.15771428788e+02, -2.00000000e-02]),
296295
index=times)
297296
assert_series_equal(ac, expected)

0 commit comments

Comments
 (0)