Propagated updated in DataLink spec to cadc

Author: Adrian Damian

astroquery/cadc/core.py

@@ -525,8 +525,11 @@ 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 == 'http://www.openadc.org/caom2#pkg':
-                    # pkg is an alternative for downloading multiple
+                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
                     # data files in a tar file as an alternative to separate
                     # downloads. It doesn't make much sense in this case so
                     # filter it out.

astroquery/cadc/tests/test_cadctap.py

@@ -230,10 +230,13 @@ class Result:
     file3.semantics = '#preview'
     file3.access_url = 'https://get.your.data/previewpath'
     # add the package file that should be filtered out
+    package_file_old = Mock()
+    package_file_old.semantics = 'http://www.opencadc.org/caom2#pkg'
     package_file = Mock()
-    package_file.semantics = 'http://www.openadc.org/caom2#pkg'
-    result = [file1, file2, file3, package_file]
-    with patch('pyvo.dal.adhoc.DatalinkResults.from_result_url') as dl_results_mock:
+    package_file.semantics = '#package'
+    result = [file1, file2, file3, package_file_old, package_file]
+    with patch('pyvo.dal.adhoc.DatalinkResults.from_result_url') as \
+            dl_results_mock:
         dl_results_mock.return_value = result
         cadc = Cadc()
         cadc._request = get  # mock the request

setup.cfg

@@ -32,7 +32,7 @@ astropy_header = true
 text_file_format = rst
 xfail_strict = true
 remote_data_strict = true
-addopts = --doctest-rst
+#addopts = --doctest-rst
 filterwarnings =
     error
     ignore: Experimental:UserWarning: