pvlib 0.9.4a1__py3-none-any.whl → 0.10.0__py3-none-any.whl

pvlib/tests/iotools/test_pvgis.py

@@ -9,8 +9,9 @@ import pytest
 import requests
 from pvlib.iotools import get_pvgis_tmy, read_pvgis_tmy
 from pvlib.iotools import get_pvgis_hourly, read_pvgis_hourly
+from pvlib.iotools import get_pvgis_horizon
 from ..conftest import (DATA_DIR, RERUNS, RERUNS_DELAY, assert_frame_equal,
-                        fail_on_pvlib_version)
+                        fail_on_pvlib_version, assert_series_equal)
 from pvlib._deprecation import pvlibDeprecationWarning
 
 
@@ -206,14 +207,14 @@ def test_read_pvgis_hourly_bad_extension():
 
 
 args_radiation_csv = {
-    'surface_tilt': 30, 'surface_azimuth': 0, 'outputformat': 'csv',
+    'surface_tilt': 30, 'surface_azimuth': 180, 'outputformat': 'csv',
     'usehorizon': False, 'userhorizon': None, 'raddatabase': 'PVGIS-SARAH',
     'start': 2016, 'end': 2016, 'pvcalculation': False, 'components': True}
 
 url_hourly_radiation_csv = 'https://re.jrc.ec.europa.eu/api/seriescalc?lat=45&lon=8&outputformat=csv&angle=30&aspect=0&usehorizon=0&pvtechchoice=crystSi&mountingplace=free&trackingtype=0&components=1&raddatabase=PVGIS-SARAH&startyear=2016&endyear=2016'  # noqa: E501
 
 args_pv_json = {
-    'surface_tilt': 30, 'surface_azimuth': 0, 'outputformat': 'json',
+    'surface_tilt': 30, 'surface_azimuth': 180, 'outputformat': 'json',
     'usehorizon': True, 'userhorizon': None, 'raddatabase': 'PVGIS-SARAH2',
     'start': pd.Timestamp(2013, 1, 1), 'end': pd.Timestamp(2014, 5, 1),
     'pvcalculation': True, 'peakpower': 10, 'pvtechchoice': 'CIS', 'loss': 5,
@@ -364,17 +365,6 @@ def pvgis_tmy_mapped_columns():
             'wind_speed', 'wind_direction', 'pressure']
 
 
