Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FIX: switching to https for sdss to avoid query issues #2654

Merged
merged 1 commit into from
Feb 3, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,12 @@ oac
- Fix bug in parsing events that contain html tags (e.g. in their alias
field). [#2423]

sdss
^^^^

- Switching to https to avoid issues originating in relying on server side
redirects. [#2654]

simbad
^^^^^^

Expand Down
2 changes: 1 addition & 1 deletion astroquery/sdss/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ class Conf(_config.ConfigNamespace):
Configuration parameters for `astroquery.sdss`.
"""
skyserver_baseurl = _config.ConfigItem(
'http://skyserver.sdss.org',
'https://skyserver.sdss.org',
'Base URL for catalog-related queries like SQL and Cross-ID.')
sas_baseurl = _config.ConfigItem(
'https://data.sdss.org/sas',
Expand Down
12 changes: 6 additions & 6 deletions astroquery/sdss/tests/test_sdss.py
Original file line number Diff line number Diff line change
Expand Up @@ -123,25 +123,25 @@ def data_path(filename):
# interfaces are supported for DR11."
def url_tester(data_release):
if data_release < 10:
baseurl = 'http://skyserver.sdss.org/dr{}/en/tools/search/x_sql.asp'
baseurl = 'https://skyserver.sdss.org/dr{}/en/tools/search/x_sql.asp'
if data_release == 10:
baseurl = 'http://skyserver.sdss.org/dr{}/en/tools/search/x_sql.aspx'
baseurl = 'https://skyserver.sdss.org/dr{}/en/tools/search/x_sql.aspx'
if data_release == 11:
return
if data_release >= 12:
baseurl = 'http://skyserver.sdss.org/dr{}/en/tools/search/x_results.aspx'
baseurl = 'https://skyserver.sdss.org/dr{}/en/tools/search/x_results.aspx'
assert sdss.SDSS._last_url == baseurl.format(data_release)


def url_tester_crossid(data_release):
if data_release < 10:
baseurl = 'http://skyserver.sdss.org/dr{}/en/tools/crossid/x_crossid.asp'
baseurl = 'https://skyserver.sdss.org/dr{}/en/tools/crossid/x_crossid.asp'
if data_release == 10:
baseurl = 'http://skyserver.sdss.org/dr{}/en/tools/crossid/x_crossid.aspx'
baseurl = 'https://skyserver.sdss.org/dr{}/en/tools/crossid/x_crossid.aspx'
if data_release == 11:
return
if data_release >= 12:
baseurl = 'http://skyserver.sdss.org/dr{}/en/tools/search/X_Results.aspx'
baseurl = 'https://skyserver.sdss.org/dr{}/en/tools/search/X_Results.aspx'
assert sdss.SDSS._last_url == baseurl.format(data_release)


Expand Down