diff --git a/docs/sphinx/source/reference/pv_modeling/system_models.rst b/docs/sphinx/source/reference/pv_modeling/system_models.rst index 11137bead2..212865144e 100644 --- a/docs/sphinx/source/reference/pv_modeling/system_models.rst +++ b/docs/sphinx/source/reference/pv_modeling/system_models.rst @@ -13,7 +13,6 @@ Sandia array performance model (SAPM) pvsystem.sapm pvsystem.sapm_effective_irradiance pvsystem.sapm_spectral_loss - spectrum.spectral_factor_sapm inverter.sandia temperature.sapm_cell diff --git a/docs/sphinx/source/whatsnew/v0.10.0.rst b/docs/sphinx/source/whatsnew/v0.10.0.rst index 7599eb0915..6b6ae1abe9 100644 --- a/docs/sphinx/source/whatsnew/v0.10.0.rst +++ b/docs/sphinx/source/whatsnew/v0.10.0.rst @@ -55,7 +55,7 @@ Deprecations * Functions for calculating spectral modifiers have been moved to :py:mod:`pvlib.spectrum`: :py:func:`!pvlib.atmosphere.first_solar_spectral_correction` is deprecated and replaced by :py:func:`~pvlib.spectrum.spectral_factor_firstsolar`, and - :py:func:`pvlib.pvsystem.sapm_spectral_loss` is deprecated and replaced by + :py:func:`!pvlib.pvsystem.sapm_spectral_loss` is deprecated and replaced by :py:func:`~pvlib.spectrum.spectral_factor_sapm`. (:pull:`1628`) * Removed the ``get_ecmwf_macc`` and ``read_ecmwf_macc`` iotools functions as the MACC dataset has been `removed by ECMWF `_ diff --git a/docs/sphinx/source/whatsnew/v0.11.3.rst b/docs/sphinx/source/whatsnew/v0.11.3.rst index 44239b2773..829b86dea5 100644 --- a/docs/sphinx/source/whatsnew/v0.11.3.rst +++ b/docs/sphinx/source/whatsnew/v0.11.3.rst @@ -12,6 +12,8 @@ Breaking Changes * Users must now provide ModelChain.spectral_model, or the 'no_loss' spectral model is assumed. pvlib.modelchain.ModelChain no longer attempts to infer the spectral model from PVSystem attributes. (:issue:`2017`, :pull:`2253`) +* Remove deprecated :py:func:`!pvlib.pvsystem.sapm_spectral_loss`. + (:issue:`2243`, :pull:`2244`) * :py:func:`~pvlib.iotools.read_tmy3` now defaults to ``map_variables=True``. Additionally, the deprecated ``recolumn`` parameter is now removed. (:issue:`2324`, :pull:`2408`) * Remove :py:func:`!pvlib.atmosphere.first_solar_spectral_correction`, deprecated in v0.10.0. diff --git a/docs/sphinx/source/whatsnew/v0.6.1.rst b/docs/sphinx/source/whatsnew/v0.6.1.rst index 9c20106c46..7d95052f9b 100644 --- a/docs/sphinx/source/whatsnew/v0.6.1.rst +++ b/docs/sphinx/source/whatsnew/v0.6.1.rst @@ -56,7 +56,7 @@ Enhancements * Use HRRR modeled surface temperature values instead of inferring from isobaric values and modeled wind speed instead of inferring from gust. (:issue:`604`) -* Change :py:func:`pvlib.pvsystem.sapm_spectral_loss` to avoid numpy warning. +* Change :py:func:`!pvlib.pvsystem.sapm_spectral_loss` to avoid numpy warning. * Add warning message when :py:func:`pvlib.spa` is reloaded. (:issue:`401`) * Add option for :py:func:`pvlib.irradiance.disc` to use relative airmass by supplying `pressure=None`. (:issue:`449`) diff --git a/pvlib/pvsystem.py b/pvlib/pvsystem.py index b15cfe4c45..b762372ae7 100644 --- a/pvlib/pvsystem.py +++ b/pvlib/pvsystem.py @@ -2314,12 +2314,6 @@ def sapm(effective_irradiance, temp_cell, module): return out -sapm_spectral_loss = deprecated( - since='0.10.0', - alternative='pvlib.spectrum.spectral_factor_sapm' -)(spectrum.spectral_factor_sapm) - - def sapm_effective_irradiance(poa_direct, poa_diffuse, airmass_absolute, aoi, module): r""" diff --git a/tests/test_pvsystem.py b/tests/test_pvsystem.py index 9eb5c388a4..ebd015d348 100644 --- a/tests/test_pvsystem.py +++ b/tests/test_pvsystem.py @@ -234,12 +234,6 @@ def test_PVSystem_multi_array_sapm(sapm_module_params): system.sapm(500, temp_cell) -def test_sapm_spectral_loss_deprecated(sapm_module_params): - with pytest.warns(pvlibDeprecationWarning, - match='Use pvlib.spectrum.spectral_factor_sapm'): - pvsystem.sapm_spectral_loss(1, sapm_module_params) - - def test_PVSystem_sapm_spectral_loss(sapm_module_params, mocker): mocker.spy(spectrum, 'spectral_factor_sapm') system = pvsystem.PVSystem(module_parameters=sapm_module_params)