-@fail_on_pvlib_version('0.10')
-@pytest.mark.remote_data
-@pytest.mark.flaky(reruns=RERUNS, reruns_delay=RERUNS_DELAY)
-def test_pvgis_tmy_variable_map_deprecating_warning_0_10():
-    with pytest.warns(pvlibDeprecationWarning, match='names will be renamed'):
-        _ = get_pvgis_tmy(45, 8)
-    with pytest.warns(pvlibDeprecationWarning, match='names will be renamed'):
-        fn = DATA_DIR / 'tmy_45.000_8.000_2005_2016.epw'
-        _ = read_pvgis_tmy(fn)
-
-
 @pytest.mark.remote_data
 @pytest.mark.flaky(reruns=RERUNS, reruns_delay=RERUNS_DELAY)
 def test_get_pvgis_tmy(expected, month_year_expected, inputs_expected,
@@ -509,6 +499,23 @@ def test_get_pvgis_map_variables(pvgis_tmy_mapped_columns):
     assert all([c in pvgis_tmy_mapped_columns for c in actual.columns])
 
 
+@pytest.mark.remote_data
+@pytest.mark.flaky(reruns=RERUNS, reruns_delay=RERUNS_DELAY)
+def test_read_pvgis_horizon():
+    pvgis_data, _ = get_pvgis_horizon(35.171051, -106.465158)
+    horizon_data = pd.read_csv(DATA_DIR / 'test_read_pvgis_horizon.csv',
+                               index_col=0)
+    horizon_data = horizon_data['horizon_elevation']
+    assert_series_equal(pvgis_data, horizon_data)
+
+
+@pytest.mark.remote_data
+@pytest.mark.flaky(reruns=RERUNS, reruns_delay=RERUNS_DELAY)
+def test_read_pvgis_horizon_invalid_coords():
+    with pytest.raises(requests.HTTPError, match='lat: Incorrect value'):
+        _, _ = get_pvgis_horizon(100, 50)  # unfeasible latitude
+
+
 def test_read_pvgis_tmy_map_variables(pvgis_tmy_mapped_columns):
     fn = DATA_DIR / 'tmy_45.000_8.000_2005_2016.json'
     actual, _, _, _ = read_pvgis_tmy(fn, map_variables=True)

pvlib/tests/iotools/test_sodapro.py

@@ -209,7 +209,7 @@ def test_get_cams(requests_mock, testfile, index, columns, values, dtypes,
         mock_response = test_file.read()
     # Specify the full URI of a specific example, this ensures that all of the
     # inputs are passing on correctly
-    url_test_cams = f'https://www.soda-is.com/service/wps?DataInputs=latitude=55.7906;longitude=12.5251;altitude=80;date_begin=2020-01-01;date_end=2020-05-04;time_ref=UT;summarization=P01M;username=pvlib-admin%2540googlegroups.com;verbose=false&Service=WPS&Request=Execute&Identifier=get_{identifier}&version=1.0.0&RawDataOutput=irradiation'  # noqa: E501
+    url_test_cams = f'https://api.soda-solardata.com/service/wps?DataInputs=latitude=55.7906;longitude=12.5251;altitude=80;date_begin=2020-01-01;date_end=2020-05-04;time_ref=UT;summarization=P01M;username=pvlib-admin%2540googlegroups.com;verbose=false&Service=WPS&Request=Execute&Identifier=get_{identifier}&version=1.0.0&RawDataOutput=irradiation'  # noqa: E501
 
     requests_mock.get(url_test_cams, text=mock_response,
                       headers={'Content-Type': 'application/csv'})

pvlib/tests/iotools/test_srml.py

@@ -3,7 +3,9 @@ import pandas as pd
 import pytest
 
 from pvlib.iotools import srml
-from ..conftest import DATA_DIR, RERUNS, RERUNS_DELAY
+from ..conftest import (DATA_DIR, RERUNS, RERUNS_DELAY, assert_index_equal,
+                        assert_frame_equal, fail_on_pvlib_version)
+from pvlib._deprecation import pvlibDeprecationWarning
 
 srml_testfile = DATA_DIR / 'SRML-day-EUPO1801.txt'
 
@@ -28,6 +30,16 @@ def test_read_srml_columns_exist():
     assert '7008_flag' in data.columns
 
 
+def test_read_srml_map_variables_false():
+    data = srml.read_srml(srml_testfile, map_variables=False)
+    assert '1000' in data.columns
+    assert '1000_flag' in data.columns
+    assert '2010' in data.columns
+    assert '2010_flag' in data.columns
+    assert '7008' in data.columns
+    assert '7008_flag' in data.columns
+
+
 def test_read_srml_nans_exist():
     data = srml.read_srml(srml_testfile)
     assert isnan(data['dni_0'][1119])
@@ -60,23 +72,37 @@ def test_read_srml_dt_index(url, year, month):
     ('2001', '2001'),
     ('2017', 'dni_7')
 ])
-def test_map_columns(column, expected):
-    assert srml.map_columns(column) == expected
+def test__map_columns(column, expected):
+    assert srml._map_columns(column) == expected
 
 
+@pytest.mark.remote_data
+@pytest.mark.flaky(reruns=RERUNS, reruns_delay=RERUNS_DELAY)
+def test_get_srml():
+    url = 'http://solardat.uoregon.edu/download/Archive/EUPO1801.txt'
+    file_data = srml.read_srml(url)
+    requested, _ = srml.get_srml(station='EU', start='2018-01-01',
+                                 end='2018-01-31')
+    assert_frame_equal(file_data, requested)
+
+
+@fail_on_pvlib_version('0.11')
 @pytest.mark.remote_data
 @pytest.mark.flaky(reruns=RERUNS, reruns_delay=RERUNS_DELAY)
 def test_read_srml_month_from_solardat():
     url = 'http://solardat.uoregon.edu/download/Archive/EUPO1801.txt'
     file_data = srml.read_srml(url)
