From 4df4a93dee018d481207eae839af4780280d5689 Mon Sep 17 00:00:00 2001 From: RDaxini <143435106+RDaxini@users.noreply.github.com> Date: Tue, 8 Oct 2024 22:55:25 +0100 Subject: [PATCH 1/6] remove from pvsystem.py and test_pvsystem.py --- pvlib/pvsystem.py | 6 ------ pvlib/tests/test_pvsystem.py | 6 ------ 2 files changed, 12 deletions(-) diff --git a/pvlib/pvsystem.py b/pvlib/pvsystem.py index 57752dff7e..e547cdf3a1 100644 --- a/pvlib/pvsystem.py +++ b/pvlib/pvsystem.py @@ -2273,12 +2273,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/pvlib/tests/test_pvsystem.py b/pvlib/tests/test_pvsystem.py index c98c201af4..63c7402dba 100644 --- a/pvlib/tests/test_pvsystem.py +++ b/pvlib/tests/test_pvsystem.py @@ -233,12 +233,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) From f014473ac51371bf4e1d26b653dfd1bbd449f89b Mon Sep 17 00:00:00 2001 From: RDaxini Date: Fri, 14 Mar 2025 12:21:54 -0600 Subject: [PATCH 2/6] remove from system_models.rst --- docs/sphinx/source/reference/pv_modeling/system_models.rst | 1 - 1 file changed, 1 deletion(-) 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 From a98119ec7dda32d2dbb172f45f2c09d4bed099be Mon Sep 17 00:00:00 2001 From: RDaxini Date: Fri, 14 Mar 2025 12:39:49 -0600 Subject: [PATCH 3/6] Update v0.11.3.rst --- docs/sphinx/source/whatsnew/v0.11.3.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/sphinx/source/whatsnew/v0.11.3.rst b/docs/sphinx/source/whatsnew/v0.11.3.rst index 62c7c29c57..aab9c76a97 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`) +* Removed :py:func:`pvlib.pvsystem.sapm_spectral_loss`. (:issue:`2243`, + :pull:`2244`) Bug fixes ~~~~~~~~~ From e962e90ce3b4051864a371a49f836c4f32bd500b Mon Sep 17 00:00:00 2001 From: RDaxini Date: Fri, 14 Mar 2025 12:51:29 -0600 Subject: [PATCH 4/6] slight wording change in whatsnew --- docs/sphinx/source/whatsnew/v0.11.3.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/sphinx/source/whatsnew/v0.11.3.rst b/docs/sphinx/source/whatsnew/v0.11.3.rst index aab9c76a97..34af424eb5 100644 --- a/docs/sphinx/source/whatsnew/v0.11.3.rst +++ b/docs/sphinx/source/whatsnew/v0.11.3.rst @@ -12,8 +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`) -* Removed :py:func:`pvlib.pvsystem.sapm_spectral_loss`. (:issue:`2243`, - :pull:`2244`) +* Remove deprecated :py:func:`pvlib.pvsystem.sapm_spectral_loss`. + (:issue:`2243`, :pull:`2244`) Bug fixes ~~~~~~~~~ From bfafe480197b91d14c55047663db4b514e73410a Mon Sep 17 00:00:00 2001 From: RDaxini <143435106+RDaxini@users.noreply.github.com> Date: Fri, 14 Mar 2025 13:42:34 -0600 Subject: [PATCH 5/6] Update docs/sphinx/source/whatsnew/v0.11.3.rst Co-authored-by: Kevin Anderson --- docs/sphinx/source/whatsnew/v0.11.3.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/sphinx/source/whatsnew/v0.11.3.rst b/docs/sphinx/source/whatsnew/v0.11.3.rst index 34af424eb5..bd8bdace7e 100644 --- a/docs/sphinx/source/whatsnew/v0.11.3.rst +++ b/docs/sphinx/source/whatsnew/v0.11.3.rst @@ -12,7 +12,7 @@ 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`. +* Remove deprecated :py:func:`!pvlib.pvsystem.sapm_spectral_loss`. (:issue:`2243`, :pull:`2244`) Bug fixes From 020c250f7b56aea125af615b45ed69c5a9492036 Mon Sep 17 00:00:00 2001 From: RDaxini Date: Fri, 14 Mar 2025 13:46:42 -0600 Subject: [PATCH 6/6] add ! v0.6.1 and 10.0.0 Co-Authored-By: Echedey Luis <80125792+echedey-ls@users.noreply.github.com> --- docs/sphinx/source/whatsnew/v0.10.0.rst | 2 +- docs/sphinx/source/whatsnew/v0.6.1.rst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/sphinx/source/whatsnew/v0.10.0.rst b/docs/sphinx/source/whatsnew/v0.10.0.rst index 7f86137407..7388c0d90b 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.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`)