FIX SPLATALOGUE DATA: Merge branch 'splatalogue-setupfix'

Author: keflavich

astroquery/splatalogue/setup_package.py

@@ -4,5 +4,7 @@
 
 def get_package_data():
     paths_test = [os.path.join('data', 'CO_colons.csv')]
+    paths_data = [os.path.join('data','*.json')]
 
-    return {'astroquery.splatalogue.tests': paths_test}
+    return {'astroquery.splatalogue.tests': paths_test,
+            'astroquery.splatalogue': paths_data}

astroquery/splatalogue/tests/test_splatalogue.py

@@ -41,3 +41,8 @@ def test_init(patch_post):
     assert len(x) == len(y)
     assert all(y['Species'] == x['Species'])
     assert all(x['Chemical Name']==y['Chemical Name'])
+
+def test_load_species_table():
+    tbl = splatalogue.load_species_table.species_lookuptable()
+    CO = tbl.find(' CO ')
+    assert len(CO) == 4

setup.py

@@ -70,8 +70,7 @@
 extensions = []
 
 # A dictionary to keep track of all package data to install
-package_data = {PACKAGENAME: ['data/*'],
-                'astroquery.splatalogue':['astroquery/splatalogue/data/*.json']}
+package_data = {PACKAGENAME: ['data/*']}
 
 # A dictionary to keep track of extra packagedir mappings
 package_dirs = {}
@@ -104,7 +103,6 @@
       scripts=scripts,
       requires=['astropy'],
       install_requires=['astropy'],
-      data_files=[('astroquery.splatalogue',['astroquery/splatalogue/data/species.json'])],
       include_package_data=True,
       provides=[PACKAGENAME],
       license=LICENSE,