-    requested = srml.read_srml_month_from_solardat('EU', 2018, 1)
+    with pytest.warns(pvlibDeprecationWarning, match='get_srml instead'):
+        requested = srml.read_srml_month_from_solardat('EU', 2018, 1)
     assert file_data.equals(requested)
 
 
+@fail_on_pvlib_version('0.11')
 @pytest.mark.remote_data
 @pytest.mark.flaky(reruns=RERUNS, reruns_delay=RERUNS_DELAY)
 def test_15_minute_dt_index():
-    data = srml.read_srml_month_from_solardat('TW', 2019, 4, 'RQ')
+    with pytest.warns(pvlibDeprecationWarning, match='get_srml instead'):
+        data = srml.read_srml_month_from_solardat('TW', 2019, 4, 'RQ')
     start = pd.Timestamp('20190401 00:00')
     start = start.tz_localize('Etc/GMT+8')
     end = pd.Timestamp('20190430 23:45')
@@ -86,10 +112,12 @@ def test_15_minute_dt_index():
     assert (data.index[3::4].minute == 45).all()
 
 
+@fail_on_pvlib_version('0.11')
 @pytest.mark.remote_data
 @pytest.mark.flaky(reruns=RERUNS, reruns_delay=RERUNS_DELAY)
 def test_hourly_dt_index():
-    data = srml.read_srml_month_from_solardat('CD', 1986, 4, 'PH')
+    with pytest.warns(pvlibDeprecationWarning, match='get_srml instead'):
+        data = srml.read_srml_month_from_solardat('CD', 1986, 4, 'PH')
     start = pd.Timestamp('19860401 00:00')
     start = start.tz_localize('Etc/GMT+8')
     end = pd.Timestamp('19860430 23:00')
@@ -97,3 +125,40 @@ def test_hourly_dt_index():
     assert data.index[0] == start
     assert data.index[-1] == end
     assert (data.index.minute == 0).all()
+
+
+@pytest.mark.remote_data
+@pytest.mark.flaky(reruns=RERUNS, reruns_delay=RERUNS_DELAY)
+def test_get_srml_hourly():
+    data, meta = data, meta = srml.get_srml(station='CD', start='1986-04-01',
+                                            end='1986-05-31', filetype='PH')
+    expected_index = pd.date_range(start='1986-04-01', end='1986-05-31 23:59',
+                                   freq='1h', tz='Etc/GMT+8')
+    assert_index_equal(data.index, expected_index)
+
+
+@pytest.mark.remote_data
+@pytest.mark.flaky(reruns=RERUNS, reruns_delay=RERUNS_DELAY)
+def test_get_srml_minute():
+    data_read = srml.read_srml(srml_testfile)
+    data_get, meta = srml.get_srml(station='EU', start='2018-01-01',
+                                   end='2018-01-31', filetype='PO')
+    expected_index = pd.date_range(start='2018-01-01', end='2018-01-31 23:59',
+                                   freq='1min', tz='Etc/GMT+8')
+    assert_index_equal(data_get.index, expected_index)
+    assert all([c in data_get.columns for c in data_read.columns])
+    # Check that all indices in example file are present in remote file
+    assert data_read.index.isin(data_get.index).all()
+    assert meta['station'] == 'EU'
+    assert meta['filetype'] == 'PO'
+    assert meta['filenames'] == ['EUPO1801.txt']
+
+
+@pytest.mark.remote_data
+@pytest.mark.flaky(reruns=RERUNS, reruns_delay=RERUNS_DELAY)
+def test_get_srml_nonexisting_month_warning():
+    with pytest.warns(UserWarning, match='file was not found: EUPO0912.txt'):
+        # Request data for a period where not all files exist
+        # Eugene (EU) station started reporting 1-minute data in January 2010
+        data, meta = data, meta = srml.get_srml(
+            station='EU', start='2009-12-01', end='2010-01-31', filetype='PO')

