Merged in pull requests that added unit testing and working docs.

.travis.yml

@@ -0,0 +1,20 @@
+language: python
+
+python:
+    - '2.7'
+    - '3.3'
+    - '3.4'
+    - '3.5'
+
+install:
+    - pip install astropy
+    - pip install matplotlib
+
+script:
+    - py.test
+
+matrix:
+    allow_failures:
+        - python: 3.3
+        - python: 3.4
+        - python: 3.5

README.md

@@ -2,7 +2,7 @@
 
 ## Installation
 
-To install, just do:
+To install:
 
 ```pip install astrodbkit```
 
@@ -19,7 +19,7 @@ db = astrodb.Database(dbpath)
 
 ## Need a database?
 
-To use the BDNYC Database, download the latest data release from [the BDNYCdb repo on Github](https://github.com/BDNYC/BDNYCdb.git).
+To use the BDNYC Database of brown dwarf data, download the latest data release from [the BDNYCdb repo on Github](https://github.com/BDNYC/BDNYCdb.git).
 
 ## Enjoy!
 

astrodbkit/__init__.py

@@ -1,2 +1,2 @@
 from pkg_resources import get_distribution
-__version__ = get_distribution('astrodbkit').version
+__version__ = '0.3.0.post6'

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

astrodbkit/tests/test_astrodb.py

@@ -0,0 +1,54 @@
+import pytest
+import tempfile
+import os
+from astropy.utils.data import download_file
+from .. import astrodb
+
+
+def setup_module(module):
+    db_path = download_file("http://github.com/BDNYC/BDNYCdb/raw/master/BDNYCv1.0.db")
+    module.bdnyc_db = astrodb.Database(db_path)
+    filename = os.path.join(tempfile.mkdtemp(), 'empty_db.db')
+    module.empty_db = astrodb.create_database(filename)
+
+def test_loaddb():
+    print(bdnyc_db)
+    print(empty_db)
+
+def test_search(): 
+    bdnyc_db.search('1234','sources')
+
+def test_inventory():
+    bdnyc_db.inventory(825)
+
+def test_sqlquery():
+    bdnyc_db.query("SELECT s.id, s.ra, s.dec, s.shortname, p.source_id, p.band, p.magnitude "
+        "FROM sources as s JOIN photometry as p ON s.id=p.source_id "
+        "WHERE s.dec<=-10 AND p.band=='W1'")
+
+def test_schema():
+    bdnyc_db.schema('sources')
+
+@pytest.mark.xfail
+def test_add_data():
+    assert False
+
+@pytest.mark.xfail
+def test_clean_up():
+    assert False
+
+@pytest.mark.xfail
+def test_merge():
+    assert False
+
+@pytest.mark.xfail
+def test_output_spectrum():
+    assert False
+
+@pytest.mark.xfail
+def test_plot_spectrum():
+    assert False
+
+@pytest.mark.xfail
+def test_table():
+    assert False

docs/astrodb.rst

@@ -1,7 +1,7 @@
 astrodb module
 ==============
 
-.. automodule:: astrodb
+.. automodule:: astrodbkit.astrodb
    :members:
    :undoc-members:
    :show-inheritance:

docs/votools.rst

@@ -1,7 +1,7 @@
 votools module
 ================
 
-.. automodule:: votools
+.. automodule:: astrodbkit.votools
    :members:
    :undoc-members:
    :show-inheritance:

setup.py

@@ -11,9 +11,11 @@
 from codecs import open
 from os import path
 
+from astrodbkit import __version__
+
 setup(
     name='astrodbkit',
-    version='0.3.0.post6',
+    version=__version__,
     description='Astronomy database management using SQL and Python',
     url='https://github.com/BDNYC/astrodbkit.git',
     author='Joe Filippazzo',