keflavich · Aug 2, 2019 · Apr 22, 2015 · Apr 22, 2015 · Apr 22, 2015 · Apr 22, 2015
diff --git a/.travis.yml b/.travis.yml
@@ -48,6 +48,8 @@ env:
         - CONDA_CHANNELS='astropy'
         - EVENT_TYPE='pull_request push'
         - DEBUG=True
+        # astrometry.net API key
+        - secure: "al9u/QSQfrwNljdu8gYUaT9z4BxEL1FlE4ntsn6eqtN2Y0rurqll+gq46quYjtE6zgcpb0uYtGIubusJkp7ceE6IBGhQdsel4UY16VIqeEuQ3GpVDb4RiJgU51SAjbmXYV1dMAJnOm4Ra41WzxokStKRDdoRraAsae9zK3H6AnI="
 
     matrix:
         - PYTHON_VERSION=2.7 SETUP_CMD='egg_info'

diff --git a/CHANGES b/CHANGES
@@ -17,6 +17,11 @@ cadc
 New Tools and Services
 ----------------------
 
+astrometry_net
+^^^^^^^^^^^^^^
+
+- Module added to interface to astrometry.net plate-solving service. [#1163]
+
 cadc
 ^^^^
 
@@ -37,6 +42,7 @@ gaia
 
 
 
+
 Infrastructure fixes and enhancements
 -------------------------------------
 
@@ -264,7 +270,7 @@ Infrastructure, Utility and Other Changes and Additions
 - New tool ``JPLSDB``: New module for querying JPL's Small Body Database
   Browser [#1214]
 
-- ATOMIC: fix several bugs for using Quantited for the range parameters.
+- ATOMIC: fix several bugs for using Quantities for the range parameters.
   [#1187]
 - CADC: added the get_collections method. [#1482]
 - ESASKY: get_maps() accepts dict or list of (name, Table) pairs as input
@@ -288,7 +294,7 @@ Infrastructure, Utility and Other Changes and Additions
 - MAST: Add functionality for switching to auth.mast when it goes live [#1256]
 - MAST: Support downloading data from multiple missions from the cloud [#1275]
 - MAST: Updating HSC and Gaia catalog calls (bugfix) [#1203]
-- MAST: Fixing bug in catalog criteria querues, and updating remote tests.
+- MAST: Fixing bug in catalog criteria queries, and updating remote tests.
   [#1223]
 - MAST: Fixing mrp_only but and changing default to False [#1238]
 - MAST: TESS input catalog bugfix [#1297]
@@ -312,6 +318,7 @@ Infrastructure, Utility and Other Changes and Additions
 - JPLHorizons: warn if URI is longer than 2000 chars, docs updated
 - JPLSBDB: fix for missing value, test added
 
+
 0.3.8 (2018-04-27)
 ------------------
 

diff --git a/astroquery/astrometry_net/__init__.py b/astroquery/astrometry_net/__init__.py
@@ -0,0 +1,33 @@
+# Licensed under a 3-clause BSD style license - see LICENSE.rst
+
+"""
+astrometry.net
+--------------
+
+:author: Matt Craig (<[email protected]>)
+"""
+
+# Make the URL of the server, timeout and other items configurable
+from astropy import config as _config
+
+
+class Conf(_config.ConfigNamespace):
+    """ Configuration parameters for `astroquery.astrometry_net` """
+
+    api_key = _config.ConfigItem(
+        '',
+        "The Astrometry.net API key."
+    )
+    server = _config.ConfigItem('http://nova.astrometry.net', 'Name of server')
+    timeout = _config.ConfigItem(120,
+                                 'Default timeout for connecting to server')
+
+
+conf = Conf()
+
+# Now import your public class
+# Should probably have the same name as your module
+
+from .core import AstrometryNet, AstrometryNetClass
+
+__all__ = ['AstrometryNet', 'AstrometryNetClass']