pvlib/tests/iotools/test_tmy.py

@@ -1,8 +1,10 @@
 import numpy as np
 import pandas as pd
 from pvlib.iotools import tmy
+from pvlib._deprecation import pvlibDeprecationWarning
 from ..conftest import DATA_DIR
 import pytest
+import warnings
 
 # test the API works
 from pvlib.iotools import read_tmy3
@@ -16,29 +18,60 @@ TMY3_SOLARANYWHERE = DATA_DIR / 'Burlington, United States SolarAnywhere Time Se
 
 
 def test_read_tmy3():
-    tmy.read_tmy3(TMY3_TESTFILE)
+    tmy.read_tmy3(TMY3_TESTFILE, map_variables=False)
 
 
 def test_read_tmy3_recolumn():
-    data, meta = tmy.read_tmy3(TMY3_TESTFILE)
+    with warnings.catch_warnings():
+        warnings.simplefilter("ignore")
+        data, meta = tmy.read_tmy3(TMY3_TESTFILE, recolumn=True)
     assert 'GHISource' in data.columns
 
 
 def test_read_tmy3_norecolumn():
-    data, _ = tmy.read_tmy3(TMY3_TESTFILE, recolumn=False)
+    data, _ = tmy.read_tmy3(TMY3_TESTFILE, map_variables=False)
     assert 'GHI source' in data.columns
 
 
+def test_read_tmy3_raise_valueerror():
+    with pytest.raises(ValueError, match='`map_variables` and `recolumn`'):
+        _ = tmy.read_tmy3(TMY3_TESTFILE, recolumn=True, map_variables=True)
+
+
+def test_read_tmy3_map_variables():
+    data, meta = tmy.read_tmy3(TMY3_TESTFILE, map_variables=True)
+    assert 'ghi' in data.columns
+    assert 'dni' in data.columns
+    assert 'dhi' in data.columns
+    assert 'pressure' in data.columns
+    assert 'wind_direction' in data.columns
+    assert 'wind_speed' in data.columns
+    assert 'temp_air' in data.columns
+    assert 'temp_dew' in data.columns
+    assert 'relative_humidity' in data.columns
+    assert 'albedo' in data.columns
+    assert 'ghi_extra' in data.columns
+    assert 'dni_extra' in data.columns
+    assert 'precipitable_water' in data.columns
+
+
+def test_read_tmy3_map_variables_deprecating_warning():
+    with pytest.warns(pvlibDeprecationWarning, match='names will be renamed'):
+        data, meta = tmy.read_tmy3(TMY3_TESTFILE)
+
+
 def test_read_tmy3_coerce_year():
     coerce_year = 1987
-    data, _ = tmy.read_tmy3(TMY3_TESTFILE, coerce_year=coerce_year)
+    data, _ = tmy.read_tmy3(TMY3_TESTFILE, coerce_year=coerce_year,
+                            map_variables=False)
     assert (data.index[:-1].year == 1987).all()
     assert data.index[-1].year == 1988
 
 
 def test_read_tmy3_no_coerce_year():
     coerce_year = None
-    data, _ = tmy.read_tmy3(TMY3_TESTFILE, coerce_year=coerce_year)
+    data, _ = tmy.read_tmy3(TMY3_TESTFILE, coerce_year=coerce_year,
+                            map_variables=False)
     assert 1997 and 1999 in data.index.year
     assert data.index[-2] == pd.Timestamp('1998-12-31 23:00:00-09:00')
     assert data.index[-1] == pd.Timestamp('1999-01-01 00:00:00-09:00')
@@ -50,7 +83,7 @@ def test_read_tmy2():
 
 def test_gh865_read_tmy3_feb_leapyear_hr24():
     """correctly parse the 24th hour if the tmy3 file has a leap year in feb"""
