Tidy up and add change log entry

Author: jd-au

CHANGES.rst

@@ -23,6 +23,9 @@ casda
 
 - Add the ability to produce 2D and 3D cutouts from ASKAP images and cubes. [#2366]
 
+- Use the standard ``login`` method for authenticating, which supports the system
+  keyring [#2386]
+
 jplsbdb
 ^^^^^^^
 

astroquery/casda/__init__.py

@@ -34,6 +34,7 @@ class Conf(_config.ConfigNamespace):
         'Optional default username for CASDA archive.'
     )
 
+
 conf = Conf()
 
 from .core import Casda, CasdaClass

astroquery/casda/core.py

@@ -47,7 +47,7 @@ class CasdaClass(QueryWithLogin):
     POLL_INTERVAL = conf.poll_interval
     USERNAME = conf.username
     _soda_base_url = conf.soda_base_url
-    _login_url =conf.login_url
+    _login_url = conf.login_url
     _uws_ns = {'uws': 'http://www.ivoa.net/xml/UWS/v1.0'}
 
     def __init__(self, user=None, password=None):

astroquery/casda/tests/test_casda.py

@@ -25,10 +25,11 @@
 DATA_FILES = {'CIRCLE': 'cone.xml', 'RANGE': 'box.xml', 'DATALINK': 'datalink.xml', 'RUN_JOB': 'run_job.xml',
               'COMPLETED_JOB': 'completed_job.xml', 'DATALINK_NOACCESS': 'datalink_noaccess.xml',
               'cutout_CIRCLE_333.9092_-45.8418_0.5000': 'cutout_333.9092_-45.8418_0.5000.xml',
-              'AVAILABILITY' : 'availability.xml'}
+              'AVAILABILITY': 'availability.xml'}
+
+USERNAME = 'user'
+PASSWORD = 'password'
 
-USERNAME='user'
-PASSWORD='password'
 
 class MockResponse:
 
@@ -114,6 +115,7 @@ def patch_get(request):
     mp.setattr(requests.Session, 'request', get_mockreturn)
     return mp
 
+
 def data_path(filename):
     data_dir = os.path.join(os.path.dirname(__file__), 'data')
     return os.path.join(data_dir, filename)
@@ -122,62 +124,69 @@ def data_path(filename):
 def isclose(value1, value2, abs_tol=1e-09):
     return abs(value1 - value2) < abs_tol
 
+
 def test_login(patch_get):
     casda = Casda()
-    assert casda._authenticated == False
+    assert casda._authenticated is False
     assert casda.USERNAME == ''
 
     casda.login(username=USERNAME, password=PASSWORD)
-    assert casda._authenticated == True
+    assert casda._authenticated is True
     assert casda.USERNAME == USERNAME
     assert casda._auth == (USERNAME, 'password')
 
+
 def test_login_badpassword(patch_get):
     casda = Casda()
-    assert casda._authenticated == False
+    assert casda._authenticated is False
     assert casda.USERNAME == ''
 
     casda.login(username=USERNAME, password='notthepassword')
-    assert casda._authenticated == False
+    assert casda._authenticated is False
     assert casda.USERNAME == ''
-    assert hasattr(casda, '_auth') == False
+    assert hasattr(casda, '_auth') is False
+
 
 def test_login_default_user(patch_get):
     casda = Casda()
     casda.USERNAME = USERNAME
-    assert casda._authenticated == False
+    assert casda._authenticated is False
 
     casda.login(password=PASSWORD)
-    assert casda._authenticated == True
+    assert casda._authenticated is True
     assert casda.USERNAME == USERNAME
     assert casda._auth == (USERNAME, 'password')
 
+
 def test_login_no_default_user():
     casda = Casda()
-    assert casda._authenticated == False
+    assert casda._authenticated is False
     assert casda.USERNAME == ''
 
     with pytest.raises(LoginError) as excinfo:
         Casda.login()
 
     assert "If you do not pass a username to login()," in str(excinfo.value)
 
-    assert casda._authenticated == False
+    assert casda._authenticated is False
     assert casda.USERNAME == ''
-    assert hasattr(casda, '_auth') == False
+    assert hasattr(casda, '_auth') is False
 
+
+@pytest.mark.skip('No keyring backend on the CI server')
 def test_login_keyring(patch_get):
     casda = Casda()
-    assert casda._authenticated == False
+    assert casda._authenticated is False
     assert casda.USERNAME == ''
     keyring.set_password("astroquery:casda.csiro.au", USERNAME, PASSWORD)
 
     casda.login(username=USERNAME)
     keyring.delete_password("astroquery:casda.csiro.au", USERNAME)
-    assert casda._authenticated == True
+    assert casda._authenticated is True
     assert casda.USERNAME == USERNAME
     assert casda._auth == (USERNAME, PASSWORD)
 
+
 def test_query_region_text_radius(patch_get):
     ra = 333.9092
     dec = -45.8418
@@ -324,7 +333,7 @@ def test_stage_data_invalid_credentials(patch_get):
     table = Table([Column(data=access_urls, name='access_url')])
 
     casda = Casda()
-    #Update the casda object to indicate that it has been authenticated
+    # Update the casda object to indicate that it has been authenticated
     casda.USERNAME = USERNAME
     casda._auth = (USERNAME, 'notthepassword')
     casda._authenticated = True

astroquery/casda/tests/test_casda_remote.py

@@ -56,7 +56,7 @@ def test_stage_data(self, cached_credentials):
         prefix = 'https://data.csiro.au/casda_vo_proxy/vo/datalink/links?ID='
         access_urls = [prefix + 'cube-1262']
         table = Table([Column(data=access_urls, name='access_url')])
-        casda = Casda() #os.environ['CASDA_USER'], os.environ['CASDA_PASSWD'])
+        casda = Casda()
         casda.login(username=os.environ['CASDA_USER'])
         casda.POLL_INTERVAL = 3
         urls = casda.stage_data(table)
@@ -65,9 +65,10 @@ def test_stage_data(self, cached_credentials):
         assert str(urls[1]).endswith('image_cube_g300to310.q.fits.checksum')
         assert len(urls) == 2
 
-    @pytest.mark.skipif(('CASDA_USER' not in os.environ),
+    @pytest.mark.skipif(('CASDA_USER' not in os.environ or
+                        'CASDA_PASSWD' not in os.environ),
                         reason='Requires real CASDA user/password (CASDA_USER '
-                               'and CASDA_PASSWD environment variables or password in keyring)')
+                               'and CASDA_PASSWD environment variables)')
     def test_cutout(self):
         prefix = 'https://data.csiro.au/casda_vo_proxy/vo/datalink/links?ID='
         access_urls = [prefix + 'cube-44705']