Skip to content

Fix in the cadc module in anticipation of coming changes to the servers #2326

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.

Sign up for GitHub

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

Merged
merged 5 commits into from
Mar 19, 2022
Merged

Fix in the cadc module in anticipation of coming changes to the servers #2326

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f9ba61b
Propagated updated in DataLink spec to cadc
Mar 17, 2022
fd8a8a1
Skipped buggy int tests
Mar 18, 2022
9c2c972
Small correction
Mar 18, 2022
b0f9e3f
Rework after code review
Mar 18, 2022
800006d
Revert change to testing config
bsipocz Mar 19, 2022
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
3 changes: 1 addition & 2 deletions astroquery/cadc/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -525,8 +525,7 @@ def get_data_urls(self, query_result, include_auxiliaries=False):
urlencode({'ID': pid_sublist,
'REQUEST': 'downloads-only'}, True)))
for service_def in datalink:
if service_def.semantics in \
['http://www.opencadc.org/caom2#pkg', '#package']:
if service_def.semantics in ['http://www.opencadc.org/caom2#pkg', '#package']:
# TODO http://www.openadc.org/caom2#pkg has been replaced
# by "package". Removed it after CADC rolls out the change
# package is an alternative for downloading multiple
Expand Down
6 changes: 3 additions & 3 deletions astroquery/cadc/tests/test_cadctap_remote.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ def test_authsession(self):

@pytest.mark.skipif(one_test, reason='One test mode')
@pytest.mark.skipif(not pyvo_OK, reason='not pyvo_OK')
@pytest.mark.skip('https://github.com/astropy/astroquery/issues/2325')
@pytest.mark.xfail(reason='#2325')
def test_get_images(self):
cadc = Cadc()
coords = '08h45m07.5s +54d18m00s'
Expand Down Expand Up @@ -254,7 +254,7 @@ def test_get_images_against_AS(self):

@pytest.mark.skipif(one_test, reason='One test mode')
@pytest.mark.skipif(not pyvo_OK, reason='not pyvo_OK')
@pytest.mark.skip('https://github.com/astropy/astroquery/issues/2325')
@pytest.mark.xfail(reason='#2325')
def test_get_images_async(self):
cadc = Cadc()
coords = '01h45m07.5s +23d18m00s'
Expand Down Expand Up @@ -315,7 +315,7 @@ def test_list_tables(self):
reason='Requires real CADC certificate (CADC_CERT '
'environment variable)')
@pytest.mark.skipif(not pyvo_OK, reason='not pyvo_OK')
@pytest.mark.skip('https://github.com/astropy/astroquery/issues/2325')
@pytest.mark.xfail(reason='#2325')
def test_list_jobs(self):
cadc = Cadc()
cadc.login(certificate_file=os.environ['CADC_CERT'])
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ astropy_header = true
text_file_format = rst
xfail_strict = true
remote_data_strict = true
addopts = --doctest-rst
#addopts = --doctest-rst
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this has to stay, we switched on testing the docs :)

filterwarnings =
error
ignore: Experimental:UserWarning:
Expand Down