Skip to content

Commit 5047b26

Browse files
Updated get_cams protocol to https #1457 (#1458)
* Updated get_cams protocol to https #1457 * Updated instances of http to https. #1457 * Updated documentation links to https * Added Contributor
1 parent a0812b1 commit 5047b26

File tree

3 files changed

+11
-10
lines changed

3 files changed

+11
-10
lines changed

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

+1
Original file line numberDiff line numberDiff line change
@@ -39,3 +39,4 @@ Contributors
3939
~~~~~~~~~~~~
4040
* Naman Priyadarshi (:ghuser:`Naman-Priyadarshi`)
4141
* Chencheng Luo (:ghuser:`roger-lcc`)
42+
* Prajwal Borkar (:ghuser:`PrajwalBorkar`)

pvlib/iotools/sodapro.py

+8-8
Original file line numberDiff line numberDiff line change
@@ -153,11 +153,11 @@ def get_cams(latitude, longitude, start, end, email, identifier='mcclear',
153153
References
154154
----------
155155
.. [1] `CAMS Radiation Service Info
156-
<http://www.soda-pro.com/web-services/radiation/cams-radiation-service/info>`_
156+
<https://www.soda-pro.com/web-services/radiation/cams-radiation-service/info>`_
157157
.. [2] `CAMS McClear Service Info
158-
<http://www.soda-pro.com/web-services/radiation/cams-mcclear/info>`_
158+
<https://www.soda-pro.com/web-services/radiation/cams-mcclear/info>`_
159159
.. [3] `CAMS McClear Automatic Access
160-
<http://www.soda-pro.com/help/cams-services/cams-mcclear-service/automatic-access>`_
160+
<https://www.soda-pro.com/help/cams-services/cams-mcclear-service/automatic-access>`_
161161
"""
162162
try:
163163
time_step_str = TIME_STEPS_MAP[time_step]
@@ -185,7 +185,7 @@ def get_cams(latitude, longitude, start, end, email, identifier='mcclear',
185185
email = email.replace('@', '%2540') # Format email address
186186
identifier = 'get_{}'.format(identifier.lower()) # Format identifier str
187187

188-
base_url = f"http://{server}/service/wps"
188+
base_url = f"https://{server}/service/wps"
189189

190190
data_inputs_dict = {
191191
'latitude': latitude,
@@ -263,9 +263,9 @@ def parse_cams(fbuf, integrated=False, label=None, map_variables=True):
263263
References
264264
----------
265265
.. [1] `CAMS Radiation Service Info
266-
<http://www.soda-pro.com/web-services/radiation/cams-radiation-service/info>`_
266+
<https://www.soda-pro.com/web-services/radiation/cams-radiation-service/info>`_
267267
.. [2] `CAMS McClear Service Info
268-
<http://www.soda-pro.com/web-services/radiation/cams-mcclear/info>`_
268+
<https://www.soda-pro.com/web-services/radiation/cams-mcclear/info>`_
269269
"""
270270
metadata = {}
271271
# Initial lines starting with # contain metadata
@@ -366,9 +366,9 @@ def read_cams(filename, integrated=False, label=None, map_variables=True):
366366
References
367367
----------
368368
.. [1] `CAMS Radiation Service Info
369-
<http://www.soda-pro.com/web-services/radiation/cams-radiation-service/info>`_
369+
<https://www.soda-pro.com/web-services/radiation/cams-radiation-service/info>`_
370370
.. [2] `CAMS McClear Service Info
371-
<http://www.soda-pro.com/web-services/radiation/cams-mcclear/info>`_
371+
<https://www.soda-pro.com/web-services/radiation/cams-mcclear/info>`_
372372
"""
373373
with open(str(filename), 'r') as fbuf:
374374
content = parse_cams(fbuf, integrated, label, map_variables)

pvlib/tests/iotools/test_sodapro.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ def test_get_cams(requests_mock, testfile, index, columns, values, dtypes,
209209
mock_response = test_file.read()
210210
# Specify the full URI of a specific example, this ensures that all of the
211211
# inputs are passing on correctly
212-
url_test_cams = f'http://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
212+
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
213213

214214
requests_mock.get(url_test_cams, text=mock_response,
215215
headers={'Content-Type': 'application/csv'})
@@ -254,7 +254,7 @@ def test_get_cams_bad_request(requests_mock):
254254
Please, register yourself at www.soda-pro.com
255255
</ows:ExceptionText>"""
256256

257-
url_cams_bad_request = 'http://pro.soda-is.com/service/wps?DataInputs=latitude=55.7906;longitude=12.5251;altitude=-999;date_begin=2020-01-01;date_end=2020-05-04;time_ref=TST;summarization=PT01H;username=test%2540test.com;verbose=false&Service=WPS&Request=Execute&Identifier=get_mcclear&version=1.0.0&RawDataOutput=irradiation' # noqa: E501
257+
url_cams_bad_request = 'https://pro.soda-is.com/service/wps?DataInputs=latitude=55.7906;longitude=12.5251;altitude=-999;date_begin=2020-01-01;date_end=2020-05-04;time_ref=TST;summarization=PT01H;username=test%2540test.com;verbose=false&Service=WPS&Request=Execute&Identifier=get_mcclear&version=1.0.0&RawDataOutput=irradiation' # noqa: E501
258258

259259
requests_mock.get(url_cams_bad_request, text=mock_response_bad,
260260
headers={'Content-Type': 'application/xml'})

0 commit comments

Comments
 (0)