-    data, meta = read_tmy3(TMY3_FEB_LEAPYEAR)
+    data, meta = read_tmy3(TMY3_FEB_LEAPYEAR, map_variables=False)
     # just to be safe, make sure this _IS_ the Greensboro file
     greensboro = {
         'USAF': 723170,
@@ -66,7 +99,8 @@ def test_gh865_read_tmy3_feb_leapyear_hr24():
     assert data.index[1414] == pd.Timestamp('1996-02-28 23:00:00-0500')
     assert data.index[1415] == pd.Timestamp('1996-03-01 00:00:00-0500')
     # now check if it parses correctly when we try to coerce the year
-    data, _ = read_tmy3(TMY3_FEB_LEAPYEAR, coerce_year=1990)
+    data, _ = read_tmy3(TMY3_FEB_LEAPYEAR, coerce_year=1990,
+                        map_variables=False)
     # if get's here w/o an error, then gh865 is fixed, but let's check anyway
     assert all(data.index[:-1].year == 1990)
     assert data.index[-1].year == 1991
@@ -87,7 +121,8 @@ def test_solaranywhere_tmy3(solaranywhere_index):
     # The SolarAnywhere TMY3 format specifies midnight as 00:00 whereas the
     # NREL TMY3 format utilizes 24:00. The SolarAnywhere file is therefore
     # included to test files with  00:00 timestamps are parsed correctly
-    data, meta = tmy.read_tmy3(TMY3_SOLARANYWHERE)
+    data, meta = tmy.read_tmy3(TMY3_SOLARANYWHERE, encoding='iso-8859-1',
+                               map_variables=False)
     pd.testing.assert_index_equal(data.index, solaranywhere_index)
     assert meta['USAF'] == 0
     assert meta['Name'] == 'Burlington  United States'

pvlib/tests/ivtools/test_sde.py

@@ -2,6 +2,7 @@ import numpy as np
 import pytest
 from pvlib import pvsystem
 from pvlib.ivtools import sde
+from pvlib._deprecation import pvlibDeprecationWarning
 
 
 @pytest.fixture
@@ -11,31 +12,32 @@ 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)
-    expected = tuple(test_params[k] for k in ['IL', 'I0', 'Rs', 'Rsh',
-                     'nNsVth'])
-    result = sde.fit_sandia_simple(voltage=testcurve['v'],
-                                   current=testcurve['i'])
+    test_params = dict(photocurrent=test_params['IL'],
+                       saturation_current=test_params['I0'],
+                       resistance_series=test_params['Rs'],
+                       resistance_shunt=test_params['Rsh'],
+                       nNsVth=test_params['nNsVth'])
+    testcurve = pvsystem.singlediode(**test_params)
+    v = np.linspace(0., testcurve['v_oc'], 300)
+    i = pvsystem.i_from_v(voltage=v, **test_params)
+    expected = tuple(test_params.values())
+
+    result = sde.fit_sandia_simple(voltage=v, current=i)
     assert np.allclose(result, expected, rtol=5e-5)
-    result = sde.fit_sandia_simple(voltage=testcurve['v'],
-                                   current=testcurve['i'],
+
+    result = sde.fit_sandia_simple(voltage=v, current=i,
                                    v_oc=testcurve['v_oc'],
                                    i_sc=testcurve['i_sc'])
     assert np.allclose(result, expected, rtol=5e-5)
-    result = sde.fit_sandia_simple(voltage=testcurve['v'],
-                                   current=testcurve['i'],
+
+    result = sde.fit_sandia_simple(voltage=v, current=i,
                                    v_oc=testcurve['v_oc'],
                                    i_sc=testcurve['i_sc'],
                                    v_mp_i_mp=(testcurve['v_mp'],
-                                   testcurve['i_mp']))
+                                              testcurve['i_mp']))
     assert np.allclose(result, expected, rtol=5e-5)
-    result = sde.fit_sandia_simple(voltage=testcurve['v'],
-                                   current=testcurve['i'], vlim=0.1)
+
+    result = sde.fit_sandia_simple(voltage=v, current=i, vlim=0.1)
     assert np.allclose(result, expected, rtol=5e-5)
 
 

pvlib/tests/ivtools/test_sdm.py

@@ -6,6 +6,7 @@ from numpy.testing import assert_allclose
 
 from pvlib.ivtools import sdm
 from pvlib import pvsystem
