Merge pull request #2 from sot/unbundle-data

Unbundle TDB data from package tarball for easier conda packaging
sot · Jul 19, 2014 · 36a0541 · 36a0541
2 parents f6cbd66 + ab58df2
commit 36a0541
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,4 +4,5 @@ dist
 doc/_build
 TDB
 Ska/tdb/data/
+*.pyc
 
diff --git a/Ska/tdb/tdb.py b/Ska/tdb/tdb.py
@@ -15,6 +15,8 @@
            'TableView', 'MsidView']
 
 
+SKA = os.environ.get('SKA', os.path.join('proj', 'sot', 'ska'))
+
 # Set None values for module globals that are set in set_tdb_version
 TDB_VERSIONS = None
 TDB_VERSION = None
@@ -61,7 +63,7 @@ def set_tdb_version(version=None):
     global DATA_DIR
     global tables
     global msids
-    version_dirs = glob.glob(os.path.join(os.path.dirname(__file__), 'data', 'p0??'))
+    version_dirs = glob.glob(os.path.join(SKA, 'data', 'Ska.tdb', 'p0??'))
     TDB_VERSIONS = sorted([int(os.path.basename(vdir)[2:]) for vdir in version_dirs])
 
     if version is None:
@@ -70,8 +72,7 @@ def set_tdb_version(version=None):
         raise ValueError('TDB version must be one of the following: {}'.format(TDB_VERSIONS))
 
     TDB_VERSION = version
-    DATA_DIR = os.path.join(os.path.dirname(os.path.abspath(__file__)),
-                            'data', 'p{:03d}'.format(TDB_VERSION))
+    DATA_DIR = os.path.join(SKA, 'data', 'Ska.tdb', 'p{:03d}'.format(TDB_VERSION))
     tables = TableDict()
     msids = MsidView()
 

diff --git a/Ska/tdb/version.py b/Ska/tdb/version.py
@@ -14,7 +14,7 @@
 therein are applicable.
 """
 
-version = '0.3'
+version = '0.4'
 
 _versplit = version.replace('dev', '').split('.')
 major = int(_versplit[0])

diff --git a/setup.py b/setup.py
@@ -10,5 +10,4 @@
       version=version,
       packages=['Ska', 'Ska.tdb'],
       package_dir={'Ska.tdb': 'Ska/tdb'},
-      package_data={'Ska.tdb': ['data/p0*/*.npy']},
       )
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,4 +4,5 @@ dist @@
     doc/_build
     TDB
     Ska/tdb/data/
+    *.pyc