Update to v0.4 / v1.0 astropy configuration system

astroquery/astroquery.cfg

@@ -0,0 +1,197 @@
+[besancon]
+
+# Besancon download URL.  Changed to modele2003 in 2013.
+# Options: ftp://sasftp.obs-besancon.fr/modele/modele2003/, ftp://sasftp.obs-besancon.fr/modele/
+#besancon_download_url = ftp://sasftp.obs-besancon.fr/modele/modele2003/
+
+# Besancon model form URL
+# Options: http://model.obs-besancon.fr/modele_form.php
+#besancon_model_Form = http://model.obs-besancon.fr/modele_form.php
+
+# Amount of time before pinging the Besancon server to see if the file is
+# ready.  Minimum 30s.
+#besancon_ping_delay = 30.0
+
+# Timeout for Besancon query
+#besancon_timeout = 30.0
+
+[eso]
+
+# maximum number of rows returned (set to -1 for unlimited).
+#row_limit = 50
+
+[fermi]
+
+# Fermi query URL
+# Options: http://fermi.gsfc.nasa.gov/cgi-bin/ssc/LAT/LATDataQuery.cgi
+#fermi_url = http://fermi.gsfc.nasa.gov/cgi-bin/ssc/LAT/LATDataQuery.cgi
+
+# time limit for connecting to FERMI server
+#timeout = 60
+
+# time limit for retrieving a data file once it has been located
+#retrieval_timeout = 120
+
+[irsa]
+
+# Name of the IRSA mirror to use.
+# Options: http://irsa.ipac.caltech.edu/cgi-bin/Gator/nph-query
+#irsa_server = http://irsa.ipac.caltech.edu/cgi-bin/Gator/nph-query
+
+# URL from which to list all the public catalogs in IRSA.
+# Options: http://irsa.ipac.caltech.edu/cgi-bin/Gator/nph-scan
+#gator_list_catalogs = http://irsa.ipac.caltech.edu/cgi-bin/Gator/nph-scan
+
+# maximum number of rows to retrieve in result
+#row_limit = 500
+
+# time limit for connecting to the IRSA server
+#timeout = 60
+
+[irsa_dust]
+
+# Name of the irsa_dust server to use
+# Options: http://irsa.ipac.caltech.edu/cgi-bin/DUST/nph-dust
+#irsa_dust_server = http://irsa.ipac.caltech.edu/cgi-bin/DUST/nph-dust
+
+# default timeout for connecting to server
+#timeout = 30
+
+[magpis]
+
+# Name of the MAGPIS server.
+# Options: http://third.ucllnl.org/cgi-bin/gpscutout
+#magpis_server = http://third.ucllnl.org/cgi-bin/gpscutout
+
+# time limit for connecting to MAGPIS server
+#timeout = 60
+
+[ned]
+
+# Name of the NED mirror to use.
+# Options: http://ned.ipac.caltech.edu/cgi-bin/
+#ned_server = http://ned.ipac.caltech.edu/cgi-bin/
+
+# time limit for connecting to NED server
+#timeout = 60
+
+# value of the Hubble Constant for many NED queries.
+# Options: 73, 70.5
+#hubble_constant = 73
+
+# the correct redshift for NED queries, see comments above.
+# Options: 1, 2, 3, 4
+#correct_redshift = 1
+
+# Frame in which to display the coordinates in the output.
+# Options: Equatorial, Ecliptic, Galactic, SuperGalactic
+#output_coordinate_frame = Equatorial
+
+# Equinox for the output coordinates.
+# Options: J2000.0, B1950.0
+#output_equinox = J2000.0
+
+# display output sorted by this criteria.
+# Options: RA or Longitude, DEC or Latitude, GLON, GLAT, Redshift - ascending, Redshift - descending
+#sort_output_by = RA or Longitude
+
+[nist]
+
+# Name of the NIST URL to query.
+# Options: http://physics.nist.gov/cgi-bin/ASD/lines1.pl
+#nist_server = http://physics.nist.gov/cgi-bin/ASD/lines1.pl
+
+# time limit for connecting to NIST server
+#timeout = 30
+
+[nrao]
+
+# Name of the NRAO mirror to use.
+# Options: https://archive.nrao.edu/archive/ArchiveQuery
+#nrao_server = https://archive.nrao.edu/archive/ArchiveQuery
+
+# time limit for connecting to NRAO server
+#timeout = 60
+
+[nvas]
+
+# Name of the NVAS mirror to use.
+# Options: https://webtest.aoc.nrao.edu/cgi-bin/lsjouwer/archive-pos.pl
+#nvas_server = https://webtest.aoc.nrao.edu/cgi-bin/lsjouwer/archive-pos.pl
+
+# time limit for connecting to NVAS server
+#timeout = 60
+
+[ogle]
+
+# Name of the OGLE mirror to use.
+# Options: http://ogle.astrouw.edu.pl/cgi-ogle/getext.py
+#ogle_server = http://ogle.astrouw.edu.pl/cgi-ogle/getext.py
+
+# Time limit for connecting to the OGLE server.
+#timeout = 60
+
+[sdss]
+
+# Link to SDSS website.
+#sdss_server = http://data.sdss3.org/sas/dr10
+
+# Max number of queries allowed per second
+#maxqueries = 1
+
+# Default timeout for connecting to server
+#timeout = 30
+
+[simbad]
+
+# Name of the SIMBAD mirror to use.
+# Options: simbad.u-strasbg.fr, simbad.harvard.edu
+#simbad_server = simbad.u-strasbg.fr
+
+# time limit for connecting to Simbad server
+#timeout = 60
+
+# maximum number of rows that will be fetched from the result.
+#row_limit = 0
+
+[splatalogue]
+
+#Splatalogue SLAP interface URL (not used). = http://find.nrao.edu/splata-slap/slap
+
+#Splatalogue web interface URL. = http://www.cv.nrao.edu/php/splat/c_export.php
+
+# default timeout for connecting to server
+#timeout = 60
+
+#Limit to number of lines exported = 10000
+
+[template_module]
+
+# put a brief description of the item here
+# Options: http://dummy_server_mirror_1, http://dummy_server_mirror_2, http://dummy_server_mirror_n
+#server = http://dummy_server_mirror_1
+
+# default timeout for connecting to server
+#timeout = 30
+
+[ukidss]
+
+# Name of the UKIDSS mirror to use.
+# Options: http://surveys.roe.ac.uk:8080/wsa/
+#ukidss_server = http://surveys.roe.ac.uk:8080/wsa/
+
+# time limit for connecting to UKIDSS server
+#timeout = 60
+
+[vizier]
+
+# Name of the VizieR mirror to use.
+# Options: vizier.u-strasbg.fr, vizier.nao.ac.jp, vizier.hia.nrc.ca, vizier.ast.cam.ac.uk, vizier.cfa.harvard.edu, www.ukirt.jach.hawaii.edu, vizier.iucaa.ernet.in, vizier.china-vo.org
+#vizier_server = vizier.u-strasbg.fr
+
+# default timeout for connecting to server
+#timeout = 60
+
+# maximum number of rows that will be fetched from the result (set to -1 for
+# unlimited).
+#row_limit = 50

