Skip to content

Commit 1288512

Browse files
committed
make skip specific to linux
1 parent 4a5565f commit 1288512

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

pvlib/test/__init__.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
# the xray/xarray project
33

44
import sys
5+
import platform
56

67
try:
78
import unittest2 as unittest
@@ -17,15 +18,16 @@
1718
def requires_scipy(test):
1819
return test if has_scipy else unittest.skip('requires scipy')(test)
1920

20-
def incompatible_conda_py3(test):
21+
def incompatible_conda_linux_py3(test):
2122
"""
2223
Test won't work in Python 3.x due to Anaconda issue.
2324
"""
2425
major = sys.version_info[0]
2526
minor = sys.version_info[1]
27+
system = platform.system()
2628

27-
if major == 3:
28-
out = unittest.skip('error on Python 3 due to anaconda')(test)
29+
if major == 3 and system == 'Linux':
30+
out = unittest.skip('error on Linux Python 3 due to Anaconda')(test)
2931
else:
3032
out = test
3133

pvlib/test/test_pvsystem.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
from nose.tools import assert_equals, assert_almost_equals
1212
from pandas.util.testing import assert_series_equal, assert_frame_equal
13-
from . import incompatible_conda_py3
13+
from . import incompatible_conda_linux_py3
1414

1515
from pvlib import tmy
1616
from pvlib import pvsystem
@@ -123,7 +123,7 @@ def test_calcparams_desoto():
123123
EgRef=1.121,
124124
dEgdT=-0.0002677)
125125

126-
@incompatible_conda_py3
126+
@incompatible_conda_linux_py3
127127
def test_i_from_v():
128128
output = pvsystem.i_from_v(20, .1, .5, 40, 6e-7, 7)
129129
assert_almost_equals(-299.746389916, output, 5)
@@ -141,7 +141,7 @@ def test_singlediode_series():
141141
out = pvsystem.singlediode(cecmodule, IL, I0, Rs, Rsh, nNsVth)
142142
assert isinstance(out, pd.DataFrame)
143143

144-
@incompatible_conda_py3
144+
@incompatible_conda_linux_py3
145145
def test_singlediode_series():
146146
cecmodule = sam_data['cecmod'].Example_Module
147147
out = pvsystem.singlediode(cecmodule, 7, 6e-7, .1, 20, .5)

0 commit comments

Comments
 (0)