diff --git a/pvlib/irradiance.py b/pvlib/irradiance.py index 38bf122b91..5157894913 100644 --- a/pvlib/irradiance.py +++ b/pvlib/irradiance.py @@ -15,20 +15,10 @@ from pvlib import atmosphere, solarposition, tools import pvlib # used to avoid dni name collision in complete_irradiance -from pvlib._deprecation import pvlibDeprecationWarning, deprecated +from pvlib._deprecation import deprecated import warnings -# Deprecation warning based on https://peps.python.org/pep-0562/ -def __getattr__(attr): - if attr == 'SURFACE_ALBEDOS': - warnings.warn(f"{attr} has been moved to the albedo module as of " - "v0.11.0. Please use pvlib.albedo.SURFACE_ALBEDOS.", - pvlibDeprecationWarning) - return pvlib.albedo.SURFACE_ALBEDOS - raise AttributeError(f"module {__name__!r} has no attribute {attr!r}") - - def get_extra_radiation(datetime_or_doy, solar_constant=1366.1, method='spencer', epoch_year=2014, **kwargs): """ diff --git a/tests/test_irradiance.py b/tests/test_irradiance.py index b0d9863ad5..b49988fdaf 100644 --- a/tests/test_irradiance.py +++ b/tests/test_irradiance.py @@ -1639,18 +1639,6 @@ def test_louche(): assert_frame_equal(out, expected) -def test_SURFACE_ALBEDOS_deprecated(): - with pytest.warns(pvlibDeprecationWarning, match='SURFACE_ALBEDOS has been' - ' moved to the albedo module as of v0.11.0. Please use' - ' pvlib.albedo.SURFACE_ALBEDOS.'): - irradiance.SURFACE_ALBEDOS - - -@pytest.mark.filterwarnings("ignore:SURFACE_ALBEDOS") -def test_SURFACE_ALBEDO_equals(): - assert irradiance.SURFACE_ALBEDOS == albedo.SURFACE_ALBEDOS - - def test_diffuse_par_spitters(): solar_zenith, global_diffuse_fraction = np.meshgrid( [90, 85, 75, 60, 40, 30, 10, 0], [0.01, 0.1, 0.3, 0.6, 0.8, 0.99]