Merge pull request #2037 from pllim/config-no-write

MNT: Do not write config on import

Author: bsipocz

astroquery/_astropy_init.py

@@ -25,36 +25,9 @@
 
 if not _ASTROPY_SETUP_:  # noqa
     import os
-    from warnings import warn
-    from astropy.config.configuration import (
-        update_default_config,
-        ConfigurationDefaultMissingError,
-        ConfigurationDefaultMissingWarning)
 
     # Create the test function for self test
     from astropy.tests.runner import TestRunner
     test = TestRunner.make_test_runner_in(os.path.dirname(__file__))
     test.__test__ = False
     __all__ += ['test']
-
-    # add these here so we only need to cleanup the namespace at the end
-    config_dir = None
-
-    if not os.environ.get('ASTROPY_SKIP_CONFIG_UPDATE', False):
-        config_dir = os.path.dirname(__file__)
-        config_template = os.path.join(config_dir, __package__ + ".cfg")
-        if os.path.isfile(config_template):
-            try:
-                update_default_config(
-                    __package__, config_dir, version=__version__)
-            except TypeError as orig_error:
-                try:
-                    update_default_config(__package__, config_dir)
-                except ConfigurationDefaultMissingError as e:
-                    wmsg = (e.args[0] +
-                            " Cannot install default profile. If you are "
-                            "importing from source, this is expected.")
-                    warn(ConfigurationDefaultMissingWarning(wmsg))
-                    del e
-                except Exception:
-                    raise orig_error

astroquery/astroquery.cfg

@@ -2,4 +2,4 @@
 
 
 def get_package_data():
-    return {'astroquery': ['astroquery.cfg', 'CITATION']}
+    return {'astroquery': ['CITATION']}

astroquery/setup_package.py

@@ -143,6 +143,16 @@ All query tools allow coordinate-based queries:
 
 For additional guidance and examples, read the documentation for the individual services below.
 
+.. _default_config:
+
+Default configuration file
+--------------------------
+
+To customize this, copy it to your ``$HOME/.astropy/config/astroquery.cfg``,
+uncomment the relevant configuration item(s), and insert your desired value(s).
+
+.. generate_config:: astroquery
+
 Available Services
 ==================