MNT: cleanup as PyVO is a required dependency

Author: bsipocz

astroquery/cadc/core.py

@@ -21,19 +21,11 @@
 from astropy.utils.exceptions import AstropyDeprecationWarning
 from astropy.utils.decorators import deprecated
 from astropy import units as u
+import pyvo
+from pyvo.auth import authsession
+
 from . import conf
 
-try:
-    import pyvo
-    from pyvo.auth import authsession
-except ImportError:
-    print('Please install pyvo. astropy.cadc does not work without it.')
-except AstropyDeprecationWarning as e:
-    if str(e) == 'The astropy.vo.samp module has now been moved to astropy.samp':
-        # CADC does not use samp and this only affects Python 2.7
-        print('AstropyDeprecationWarning: {}'.format(str(e)))
-    else:
-        raise e
 
 __all__ = ['Cadc', 'CadcClass']
 

astroquery/cadc/tests/test_cadctap.py

@@ -16,28 +16,15 @@
 from astropy.io.votable import parse
 from astroquery.utils.commons import parse_coordinates, FileContainer
 from astropy import units as u
-from astropy.utils.exceptions import AstropyDeprecationWarning
 import pytest
 import tempfile
 import requests
-try:
-    pyvo_OK = True
-    from pyvo.auth import authsession, securitymethods
-    from astroquery.cadc import Cadc, conf
-    import astroquery.cadc.core as cadc_core
-except ImportError:
-    pyvo_OK = False
-    pytest.skip("Install pyvo for the cadc module.", allow_module_level=True)
-except AstropyDeprecationWarning as ex:
-    if str(ex) == \
-            'The astropy.vo.samp module has now been moved to astropy.samp':
-        print('AstropyDeprecationWarning: {}'.format(str(ex)))
-    else:
-        raise ex
-try:
-    from unittest.mock import Mock, patch, PropertyMock
-except ImportError:
-    pytest.skip("Install mock for the cadc tests.", allow_module_level=True)
+
+from pyvo.auth import securitymethods
+from astroquery.cadc import Cadc, conf
+import astroquery.cadc.core as cadc_core
+
+from unittest.mock import Mock, patch, PropertyMock
 
 
 def data_path(filename):
@@ -47,7 +34,6 @@ def data_path(filename):
 
 @patch('astroquery.cadc.core.get_access_url',
        Mock(side_effect=lambda x: 'https://some.url'))
-@pytest.mark.skipif(not pyvo_OK, reason='not pyvo_OK')
 def test_get_tables():
     # default parameters
     table_set = PropertyMock()
@@ -62,7 +48,6 @@ def test_get_tables():
 
 @patch('astroquery.cadc.core.get_access_url',
        Mock(side_effect=lambda x: 'https://some.url'))
-@pytest.mark.skipif(not pyvo_OK, reason='not pyvo_OK')
 def test_get_table():
     table_set = PropertyMock()
     tables_result = [Mock() for _ in range(3)]
@@ -80,7 +65,6 @@ def test_get_table():
 
 @patch('astroquery.cadc.core.get_access_url',
        Mock(side_effect=lambda x: 'https://some.url'))
-@pytest.mark.skipif(not pyvo_OK, reason='not pyvo_OK')
 def test_get_collections():
     cadc = Cadc()
 
@@ -106,7 +90,6 @@ def mock_run_query(query, output_format=None, maxrec=None,
 
 @patch('astroquery.cadc.core.get_access_url',
        Mock(side_effect=lambda x: 'https://some.url'))
-@pytest.mark.skipif(not pyvo_OK, reason='not pyvo_OK')
 def test_load_async_job():
     with patch('astroquery.cadc.core.pyvo.dal.TAPService', autospec=True) as tapservice_mock:
         with patch('astroquery.cadc.core.pyvo.dal.AsyncTAPJob',
@@ -124,7 +107,6 @@ def test_load_async_job():
 @pytest.mark.skip('Disabled until job listing available in pyvo')
 @patch('astroquery.cadc.core.get_access_url',
        Mock(side_effect=lambda x: 'https://some.url'))
-@pytest.mark.skipif(not pyvo_OK, reason='not pyvo_OK')
 def test_list_async_jobs():
     with patch('astroquery.cadc.core.pyvo.dal.TAPService', autospec=True) as tapservice_mock:
         tapservice_mock.return_value.baseurl.return_value = 'https://www.example.com/tap'
@@ -136,7 +118,6 @@ def test_list_async_jobs():
        Mock(side_effect=lambda x, y=None: 'https://some.url'))
 @patch('astroquery.cadc.core.pyvo.dal.TAPService.capabilities', [])  # TAP capabilities not needed
 @patch('astroquery.cadc.core.pyvo.dal.adhoc.DatalinkService.capabilities', [])  # DL capabilities not needed
-@pytest.mark.skipif(not pyvo_OK, reason='not pyvo_OK')
 def test_auth():
     # the Cadc() will cause a remote data call to TAP service capabilities
     # To avoid this, use an anonymous session and replace it with an
@@ -183,7 +164,6 @@ def test_auth():
 
 # make sure that caps is reset at the end of the test
 @patch('astroquery.cadc.core.get_access_url.caps', {})
-@pytest.mark.skipif(not pyvo_OK, reason='not pyvo_OK')
 def test_get_access_url():
     # testing implementation of requests.get method:
     def get(url, **kwargs):
@@ -219,7 +199,6 @@ def raise_for_status(self):
        Mock(side_effect=lambda x, y=None: 'https://some.url'))
 @patch('astroquery.cadc.core.pyvo.dal.adhoc.DatalinkService',
        Mock(return_value=Mock(capabilities=[])))  # DL capabilities not needed