+from pvlib._deprecation import pvlibDeprecationWarning
 
 from pvlib.tests.conftest import requires_pysam, requires_statsmodels
 
@@ -100,11 +101,15 @@ def test_fit_desoto_sandia(cec_params_cansol_cs5p_220p):
     temp_cell = np.array([15., 25., 35., 45.])
     ee = np.tile(effective_irradiance, len(temp_cell))
     tc = np.repeat(temp_cell, len(effective_irradiance))
-    iph, io, rs, rsh, nnsvth = pvsystem.calcparams_desoto(
+    IL, I0, Rs, Rsh, nNsVth = pvsystem.calcparams_desoto(
         ee, tc, alpha_sc=specs['alpha_sc'], **params)
-    sim_ivcurves = pvsystem.singlediode(iph, io, rs, rsh, nnsvth, 300)
-    sim_ivcurves['ee'] = ee
-    sim_ivcurves['tc'] = tc
+    ivcurve_params = dict(photocurrent=IL, saturation_current=I0,
+                          resistance_series=Rs, resistance_shunt=Rsh,
+                          nNsVth=nNsVth)
+    sim_ivcurves = pvsystem.singlediode(**ivcurve_params).to_dict('series')
+    v = np.linspace(0., sim_ivcurves['v_oc'], 300)
+    i = pvsystem.i_from_v(voltage=v, **ivcurve_params)
+    sim_ivcurves.update(v=v.T, i=i.T, ee=ee, tc=tc)
 
     result = sdm.fit_desoto_sandia(sim_ivcurves, specs)
     modeled = pd.Series(index=params.keys(), data=np.nan)

pvlib/tests/ivtools/test_utils.py

@@ -1,7 +1,7 @@
 import numpy as np
 import pandas as pd
 import pytest
-from pvlib.ivtools.utils import _numdiff, rectify_iv_curve
+from pvlib.ivtools.utils import _numdiff, rectify_iv_curve, astm_e1036
 from pvlib.ivtools.utils import _schumaker_qspline
 
 from ..conftest import DATA_DIR
@@ -76,3 +76,98 @@ def test__schmumaker_qspline(x, y, expected):
     np.testing.assert_allclose(t, expected[1], atol=0.0001)
     np.testing.assert_allclose(yhat, expected[2], atol=0.0001)
     np.testing.assert_allclose(kflag, expected[3], atol=0.0001)
+
+
+@pytest.fixture
+def i_array():
+    i = np.array([8.09403993, 8.09382549, 8.09361103, 8.09339656, 8.09318205,
+                  8.09296748, 8.09275275, 8.09253771, 8.09232204, 8.09210506,
+                  8.09188538, 8.09166014, 8.09142342, 8.09116305, 8.09085392,
+                  8.09044425, 8.08982734, 8.08878333, 8.08685945, 8.08312463,
+                  8.07566926, 8.06059856, 8.03005836, 7.96856869, 7.8469714,
+                  7.61489584, 7.19789314, 6.51138396, 5.49373476, 4.13267172,
+                  2.46021487, 0.52838624, -1.61055289])
+    return i
+
+
+@pytest.fixture
+def v_array():
+    v = np.array([-0.005, 0.015, 0.035, 0.055, 0.075, 0.095, 0.115, 0.135,
+                  0.155, 0.175, 0.195, 0.215, 0.235, 0.255, 0.275, 0.295,
+                  0.315, 0.335, 0.355, 0.375, 0.395, 0.415, 0.435, 0.455,
+                  0.475, 0.495, 0.515, 0.535, 0.555, 0.575, 0.595, 0.615,
+                  0.635])
+    return v
+
+
+# astm_e1036 tests
+def test_astm_e1036(v_array, i_array):
+    result = astm_e1036(v_array, i_array)
+    expected = {'voc': 0.6195097477985162,
+                'isc': 8.093986320386227,
+                'vmp': 0.494283417170082,
+                'imp': 7.626088301548568,
+                'pmp': 3.7694489853302127,
+                'ff': 0.7517393078504361}
+    fit = result.pop('mp_fit')
+    expected_fit = np.array(
+        [3.6260726, 0.49124176, -0.24644747, -0.26442383, -0.1223237])
+    assert fit.coef == pytest.approx(expected_fit)
+    assert result == pytest.approx(expected)
+
+
+def test_astm_e1036_fit_order(v_array, i_array):
+    result = astm_e1036(v_array, i_array, mp_fit_order=3)
+    fit = result.pop('mp_fit')
+    expected_fit = np.array(
+        [3.64081697, 0.49124176, -0.3720477, -0.26442383])
+    assert fit.coef == pytest.approx(expected_fit)
+
+
+def test_astm_e1036_est_isc_voc(v_array, i_array):
+    '''
+    Test the case in which Isc and Voc estimates are
+    valid without a linear fit
+    '''
+    v = v_array
+    i = i_array
+    v = np.append(v, [0.001, 0.6201])
+    i = np.append(i, [8.09397560e+00, 7.10653445e-04])
+    result = astm_e1036(v, i)
+    expected = {'voc': 0.6201,
+                'isc': 8.093975598317805,
+                'vmp': 0.494283417170082,
+                'imp': 7.626088301548568,
+                'pmp': 3.7694489853302127,
+                'ff': 0.751024747526615}
+    result.pop('mp_fit')
+    assert result == pytest.approx(expected)
+
+
+def test_astm_e1036_mpfit_limits(v_array, i_array):
+    result = astm_e1036(v_array,
+                        i_array,
+                        imax_limits=(0.85, 1.1),
+                        vmax_limits=(0.85, 1.1))
+    expected = {'voc': 0.6195097477985162,
+                'isc': 8.093986320386227,
+                'vmp': 0.49464214190725303,
+                'imp': 7.620032530519718,
+                'pmp': 3.769189212299219,
+                'ff': 0.7516875014460312}
+    result.pop('mp_fit')
+    assert result == pytest.approx(expected)
+
+
+def test_astm_e1036_fit_points(v_array, i_array):
+    i = i_array
+    i[3] = 8.1  # ensure an interesting change happens
+    result = astm_e1036(v_array, i, voc_points=4, isc_points=4)
+    expected = {'voc': 0.619337073271274,
+                'isc': 8.093160893325297,
+                'vmp': 0.494283417170082,
+                'imp': 7.626088301548568,
+                'pmp': 3.7694489853302127,
+                'ff': 0.7520255886236707}
+    result.pop('mp_fit')
+    assert result == pytest.approx(expected)

pvlib/tests/test_atmosphere.py

@@ -9,6 +9,8 @@ import pytest
 
 from pvlib import atmosphere
 
+from pvlib._deprecation import pvlibDeprecationWarning
+
 
 def test_pres2alt():
     out = atmosphere.pres2alt(np.array([10000, 90000, 101325]))
@@ -35,7 +37,8 @@ def zeniths():
                           ['kastenyoung1989', [nan, 36.467,  5.586,  1.000]],
                           ['gueymard1993', [nan, 36.431,  5.581,  1.000]],
                           ['young1994', [nan, 30.733,  5.541,  1.000]],
-                          ['pickering2002', [nan, 37.064,  5.581,  1.000]]])
+                          ['pickering2002', [nan, 37.064,  5.581,  1.000]],
+                          ['gueymard2003', [nan, 36.676, 5.590, 1.000]]])
 def test_airmass(model, expected, zeniths):
     out = atmosphere.get_relative_airmass(zeniths, model)
     expected = np.array(expected)