astroquery/atomic/__init__.py

@@ -88,4 +88,5 @@ class Conf(_config.ConfigNamespace):
 
 from .core import AtomicLineList, AtomicLineListClass
 
-__all__ = ['AtomicLineList', 'AtomicLineListClass', 'Transition', 'conf']
+__all__ = ['AtomicLineList', 'AtomicLineListClass', 'Transition', 'conf',
+           'Conf']

astroquery/cosmosim/__init__.py

@@ -18,11 +18,11 @@ class Conf(_config.ConfigNamespace):
     """
 
     query_url = _config.ConfigItem(
-        ['http://www.cosmosim.org/uws/query'],
+        'http://www.cosmosim.org/uws/query',
         'CosmoSim UWS query URL'
         )
     schema_url = _config.ConfigItem(
-        ['http://www.cosmosim.org/query/account/databases/json'],
+        'http://www.cosmosim.org/query/account/databases/json',
         'CosmoSim json query URL for generating database schema'
         )
     timeout = _config.ConfigItem(

astroquery/cosmosim/core.py

@@ -40,14 +40,12 @@ class CosmoSimClass(QueryWithLogin):
 
     def __init__(self):
         super(CosmoSimClass, self).__init__()
-        #self.session = self._BaseQuery__session
 
     def _login(self, username, password=None, store_password=False):
 
         # login after logging out (interactive)
         if not hasattr(self,'session'):
             self.session = requests.session()
-            #self._BaseQuery__session = self.session # NOTE FROM AG: I hope this works...
 
         # login after login (interactive)
         if hasattr(self,'username'):

astroquery/irsa_dust/__init__.py

@@ -18,7 +18,7 @@ class Conf(_config.ConfigNamespace):
     """
     # maintain a list of URLs in case the user wants to append a mirror
     server = _config.ConfigItem(
-        ['http://irsa.ipac.caltech.edu/cgi-bin/DUST/nph-dust'],
+        'http://irsa.ipac.caltech.edu/cgi-bin/DUST/nph-dust',
         'Name of the irsa_dust server to use.'
         )
     timeout = _config.ConfigItem(

astroquery/magpis/__init__.py

@@ -19,7 +19,7 @@ class Conf(_config.ConfigNamespace):
     Configuration parameters for `astroquery.magpis`.
     """
     server = _config.ConfigItem(
-        ['http://third.ucllnl.org/cgi-bin/gpscutout'],
+        'http://third.ucllnl.org/cgi-bin/gpscutout',
         'Name of the MAGPIS server.'
         )
     timeout = _config.ConfigItem(

astroquery/ned/__init__.py

@@ -31,7 +31,7 @@ class Conf(_config.ConfigNamespace):
     Configuration parameters for `astroquery.ned`.
     """
     server = _config.ConfigItem(
-        ['http://ned.ipac.caltech.edu/cgi-bin/'],
+        'http://ned.ipac.caltech.edu/cgi-bin/',
         'Name of the NED server to use.'
         )
     timeout = _config.ConfigItem(
@@ -55,30 +55,31 @@ class Conf(_config.ConfigNamespace):
     (4) To the Reference Frame defined by the (Virgo + GA + Shapley)
     """
     correct_redshift = _config.ConfigItem(
-        [1, 2, 3, 4],
-        'The correct redshift for NED queries, see comments above..'
+        defaultvalue=1,
+        description='The correct redshift for NED queries, see comments above..',
+        #cfgtype=[1, 2, 3, 4],
         )
 
     # Set output parameters of choice
     output_coordinate_frame = _config.ConfigItem(
-        ['Equatorial',
-         'Ecliptic',
-         'Galactic',
-         'SuperGalactic'],
-        'Frame in which to display the coordinates in the output.'
+        defaultvalue='Equatorial',
+        description='Frame in which to display the coordinates in the output.',
+        #cfgtype=['Equatorial', 'Ecliptic', 'Galactic', 'SuperGalactic']
         )
     output_equinox = _config.ConfigItem(
-        ['J2000.0', 'B1950.0'],
-        'Equinox for the output coordinates.'
+        defaultvalue='J2000.0',
+        description='Equinox for the output coordinates.',
+        #['J2000.0', 'B1950.0'],
         )
     sort_output_by = _config.ConfigItem(
-        ["RA or Longitude",
-         "DEC or Latitude",
-         "GLON",
-         "GLAT",
-         "Redshift - ascending",
-         "Redshift - descending"],
-        'Display output sorted by this criteria.'
+        defaultvalue="RA or Longitude",
+        description='Display output sorted by this criteria.',
+        #["RA or Longitude",
+        # "DEC or Latitude",
+        # "GLON",
+        # "GLAT",
+        # "Redshift - ascending",
+        # "Redshift - descending"],
         )
 
 conf = Conf()

astroquery/nist/__init__.py

@@ -10,7 +10,7 @@ class Conf(_config.ConfigNamespace):
     Configuration parameters for `astroquery.nist`.
     """
     server = _config.ConfigItem(
-        ['http://physics.nist.gov/cgi-bin/ASD/lines1.pl'],
+        'http://physics.nist.gov/cgi-bin/ASD/lines1.pl',
         'Name of the NIST URL to query.'
         )
     timeout = _config.ConfigItem(

astroquery/nrao/__init__.py

@@ -10,7 +10,7 @@ class Conf(_config.ConfigNamespace):
     Configuration parameters for `astroquery.nrao`.
     """
     server = _config.ConfigItem(
-        ['https://archive.nrao.edu/archive/ArchiveQuery'],
+        'https://archive.nrao.edu/archive/ArchiveQuery',
         'Name of the NRAO mirror to use.'
         )
     timeout = _config.ConfigItem(

astroquery/nvas/__init__.py

@@ -16,7 +16,7 @@ class Conf(_config.ConfigNamespace):
     Configuration parameters for `astroquery.nvas`.
     """
     server = _config.ConfigItem(
-        ['https://webtest.aoc.nrao.edu/cgi-bin/lsjouwer/archive-pos.pl'],
+        'https://webtest.aoc.nrao.edu/cgi-bin/lsjouwer/archive-pos.pl',
         'Name of the NVAS mirror to use.'
         )
     timeout = _config.ConfigItem(

astroquery/ogle/__init__.py

@@ -21,7 +21,7 @@ class Conf(_config.ConfigNamespace):
     Configuration parameters for `astroquery.ogle`.
     """
     server = _config.ConfigItem(
-        ['http://ogle.astrouw.edu.pl/cgi-ogle/getext.py'],
+        'http://ogle.astrouw.edu.pl/cgi-ogle/getext.py',
         'Name of the OGLE mirror to use.'
         )
     timeout = _config.ConfigItem(

astroquery/sdss/__init__.py

@@ -13,7 +13,7 @@ class Conf(_config.ConfigNamespace):
     Configuration parameters for `astroquery.sdss`.
     """
     server = _config.ConfigItem(
-        ['http://data.sdss3.org/sas/dr12'],
+        'http://data.sdss3.org/sas/dr12',
         'Link to SDSS website.'
         )
     timeout = _config.ConfigItem(

astroquery/setup_package.py

@@ -0,0 +1,4 @@
+# Licensed under a 3-clause BSD style license - see LICENSE.rst
+
+def get_package_data():
+    return {'astroquery': ['astroquery.cfg']}

astroquery/simbad/__init__.py

@@ -16,8 +16,9 @@ class Conf(_config.ConfigNamespace):
     Configuration parameters for `astroquery.simbad`.
     """
     server = _config.ConfigItem(
-        ['simbad.u-strasbg.fr', 'simbad.harvard.edu'],
+        'simbad.u-strasbg.fr',
         'Name of the SIMBAD mirror to use.'
+        #['simbad.u-strasbg.fr', 'simbad.harvard.edu'],
         )
     timeout = _config.ConfigItem(
         60,

astroquery/simbad/tests/test_simbad.py

@@ -125,19 +125,19 @@ def test_parse_result():
                          [([ICRS_COORDS], dict(radius=5.0 * u.deg, frame='ICRS',
                                                equinox=2000.0, epoch='J2000',
                                                caller='query_region_async'),
-                          ("\nvotable {" + votable_fields + "}\n"
+                          ("set limit 50\nvotable {" + votable_fields + "}\n"
                            "votable open\n"
                            "query coo  5:35:17.3 -80:52:00 "
                            "radius=5d frame=ICRS equi=2000.0 epoch=J2000 \n"
                            "votable close")),
                           (["m [0-9]"], dict(wildcard=True, caller='query_object_async'),
-                           ("\nvotable {" + votable_fields + "}\n"
+                           ("set limit 50\nvotable {" + votable_fields + "}\n"
                             "votable open\n"
                             "query id wildcard m [0-9]  \n"
                             "votable close"
                             )),
                           (["2006ApJ"], dict(caller='query_bibcode_async', get_raw=True),
-                           ("\n\n\nquery bibcode  2006ApJ  \n"))
+                           ("set limit 50\n\n\nquery bibcode  2006ApJ  \n"))
                           ])
 def test_args_to_payload(args, kwargs, expected_script):
     script = simbad.Simbad._args_to_payload(*args, **kwargs)['script']