-@pytest.mark.skipif(not pyvo_OK, reason='not pyvo_OK')
 def test_get_data_urls():
 
     def get(*args, **kwargs):
@@ -268,7 +247,6 @@ class Result:
 
 @patch('astroquery.cadc.core.get_access_url',
        Mock(side_effect=lambda x, y=None: 'https://some.url'))
-@pytest.mark.skipif(not pyvo_OK, reason='not pyvo_OK')
 def test_misc():
     cadc = Cadc()
 
@@ -302,7 +280,6 @@ def test_misc():
        Mock(return_value=Mock(capabilities=[])))  # TAP capabilities not needed
 @patch('astroquery.cadc.core.pyvo.dal.adhoc.DatalinkService',
        Mock(return_value=Mock(capabilities=[])))  # DL capabilities not needed
-@pytest.mark.skipif(not pyvo_OK, reason='not pyvo_OK')
 def test_get_image_list():
     def get(*args, **kwargs):
         class CapsResponse:
@@ -370,7 +347,6 @@ def __init__(self, **param_dict):
 
 @patch('astroquery.cadc.core.get_access_url',
        Mock(side_effect=lambda x, y=None: 'https://some.url'))
-@pytest.mark.skipif(not pyvo_OK, reason='not pyvo_OK')
 def test_exec_sync():
     # save results in a file
     # create the VOTable result
@@ -411,7 +387,6 @@ def test_exec_sync():
 @patch('astroquery.cadc.core.CadcClass.exec_sync', Mock())
 @patch('astroquery.cadc.core.CadcClass.get_image_list',
        Mock(side_effect=lambda x, y, z: ['https://some.url']))
-@pytest.mark.skipif(not pyvo_OK, reason='not pyvo_OK')
 def test_get_images():
     with patch('astroquery.utils.commons.get_readable_fileobj', autospec=True) as readable_fobj_mock:
         readable_fobj_mock.return_value = open(data_path('query_images.fits'), 'rb')
@@ -429,7 +404,6 @@ def test_get_images():
 @patch('astroquery.cadc.core.CadcClass.exec_sync', Mock())
 @patch('astroquery.cadc.core.CadcClass.get_image_list',
        Mock(side_effect=lambda x, y, z: ['https://some.url']))
-@pytest.mark.skipif(not pyvo_OK, reason='not pyvo_OK')
 def test_get_images_async():
     with patch('astroquery.utils.commons.get_readable_fileobj', autospec=True) as readable_fobj_mock:
         readable_fobj_mock.return_value = open(data_path('query_images.fits'), 'rb')

astroquery/cadc/tests/test_cadctap_remote.py

@@ -14,20 +14,10 @@
 from astropy import units as u
 
 from astroquery.cadc import Cadc
-from astropy.utils.exceptions import AstropyDeprecationWarning
 from astroquery.utils.commons import parse_coordinates, FileContainer
 
-try:
-    pyvo_OK = True
-    import pyvo   # noqa
-    from pyvo.auth import authsession
-except ImportError:
-    pyvo_OK = False
-except AstropyDeprecationWarning as e:
-    if str(e) == 'The astropy.vo.samp module has now been moved to astropy.samp':
-        print('AstropyDeprecationWarning: {}'.format(str(e)))
-    else:
-        raise e
+from pyvo.auth import authsession
+
 
 # to run just one test during development, set this variable to True
 # and comment out the skipif of the single test to run.
@@ -41,7 +31,6 @@
 class TestCadcClass:
     # now write tests for each method here
     @pytest.mark.skipif(one_test, reason='One test mode')
-    @pytest.mark.skipif(not pyvo_OK, reason='not pyvo_OK')
     def test_get_collections(self):
         cadc = Cadc()
         result = cadc.get_collections()
@@ -62,7 +51,6 @@ def test_get_collections(self):
         assert 'Optical' in result['DAO']['Bands']
 
     @pytest.mark.skipif(one_test, reason='One test mode')
-    @pytest.mark.skipif(not pyvo_OK, reason='not pyvo_OK')
     def test_query_region(self):
         cadc = Cadc()
         result = cadc.query_region('08h45m07.5s +54d18m00s', collection='CFHT')
