improve config and nc

eggshell/config.py

@@ -30,7 +30,7 @@ def top_level(self):
     @property
     def data(self):
         """Return the path to the data directory."""
-        return join(self.top_level, 'data')
+        return join(self._base, 'data')
 
     @property
     def shapefiles(self):

eggshell/nc/nc_utils.py

@@ -71,23 +71,16 @@ def opendap_or_download(resource, auth_tkt_cookie={}, output_path=None,
         try:
             nc = Dataset(output_file, 'r')
             nc.close()
-        except:
+        except Exception:
             raise IOError("This does not appear to be a valid NetCDF file.")
         return output_file
     return resource
 
 
 def get_variable(resource):
-    """
-    detects processable variable name in netCDF file
-    based on ocgis (compare guess_main_variables)
-
-    :param resource: filepath sting or sorted list for netcdf file(s)
-
-    :returns str: variable name
-    """
-    rds = RequestDataset(resource)
-    return rds.variable
+    """ Moved to ocg_utils"""
+    from eggshell.nc.ocg_utils import get_variable as gv
+    return gv(resource)
 
 
 def guess_main_variables(ncdataset):

eggshell/nc/ocg_utils.py

@@ -84,10 +84,7 @@ def call(resource=[], variable=None, dimension_map=None, agg_selection=True, cal
     import uuid
 
     # prepare the environment
-    env.DIR_SHPCABINET = paths.shapefiles
     env.OVERWRITE = True
-    # env.DIR_OUTPUT = dir_output
-    # LOGGER.debug(' **** env.DIR_OUTPUT  = %s ' % env.DIR_OUTPUT)
 
     if dir_output is None:
         dir_output = abspath(curdir)
@@ -395,6 +392,20 @@ def calc_grouping(grouping):
         raise Exception(msg)
     return calc_grouping
 
+
+def get_variable(resource):
+    """
+    detects processable variable name in netCDF file
+    based on ocgis (compare guess_main_variables)
+
+    :param resource: filepath sting or sorted list for netcdf file(s)
+
+    :returns str: variable name
+    """
+    rds = RequestDataset(resource)
+    return rds.variable
+
+
 # def has_variable(resource, variable):
 #     """Check if resource has variable.
 #