Skip to content

Commit ee9b24a

Browse files
authored
Update SRML test url and re-enable tests (#1988)
* Update test_srml.py * Update v0.10.4.rst
1 parent 407687f commit ee9b24a

File tree

2 files changed

+9
-14
lines changed

2 files changed

+9
-14
lines changed

docs/sphinx/source/whatsnew/v0.10.4.rst

+2
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ Bug fixes
3737
* Fixed incorrect unit conversion of precipitable water used for the Solcast iotools functions.
3838
* :py:class:`~pvlib.modelchain.ModelChain.infer_temperature_model` now raises a more useful error when
3939
the temperature model cannot be inferred (:issue:`1946`)
40+
* The default URL for retrieving irradiance data from the SRML network was updated in
41+
:py:func:`~pvlib.iotools.get_srml` (:pull:`1957`, :issue:`1922`)
4042

4143
Testing
4244
~~~~~~~

pvlib/tests/iotools/test_srml.py

+7-14
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,12 @@ def test_read_srml():
1414
srml.read_srml(srml_testfile)
1515

1616

17-
@pytest.mark.skip(reason="SRML server is undergoing maintenance as of 12-2023")
1817
@pytest.mark.remote_data
1918
@pytest.mark.flaky(reruns=RERUNS, reruns_delay=RERUNS_DELAY)
2019
def test_read_srml_remote():
21-
srml.read_srml('http://solardat.uoregon.edu/download/Archive/EUPO1801.txt')
20+
srml.read_srml(
21+
'http://solardata.uoregon.edu/download/Archive/EUPO1801.txt'
22+
)
2223

2324

2425
def test_read_srml_columns_exist():
@@ -47,11 +48,10 @@ def test_read_srml_nans_exist():
4748
assert data['dni_0_flag'].iloc[1119] == 99
4849

4950

50-
@pytest.mark.skip(reason="SRML server is undergoing maintenance as of 12-2023")
5151
@pytest.mark.parametrize('url,year,month', [
52-
('http://solardat.uoregon.edu/download/Archive/EUPO1801.txt',
52+
('http://solardata.uoregon.edu/download/Archive/EUPO1801.txt',
5353
2018, 1),
54-
('http://solardat.uoregon.edu/download/Archive/EUPO1612.txt',
54+
('http://solardata.uoregon.edu/download/Archive/EUPO1612.txt',
5555
2016, 12),
5656
])
5757
@pytest.mark.remote_data
@@ -78,30 +78,27 @@ def test__map_columns(column, expected):
7878
assert srml._map_columns(column) == expected
7979

8080

81-
@pytest.mark.skip(reason="SRML server is undergoing maintenance as of 12-2023")
8281
@pytest.mark.remote_data
8382
@pytest.mark.flaky(reruns=RERUNS, reruns_delay=RERUNS_DELAY)
8483
def test_get_srml():
85-
url = 'http://solardat.uoregon.edu/download/Archive/EUPO1801.txt'
84+
url = 'http://solardata.uoregon.edu/download/Archive/EUPO1801.txt'
8685
file_data = srml.read_srml(url)
8786
requested, _ = srml.get_srml(station='EU', start='2018-01-01',
8887
end='2018-01-31')
8988
assert_frame_equal(file_data, requested)
9089

9190

92-
@pytest.mark.skip(reason="SRML server is undergoing maintenance as of 12-2023")
9391
@fail_on_pvlib_version('0.11')
9492
@pytest.mark.remote_data
9593
@pytest.mark.flaky(reruns=RERUNS, reruns_delay=RERUNS_DELAY)
9694
def test_read_srml_month_from_solardat():
97-
url = 'http://solardat.uoregon.edu/download/Archive/EUPO1801.txt'
95+
url = 'http://solardata.uoregon.edu/download/Archive/EUPO1801.txt'
9896
file_data = srml.read_srml(url)
9997
with pytest.warns(pvlibDeprecationWarning, match='get_srml instead'):
10098
requested = srml.read_srml_month_from_solardat('EU', 2018, 1)
10199
assert file_data.equals(requested)
102100

103101

104-
@pytest.mark.skip(reason="SRML server is undergoing maintenance as of 12-2023")
105102
@fail_on_pvlib_version('0.11')
106103
@pytest.mark.remote_data
107104
@pytest.mark.flaky(reruns=RERUNS, reruns_delay=RERUNS_DELAY)
@@ -117,7 +114,6 @@ def test_15_minute_dt_index():
117114
assert (data.index[3::4].minute == 45).all()
118115

119116

120-
@pytest.mark.skip(reason="SRML server is undergoing maintenance as of 12-2023")
121117
@fail_on_pvlib_version('0.11')
122118
@pytest.mark.remote_data
123119
@pytest.mark.flaky(reruns=RERUNS, reruns_delay=RERUNS_DELAY)
@@ -133,7 +129,6 @@ def test_hourly_dt_index():
133129
assert (data.index.minute == 0).all()
134130

135131

136-
@pytest.mark.skip(reason="SRML server is undergoing maintenance as of 12-2023")
137132
@pytest.mark.remote_data
138133
@pytest.mark.flaky(reruns=RERUNS, reruns_delay=RERUNS_DELAY)
139134
def test_get_srml_hourly():
@@ -144,7 +139,6 @@ def test_get_srml_hourly():
144139
assert_index_equal(data.index, expected_index)
145140

146141

147-
@pytest.mark.skip(reason="SRML server is undergoing maintenance as of 12-2023")
148142
@pytest.mark.remote_data
149143
@pytest.mark.flaky(reruns=RERUNS, reruns_delay=RERUNS_DELAY)
150144
def test_get_srml_minute():
@@ -162,7 +156,6 @@ def test_get_srml_minute():
162156
assert meta['filenames'] == ['EUPO1801.txt']
163157

164158

165-
@pytest.mark.skip(reason="SRML server is undergoing maintenance as of 12-2023")
166159
@pytest.mark.remote_data
167160
@pytest.mark.flaky(reruns=RERUNS, reruns_delay=RERUNS_DELAY)
168161
def test_get_srml_nonexisting_month_warning():

0 commit comments

Comments
 (0)