8000 avoid the conda/travis/pip/scipy mess with a simple skip · rickymos/pvlib-python@3e8d3bd · GitHub
[go: up one dir, main page]
Skip to content

Commit 3e8d3bd

Browse files
wholmgrenwholmgren
committed
avoid the conda/travis/pip/scipy mess with a simple skip
1 parent 612e9ea commit 3e8d3bd

File tree

4 files changed

+40
-8
lines changed

4 files changed

+40
-8
lines changed

‎ci/requirements-py34.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
name: test_env
22
dependencies:
33
- python=3.4
4+
- numpy
5+
- scipy
6+
- pandas
47
- nose
58
- pytz
69
- ephem
7-
#- numba
10+
- numba
811
- pip:
9-
- numpy
10-
- pandas
1112
- coveralls

‎ci/requirements-py35.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
name: test_env
22
dependencies:
33
- python=3.5
4+
- numpy
5+
- scipy
6+
- pandas
47
- nose
58
- pytz
69
- ephem
7-
# - numba
10+
- numba
811
- pip:
9-
- numpy
10-
- pandas
1112
- coveralls

‎pvlib/test/__init__.py

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
import sys
2+
3+
try:
4+
import unittest2 as unittest
5+
except ImportError:
6+
import unittest
7+
8+
try:
9+
import scipy
10+
has_scipy = True
11+
except ImportError:
12+
has_scipy = False
13+
14+
def requires_scipy(test):
15+
return test if has_scipy else unittest.skip('requires scipy')(test)
16+
17+
def incompatible_conda_py3(test):
18+
"""
19+
Test won't work in Python 3.x due to Anaconda issue.
20+
"""
21+
major = sys.version_info[0]
22+
minor = sys.version_info[1]
23+
24+
if major == 3:
25+
out = unittest.skip('error on Python 3 due to anaconda')(test)
26+
else:
27+
out = test
28+
29+
return out

‎pvlib/test/test_pvsystem.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +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
1314

1415
from pvlib import tmy
1516
from pvlib import pvsystem
@@ -122,7 +123,7 @@ def test_calcparams_desoto():
122123
EgRef=1.121,
123124
dEgdT=-0.0002677)
124125

125-
126+
@incompatible_conda_py3
126127
def test_i_from_v():
127128
output = pvsystem.i_from_v(20, .1, .5, 40, 6e-7, 7)
128129
assert_almost_equals(-299.746389916, output, 5)
@@ -140,7 +141,7 @@ def test_singlediode_series():
140141
out = pvsystem.singlediode(cecmodule, IL, I0, Rs, Rsh, nNsVth)
141142
assert isinstance(out, pd.DataFrame)
142143

143-
144+
@incompatible_conda_py3
144145
def test_singlediode_series():
145146
cecmodule = sam_data['cecmod'].Example_Module
146147
out = pvsystem.singlediode(cecmodule, 7, 6e-7, .1, 20, .5)

0 commit comments

Comments
 (0)
0