@@ -89,7 +77,6 @@ def test_query_region(self):
         assert len(results) > 20
 
     @pytest.mark.skipif(one_test, reason='One test mode')
-    @pytest.mark.skipif(not pyvo_OK, reason='not pyvo_OK')
     def test_query_name(self):
         cadc = Cadc()
         result1 = cadc.query_name('M31-B14')
@@ -99,7 +86,6 @@ def test_query_name(self):
         assert len(result1) == len(result2)
 
     @pytest.mark.skipif(one_test, reason='One test mode')
-    @pytest.mark.skipif(not pyvo_OK, reason='not pyvo_OK')
     def test_query(self):
         cadc = Cadc()
         result = cadc.exec_sync(
@@ -116,7 +102,6 @@ def test_query(self):
     @pytest.mark.skipif(one_test, reason='One test mode')
     @pytest.mark.skip('Disabled for now until pyvo starts supporting '
                       'different output formats')
-    @pytest.mark.skipif(not pyvo_OK, reason='not pyvo_OK')
     def test_query_format(self):
         cadc = Cadc()
         query = "select top 1 observationID, collection from caom2.Observation"
@@ -128,7 +113,6 @@ def test_query_format(self):
                         or 'CADC_PASSWD' not in os.environ),
                         reason='Requires real CADC user/password (CADC_USER '
                                'and CADC_PASSWD environment variables)')
-    @pytest.mark.skipif(not pyvo_OK, reason='not pyvo_OK')
     def test_login_with_user_password(self):
         for auth_session in [None, authsession.AuthSession(),
                              requests.Session()]:
@@ -162,7 +146,6 @@ def test_login_with_user_password(self):
     @pytest.mark.skipif('CADC_CERT' not in os.environ,
                         reason='Requires real CADC certificate (CADC_CERT '
                                'environment variable)')
-    @pytest.mark.skipif(not pyvo_OK, reason='not pyvo_OK')
     def test_login_with_cert(self):
         for auth_session in [requests.Session()]:
             cadc = Cadc(auth_session=auth_session)
@@ -191,7 +174,6 @@ def test_login_with_cert(self):
     @pytest.mark.skipif('CADC_CERT' not in os.environ,
                         reason='Requires real CADC certificate (CADC_CERT '
                                'environment variable)')
-    @pytest.mark.skipif(not pyvo_OK, reason='not pyvo_OK')
     def test_authsession(self):
         # repeat previous test
         auth_session = requests.Session()
@@ -211,7 +193,6 @@ def test_authsession(self):
         assert len(result) == 0
 
     @pytest.mark.skipif(one_test, reason='One test mode')
-    @pytest.mark.skipif(not pyvo_OK, reason='not pyvo_OK')
     @pytest.mark.xfail(reason='#2325')
     def test_get_images(self):
         cadc = Cadc()
@@ -224,7 +205,6 @@ def test_get_images(self):
             assert isinstance(image, fits.HDUList)
 
     @pytest.mark.skipif(one_test, reason='One test mode')
-    @pytest.mark.skipif(not pyvo_OK, reason='not pyvo_OK')
     @pytest.mark.skipif(skip_slow, reason='Avoid timeout errors')
     def test_get_images_against_AS(self):
         cadc = Cadc()
@@ -259,7 +239,6 @@ def test_get_images_against_AS(self):
         assert len(filtered_resp_urls) == len(image_urls)
 
     @pytest.mark.skipif(one_test, reason='One test mode')
-    @pytest.mark.skipif(not pyvo_OK, reason='not pyvo_OK')
     @pytest.mark.xfail(reason='#2325')
     def test_get_images_async(self):
         cadc = Cadc()
@@ -271,7 +250,6 @@ def test_get_images_async(self):
             assert isinstance(obj, FileContainer)
 
     @pytest.mark.skipif(one_test, reason='One test mode')
-    @pytest.mark.skipif(not pyvo_OK, reason='not pyvo_OK')
     def test_async(self):
         # test async calls
         cadc = Cadc()
@@ -300,7 +278,6 @@ def test_async(self):
         # job.delete()  # BUG in CADC
 
     @pytest.mark.skipif(one_test, reason='One test mode')
-    @pytest.mark.skipif(not pyvo_OK, reason='not pyvo_OK')
     def test_list_tables(self):
         cadc = Cadc()
         table_names = cadc.get_tables(only_names=True)
@@ -320,7 +297,6 @@ def test_list_tables(self):
     @pytest.mark.skipif('CADC_CERT' not in os.environ,
                         reason='Requires real CADC certificate (CADC_CERT '
                                'environment variable)')
-    @pytest.mark.skipif(not pyvo_OK, reason='not pyvo_OK')
     @pytest.mark.xfail(reason='#2325')
     def test_list_jobs(self):
         cadc = Cadc()