add pytest.warns where pvsystem.singlediode ivcurve_pnts is used in tests

Author: reepoi

pvlib/tests/ivtools/test_sde.py

@@ -2,6 +2,7 @@
 import pytest
 from pvlib import pvsystem
 from pvlib.ivtools import sde
+from pvlib._deprecation import pvlibDeprecationWarning
 
 
 @pytest.fixture
@@ -11,12 +12,13 @@ def get_test_iv_params():
 
 def test_fit_sandia_simple(get_test_iv_params, get_bad_iv_curves):
     test_params = get_test_iv_params
-    testcurve = pvsystem.singlediode(photocurrent=test_params['IL'],
-                                     saturation_current=test_params['I0'],
-                                     resistance_shunt=test_params['Rsh'],
-                                     resistance_series=test_params['Rs'],
-                                     nNsVth=test_params['nNsVth'],
-                                     ivcurve_pnts=300)
+    with pytest.warns(pvlibDeprecationWarning, match='ivcurve_pnts'):
+        testcurve = pvsystem.singlediode(photocurrent=test_params['IL'],
+                                         saturation_current=test_params['I0'],
+                                         resistance_shunt=test_params['Rsh'],
+                                         resistance_series=test_params['Rs'],
+                                         nNsVth=test_params['nNsVth'],
+                                         ivcurve_pnts=300)
     expected = tuple(test_params[k] for k in ['IL', 'I0', 'Rs', 'Rsh',
                      'nNsVth'])
     result = sde.fit_sandia_simple(voltage=testcurve['v'],

pvlib/tests/ivtools/test_sdm.py

@@ -6,6 +6,7 @@
 
 from pvlib.ivtools import sdm
 from pvlib import pvsystem
+from pvlib._deprecation import pvlibDeprecationWarning
 
 from pvlib.tests.conftest import requires_pysam, requires_statsmodels
 
@@ -102,7 +103,9 @@ def test_fit_desoto_sandia(cec_params_cansol_cs5p_220p):
     tc = np.repeat(temp_cell, len(effective_irradiance))
     iph, io, rs, rsh, nnsvth = pvsystem.calcparams_desoto(
         ee, tc, alpha_sc=specs['alpha_sc'], **params)
-    sim_ivcurves = pvsystem.singlediode(iph, io, rs, rsh, nnsvth, 300)
+    with pytest.warns(pvlibDeprecationWarning, match='ivcurve_pnts'):
+        sim_ivcurves = pvsystem.singlediode(iph, io, rs, rsh, nnsvth,
+                                            ivcurve_pnts=300)
     sim_ivcurves['ee'] = ee
     sim_ivcurves['tc'] = tc
 

pvlib/tests/test_pvsystem.py

@@ -1358,8 +1358,9 @@ def test_singlediode_floats():
 
 
 def test_singlediode_floats_ivcurve():
-    out = pvsystem.singlediode(7., 6e-7, .1, 20., .5, ivcurve_pnts=3,
-                               method='lambertw')
+    with pytest.warns(pvlibDeprecationWarning, match='ivcurve_pnts'):
+        out = pvsystem.singlediode(7., 6e-7, .1, 20., .5, ivcurve_pnts=3,
+                                   method='lambertw')
     expected = {'i_xx': 4.264060478,
                 'i_mp': 6.136267360,
                 'v_oc': 8.106300147,
@@ -1391,8 +1392,9 @@ def test_singlediode_series_ivcurve(cec_module_params):
                                   EgRef=1.121,
                                   dEgdT=-0.0002677)
 
-    out = pvsystem.singlediode(IL, I0, Rs, Rsh, nNsVth, ivcurve_pnts=3,
-                               method='lambertw')
+    with pytest.warns(pvlibDeprecationWarning, match='ivcurve_pnts'):
+        out = pvsystem.singlediode(IL, I0, Rs, Rsh, nNsVth, ivcurve_pnts=3,
+                                   method='lambertw')
 
     expected = OrderedDict([('i_sc', array([0., 3.01079860, 6.00726296])),
                             ('v_oc', array([0., 9.96959733, 10.29603253])),
@@ -1411,7 +1413,8 @@ def test_singlediode_series_ivcurve(cec_module_params):
     for k, v in out.items():
         assert_allclose(v, expected[k], atol=1e-2)
 
-    out = pvsystem.singlediode(IL, I0, Rs, Rsh, nNsVth, ivcurve_pnts=3)
+    with pytest.warns(pvlibDeprecationWarning, match='ivcurve_pnts'):
+        out = pvsystem.singlediode(IL, I0, Rs, Rsh, nNsVth, ivcurve_pnts=3)
 
     expected['i_mp'] = pvsystem.i_from_v(out['v_mp'], IL, I0, Rs, Rsh, nNsVth,
                                          method='lambertw')
@@ -1428,7 +1431,7 @@ def test_singlediode_series_ivcurve(cec_module_params):
 
 @pytest.mark.parametrize('method', ['lambertw', 'brentq', 'newton'])
 def test_singlediode_ivcurvepnts_deprecation_warning(method):
-    with pytest.warns(pvlibDeprecationWarning):
+    with pytest.warns(pvlibDeprecationWarning, match='ivcurve_pnts'):
         pvsystem.singlediode(7., 6e-7, .1, 20., .5, ivcurve_pnts=3,
                              method=method)
 

pvlib/tests/test_singlediode.py

@@ -8,6 +8,7 @@
 from pvlib import pvsystem
 from pvlib.singlediode import (bishop88_mpp, estimate_voc, VOLTAGE_BUILTIN,
                                bishop88, bishop88_i_from_v, bishop88_v_from_i)
+from pvlib._deprecation import pvlibDeprecationWarning
 import pytest
 from .conftest import DATA_DIR
 
@@ -176,7 +177,10 @@ def test_ivcurve_pnts_precision(method, precise_iv_curves):
     x, pc = precise_iv_curves
     pc_i, pc_v = np.stack(pc['Currents']), np.stack(pc['Voltages'])
     ivcurve_pnts = len(pc['Currents'][0])
-    outs = pvsystem.singlediode(method=method, ivcurve_pnts=ivcurve_pnts, **x)
+
+    with pytest.warns(pvlibDeprecationWarning, match='ivcurve_pnts'):
+        outs = pvsystem.singlediode(method=method, ivcurve_pnts=ivcurve_pnts,
+                                    **x)
 
     assert np.allclose(pc_i, outs['i'], atol=1e-10, rtol=0)
     assert np.allclose(pc_v, outs['v'], atol=1e-10, rtol=0)