Merge pull request #417 from agroener/cosmosim-table-updates

Cosmosim table updates

Author: keflavich

CHANGES

@@ -29,7 +29,6 @@
 - Added new tool: ALMA archive query tool
   http://astroquery.readthedocs.org/en/latest/alma/alma.html
   (#411)
-
 - setup script and installation fixes
 
 0.2 (2014-08-17)

astroquery/alma/core.py

@@ -150,7 +150,6 @@ def _get_dataarchive_url(self):
                 self.dataarchive_url = self.archive_url
         return self.dataarchive_url
 
-
     def stage_data(self, uids, cache=False):
         """
         Stage ALMA data
@@ -205,7 +204,6 @@ def stage_data(self, uids, cache=False):
         self._staging_log['request_id'] = request_id
         log.debug("Request ID: {0}".format(request_id))
 
-
         # Submit a request for the specific request ID identified above
         submission_url = os.path.join(self.dataarchive_url, 'rh', 'submission',
                                       request_id)
@@ -248,7 +246,6 @@ def stage_data(self, uids, cache=False):
             errormessage = root.find('div', id='errorContent').string.strip()
             raise RemoteServiceError(errormessage)
 
-
         data_table = root.findAll('table', class_='list', id='report')[0]
         columns = {'uid':[], 'URL':[], 'size':[]}
         for tr in data_table.findAll('tr'):
@@ -275,7 +272,6 @@ def _HEADER_data_size(self, files):
         """
         Given a list of file URLs, return the data size.  This is useful for
         assessing how much data you might be downloading!
-
         (This is discouraged by the ALMA archive, as it puts unnecessary load
         on their system)
         """
@@ -337,11 +333,9 @@ def retrieve_data_from_uid(self, uids, cache=True):
 
         #log.info("Determining download size for {0} files...".format(len(files)))
         #each_size,totalsize = self.data_size(files)
-
         log.info("Downloading files of size {0}...".format(totalsize.to(u.GB)))
         # TODO: Add cache=cache keyword here.  Currently would have no effect.
         downloaded_files = self.download_files(file_urls)
-
         return downloaded_files
 
     def _parse_result(self, response, verbose=False):
@@ -642,7 +636,6 @@ def _validate_payload(self, payload):
                                     "by the ALMA query service:"
                                     " {0}".format(invalid_params))
 
-
 Alma = AlmaClass()
 
 def clean_uid(uid):

astroquery/alma/tests/test_alma.py

@@ -71,7 +71,6 @@ def test_SgrAstar(monkeypatch):
     monkeypatch.setattr(Alma, '_get_dataarchive_url', _get_dataarchive_url)
     alma = Alma()
     monkeypatch.setattr(alma, '_get_dataarchive_url', _get_dataarchive_url)
-
     # monkeypatch instructions from https://pytest.org/latest/monkeypatch.html
     monkeypatch.setattr(alma, '_request', alma_request)
     # set up local cache path to prevent remote query

astroquery/alma/tests/test_alma_remote.py

@@ -37,15 +37,13 @@ def test_stage_data(self, temp_dir):
 
         result_s = alma.query_object('Sgr A*')
         assert b'2011.0.00217.S' in result_s['Project_code']
-
         uid = result_s['Asdm_uid'][0]
 
         alma.stage_data([uid])
 
     def test_doc_example(self, temp_dir):
         alma = Alma()
         alma.cache_location = temp_dir
-
         m83_data = alma.query_object('M83')
         assert m83_data.colnames == ['Project_code', 'Source_name', 'RA',
                                      'Dec', 'Band', 'Frequency_resolution',

astroquery/cosmosim/core.py

@@ -1,5 +1,24 @@
 # Licensed under a 3-clause BSD style license - see LICENSE.rst
 import os
+import tempfile
+import shutil
 from astropy.tests.helper import pytest, remote_data
-from ...cosmosim import CosmoSim
+try:
+    import keyring
+    HAS_KEYRING = True
+except ImportError:
+    HAS_KEYRING = False
+try:
+    from ...cosmosim import CosmoSim
+    COSMOSIM_IMPORTED = True
+except ImportError:
+    COSMOSIM_IMPORTED = False
 from ...exceptions import LoginError
+
+SKIP_TESTS = not(HAS_KEYRING and COSMOSIM_IMPORTED)
+
+#@pytest.mark.skipif('SKIP_TESTS')
+#@remote_data
+#class TestEso:
+#    def __init__():
+