Merge pull request #35 from kelle/sphinx

Sphinx now working with votools and astrodb
BDNYC · Mar 24, 2016 · f7c92d7 · f7c92d7
2 parents 9fe1a3d + a9600e8
commit f7c92d7
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 20 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -15,6 +15,6 @@ script:
 
 matrix:
     allow_failures:
-        - env: TRAVIS_PYTHON_VERSION=3.3
-        - env: TRAVIS_PYTHON_VERSION=3.4
-        - env: TRAVIS_PYTHON_VERSION=3.5
+        - python: 3.3
+        - python: 3.4
+        - python: 3.5
diff --git a/astrodbkit/astrodb.py b/astrodbkit/astrodb.py
@@ -26,22 +26,20 @@ def create_database(dbpath):
   else: print("Please provide a path and file name with a .db file extension, e.g. /Users/<username>/Desktop/test.db")
 
 class Database:
+  """
+  Initialize the database.
+  
+  Parameters
+  ----------
+  dbpath: str 
+    The path to the database file. 
+  
+  Returns
+  -------
+  object
+    The database object
+  """
   def __init__(self, dbpath):
-    """
-    Initialize the database.
-    
-    Parameters
-    ----------
-    dbpath: str 
-      The path to the database file. 
-    
-    Returns
-    -------
-    object
-      The database object
-         
-    """
-
     if os.path.isfile(dbpath):
 
       # Create connection

diff --git a/docs/astrodb.rst b/docs/astrodb.rst
@@ -1,7 +1,7 @@
 astrodb module
 ==============
 
-.. automodule:: astrodb
+.. automodule:: astrodbkit.astrodb
    :members:
    :undoc-members:
    :show-inheritance:
diff --git a/docs/votools.rst b/docs/votools.rst
@@ -1,7 +1,7 @@
 votools module
 ================
 
-.. automodule:: votools
+.. automodule:: astrodbkit.votools
    :members:
    :undoc-members:
    :show-inheritance: