Branch merge.

BDNYC · Mar 14, 2016 · 010f374 · 010f374
2 parents b8ca895 + dea5627
commit 010f374
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -12,7 +12,7 @@ To start using astrodbkit, launch iPython, import the module, then initialize a
 
 ```
 from astrodbkit import astrodb
-db = astrodb.get_db(dbpath)
+db = astrodb.Database(dbpath)
 ```
 
 [Read the full documentation here.](http://astrodbkit.readthedocs.org/en/latest/index.html)

diff --git a/astrodbkit/__init__.py b/astrodbkit/__init__.py
@@ -0,0 +1,2 @@
+from pkg_resources import get_distribution
+__version__ = get_distribution('astrodbkit').version
diff --git a/astrodbkit/astrodb.py b/astrodbkit/astrodb.py
@@ -917,7 +917,7 @@ def _explicit_query(self, SQL):
 
     elif 'pragma' in SQL.lower():
       columns = ['cid','name','type','notnull','dflt_value','pk']
-    
+
     return SQL, columns
 
 # ==============================================================================================================================================