Changed the scope of --alma-site pytest argument

Author: Adrian Damian

astroquery/alma/core.py

@@ -110,7 +110,7 @@
     },
     'Energy': {
         'Frequency (GHz)': ['frequency', 'frequency', _gen_numeric_sql],
-        'Bandwidth (GHz)': ['bandwidth', 'bandwidth', _gen_numeric_sql],
+        'Bandwidth (Hz)': ['bandwidth', 'bandwidth', _gen_numeric_sql],
         'Spectral resolution (KHz)': ['spectral_resolution',
                                       'em_resolution', _gen_spec_res_sql],
         'Band': ['band_list', 'band_list', _gen_band_list_sql]

astroquery/alma/tests/test_alma_remote.py

@@ -30,6 +30,12 @@
 
 @pytest.fixture
 def alma(request):
+    """
+    Returns an alma client class. `--alma-site` pytest option can be used
+    to have the client run against a specific site
+    :param request: pytest request fixture
+    :return: alma client to use in tests
+    """
     alma = Alma()
     alma_site = request.config.getoption('--alma-site',
                                          'almascience.org')

astroquery/conftest.py

@@ -48,13 +48,12 @@ def pytest_configure(config):
 TESTED_VERSIONS[packagename] = version
 TESTED_VERSIONS['astropy_helpers'] = astropy_helpers_version
 
+
 def pytest_addoption(parser):
     parser.addoption(
         '--alma-site',
         action='store',
         default='almascience.org',
-        help='ALMA site',
-        choices={'almascience.nrao.edu',
-                 'almascience.eso.org',
-                 'almascience.nao.ac.jp'}
+        help='ALMA site (almascience.nrao.edu, almascience.eso.org or '
+             'almascience.nao.ac.jp for example)'
     )

docs/alma/alma.rst

@@ -47,7 +47,7 @@ You can get interactive help to find out what keywords to query for:
 
     Energy
       Frequency (GHz)                   frequency                           frequency
-      Bandwidth (GHz)                   bandwidth                           bandwidth
+      Bandwidth (Hz)                    bandwidth                           bandwidth
       Spectral resolution (KHz)         spectral_resolution                 em_resolution
       Band                              band_list                           band_list
 
@@ -210,7 +210,7 @@ their types.
       asdm_uid             char(32*)                  UID of the ASDM containing this Field.
       authors              char(4000*)                Full list of first author and all co-authors
       band_list            char(30*)                  Space delimited list of bands
-      bandwidth            double          GHz        Total Bandwidth
+      bandwidth            double          Hz         Total Bandwidth
       bib_reference        char(30*)                  Bibliography code
       calib_level          int                        calibration level (2 or 3). 2 if product_type = MOUS, 3 if product_type = GOUS
       cont_sensitivity_bandwidth double          mJy/beam   Estimated noise in the aggregated continuum bandwidth. Note this is an indication only, it does not include the effects of flagging or dynamic range limitations.