Update names_list() fxn that reads local csv files, Fixes sckott#10

panks · Mar 29, 2015 · 0ecbdf4 · 0ecbdf4
1 parent b3550c2
commit 0ecbdf4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/pytaxize/tax.py b/pytaxize/tax.py
@@ -87,20 +87,23 @@ def names_list(rank = 'genus', size = 10):
      'Ruppiales']
     '''
     if(rank == 'species'):
-        pnpath = resource_filename(__name__, 'pytaxize/data/plantNames.csv')
+        pnpath = resource_filename(__name__, 'data/plantNames.csv')
         dat = pd.read_csv(pnpath, header=False)
         dat2 = dat['names'][:size]
         return [x for x in dat2]
     if(rank == 'genus'):
-        dat = pd.read_csv("../data/plantGenusNames.csv", header=False)
+        pnpath = resource_filename(__name__, 'data/plantGenusNames.csv')
+        dat = pd.read_csv(pnpath, header=False)
         dat2 = dat['names'][:size]
         return [x for x in dat2]
     if(rank == 'family'):
-        dat = pd.read_csv("../data/apg_families.csv", header=False)
+        pnpath = resource_filename(__name__, 'data/apg_families.csv')
+        dat = pd.read_csv(pnpath, header=False)
         dat2 = dat['this'][:size]
         return [x for x in dat2]
     if(rank == 'order'):
-        dat = pd.read_csv("../data/apg_orders.csv", header=False)
+        pnpath = resource_filename(__name__, 'data/apg_orders.csv')
+        dat = pd.read_csv(pnpath, header=False)
         dat2 = dat['this'][:size]
         return [x for x in dat2]
     else:

diff --git a/setup.py b/setup.py
@@ -10,5 +10,5 @@
   install_requires=['requests>2.0',
                     'pandas>0.1',
                     'lxml'],
-  package_data={'pytaxize': ['data/*.csv']},
+  data_files=[('pytaxize/data', ['data/apg_orders.csv', 'data/apg_families.csv', 'data/plantGenusNames.csv', 'data/plantNames.csv', 'data/rank_ref.csv'] )],
 )