Skip to content

Commit 7b12fb3

Browse files
committed
remove skip decorators for linux+python3 and pandas 0.18.0 (#187)
* remove scipy skip on py3 for conda * add notes about skip tests and compatibility * remove pandas 0180 test entirely
1 parent 1d62078 commit 7b12fb3

File tree

4 files changed

+16
-45
lines changed

4 files changed

+16
-45
lines changed

docs/sphinx/source/installation.rst

Lines changed: 9 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -224,29 +224,15 @@ Compatibility
224224
pvlib-python is compatible with Python versions 2.7, 3.4, 3.5 and Pandas
225225
versions 0.13.1 or newer.
226226

227-
There are several problems with Continuum's Anaconda packages that may
228-
impact pvlib users.
229-
230-
For Linux + Python 3 users: Continuum's Python 3.x SciPy conda packages
231-
have a few bugs related to complex arithmetic. The most common place for
232-
these bugs to show up when using pvlib-python is in calculating IV curve
233-
parameters using the ``singlediode`` function. We reported `the
234-
issue <https://github.com/ContinuumIO/anaconda-issues/issues/425>`_ to
235-
Continuum and are waiting for it to be fixed. In the meantime, you can
236-
compile your own SciPy distribution, or you can use this hack on Python
237-
3.3 and 3.4 (not 3.5): Downgrade your NumPy to 1.8 and SciPy to 0.14,
238-
then install whatever version of pandas you want but without
239-
dependencies. The conda commands for this are:
240-
241-
``conda install numpy=1.8 scipy=0.14``
242-
243-
``conda install pandas --no-deps``
244-
245-
For Windows + Python 2.7 users: Continuum's Python 2.7 SciPy 0.16.1,
246-
0.17.0, 0.17.1 packages are not compiled properly and will crash your
247-
Python interpreter if you use our Linke turbidity lookup function. See
248-
`Anaconda issue 650
249-
<https://github.com/ContinuumIO/anaconda-issues/issues/650>`_ for more.
227+
There have been several problems with Continuum's Anaconda packages that
228+
have impacted pvlib users. The current problems that we're aware of are
229+
listed below:
230+
231+
#. For Windows + Python 2.7 users: Continuum's Python 2.7 SciPy 0.16.1,
232+
0.17.0, 0.17.1 packages are not compiled properly and will crash your
233+
Python interpreter if you use our Linke turbidity lookup function. See
234+
`Anaconda issue 650
235+
<https://github.com/ContinuumIO/anaconda-issues/issues/650>`_ for more.
250236

251237
Note that our Numba-accelerated solar position algorithms have more
252238
specific version requirements that will be resolved by the Numba

docs/sphinx/source/whatsnew/v0.3.3.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,13 @@ Documentation
3434
(:issue:`182`)
3535

3636

37+
Other
38+
~~~~~
39+
40+
* Removed test skip decorator functions for Linux + Python 3 and for
41+
pandas 0.18.0. (:issue:`187`)
42+
43+
3744
Contributors
3845
~~~~~~~~~~~~
3946

pvlib/test/__init__.py

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -50,21 +50,6 @@ def incompatible_conda_linux_py3(test):
5050
return out
5151

5252

53-
def incompatible_pandas_0180(test):
54-
"""
55-
Test won't work on pandas 0.18.0 due to pandas/numpy issue with
56-
np.round.
57-
"""
58-
59-
if pd.__version__ == '0.18.0':
60-
out = unittest.skip(
61-
'error on pandas 0.18.0 due to pandas/numpy round')(test)
62-
else:
63-
out = test
64-
65-
return out
66-
67-
6853
def incompatible_pandas_0131(test):
6954
"""
7055
Test won't work on pandas 0.18.0 due to pandas/numpy issue with

pvlib/test/test_pvsystem.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
from nose.tools import assert_equals, assert_almost_equals
1010
from pandas.util.testing import assert_series_equal, assert_frame_equal
11-
from . import incompatible_conda_linux_py3, incompatible_pandas_0180
1211

1312
from pvlib import tmy
1413
from pvlib import pvsystem
@@ -189,7 +188,6 @@ def test_PVSystem_sapm():
189188
assert_frame_equal(sapm, expected)
190189

191190

192-
@incompatible_pandas_0180
193191
def test_calcparams_desoto():
194192
module = 'Example_Module'
195193
module_parameters = sam_data['cecmod'][module]
@@ -211,7 +209,6 @@ def test_calcparams_desoto():
211209
assert_almost_equals(nNsVth, 0.473)
212210

213211

214-
@incompatible_pandas_0180
215212
def test_PVSystem_calcparams_desoto():
216213
module = 'Example_Module'
217214
module_parameters = sam_data['cecmod'][module].copy()
@@ -232,13 +229,11 @@ def test_PVSystem_calcparams_desoto():
232229
assert_almost_equals(nNsVth, 0.473)
233230

234231

235-
@incompatible_conda_linux_py3
236232
def test_i_from_v():
237233
output = pvsystem.i_from_v(20, .1, .5, 40, 6e-7, 7)
238234
assert_almost_equals(-299.746389916, output, 5)
239235

240236

241-
@incompatible_conda_linux_py3
242237
def test_PVSystem_i_from_v():
243238
module = 'Example_Module'
244239
module_parameters = sam_data['cecmod'][module]
@@ -264,7 +259,6 @@ def test_singlediode_series():
264259
assert isinstance(out, pd.DataFrame)
265260

266261

267-
@incompatible_conda_linux_py3
268262
def test_singlediode_floats():
269263
module = 'Example_Module'
270264
module_parameters = sam_data['cecmod'][module]
@@ -281,7 +275,6 @@ def test_singlediode_floats():
281275
assert_almost_equals(expected[k], v, 5)
282276

283277

284-
@incompatible_conda_linux_py3
285278
def test_PVSystem_singlediode_floats():
286279
module = 'Example_Module'
287280
module_parameters = sam_data['cecmod'][module]

0 commit comments

Comments
 (0)