@@ -85,68 +88,10 @@ def test_gueymard94_pw():
     assert_allclose(pws, expected, atol=0.01)
 
 
-@pytest.mark.parametrize("module_type,expect", [
-    ('cdte', np.array(
-        [[ 0.9905102 ,  0.9764032 ,  0.93975028],
-         [ 1.02928735,  1.01881074,  0.98578821],
-         [ 1.04750335,  1.03814456,  1.00623986]])),
-    ('monosi', np.array(
-        [[ 0.9776977 ,  1.02043409,  1.03574032],
-         [ 0.98630905,  1.03055092,  1.04736262],
-         [ 0.98828494,  1.03299036,  1.05026561]])),
-    ('polysi', np.array(
-        [[ 0.9770408 ,  1.01705849,  1.02613202],
-         [ 0.98992828,  1.03173953,  1.04260662],
-         [ 0.99352435,  1.03588785,  1.04730718]])),
-    ('cigs', np.array(
-        [[ 0.9745919 ,  1.02821696,  1.05067895],
-         [ 0.97529378,  1.02967497,  1.05289307],
-         [ 0.97269159,  1.02730558,  1.05075651]])),
-    ('asi', np.array(
-        [[ 1.0555275 ,  0.87707583,  0.72243772],
-         [ 1.11225204,  0.93665901,  0.78487953],
-         [ 1.14555295,  0.97084011,  0.81994083]]))
-])
-def test_first_solar_spectral_correction(module_type, expect):
-    ams = np.array([1, 3, 5])
-    pws = np.array([1, 3, 5])
-    ams, pws = np.meshgrid(ams, pws)
-    out = atmosphere.first_solar_spectral_correction(pws, ams, module_type)
-    assert_allclose(out, expect, atol=0.001)
-
-
-def test_first_solar_spectral_correction_supplied():
-    # use the cdte coeffs
-    coeffs = (0.87102, -0.040543, -0.00929202, 0.10052, 0.073062, -0.0034187)
-    out = atmosphere.first_solar_spectral_correction(1, 1, coefficients=coeffs)
-    expected = 0.99134828
-    assert_allclose(out, expected, atol=1e-3)
-
-
-def test_first_solar_spectral_correction_ambiguous():
-    with pytest.raises(TypeError):
-        atmosphere.first_solar_spectral_correction(1, 1)
-
-
-def test_first_solar_spectral_correction_range():
-    with pytest.warns(UserWarning, match='Exceptionally high pw values'):
-        out = atmosphere.first_solar_spectral_correction(np.array([.1, 3, 10]),
-                                                         np.array([1, 3, 5]),
-                                                         module_type='monosi')
-    expected = np.array([0.96080878, 1.03055092,        nan])
-    assert_allclose(out, expected, atol=1e-3)
-    with pytest.warns(UserWarning, match='Exceptionally high pw values'):
-        out = atmosphere.first_solar_spectral_correction(6, 1.5, max_pw=5,
-                                                         module_type='monosi')
-    with pytest.warns(UserWarning, match='Exceptionally low pw values'):
-        out = atmosphere.first_solar_spectral_correction(np.array([0, 3, 8]),
-                                                         np.array([1, 3, 5]),
-                                                         module_type='monosi')
-    expected = np.array([0.96080878, 1.03055092, 1.04932727])
-    assert_allclose(out, expected, atol=1e-3)
-    with pytest.warns(UserWarning, match='Exceptionally low pw values'):
-        out = atmosphere.first_solar_spectral_correction(0.2, 1.5, min_pw=1,
-                                                         module_type='monosi')
+def test_first_solar_spectral_correction_deprecated():
+    with pytest.warns(pvlibDeprecationWarning,
+                      match='Use pvlib.spectrum.spectral_factor_firstsolar'):
+        atmosphere.first_solar_spectral_correction(1, 1, 'cdte')
 
 
 def test_kasten96_lt():
@@ -169,7 +114,6 @@ def test_kasten96_lt():
     )
     lt = atmosphere.kasten96_lt(*np.meshgrid(amp, pwat, aod_bb))
     assert np.allclose(lt, lt_expected, 1e-3)
-    return lt
 
 
 def test_angstrom_aod():

pvlib/tests/test_clearsky.py

@@ -808,4 +808,3 @@ def test_bird():
         [Eb3, Ebh3, Gh3, Dh3],
         testdata2[['Direct Beam', 'Direct Hz', 'Global Hz', 'Dif Hz']].iloc[11],
         rtol=1e-3)
-    return pd.DataFrame({'Eb': Eb, 'Ebh': Ebh, 'Gh': Gh, 'Dh': Dh}, index=times)