Merge pull request #40 from pbugnion/fix_release

Minor fixes related to release 0.1.5.

Author: Pascal Bugnion

gmaps/datasets/datasets.py

@@ -22,22 +22,21 @@
 METADATA_FNAME = "metadata.yaml"
 
 def _load_metadata():
-    with pkg_resources.resource_stream(__name__, METADATA_FNAME) as f: 
-        datasets = yaml.load(f)
+    f = pkg_resources.resource_stream(__name__, METADATA_FNAME)
+    datasets = yaml.load(f)
+    f.close()
     return datasets
 
 def list_datasets():
     metadata = _load_metadata()
     return metadata.keys()
 
-    metadata = _load_metadata()
-    return metadata[dataset_name]
-
 def load_dataset(dataset_name):
     metadata = _load_metadata()
     fname = metadata[dataset_name]["data_file"]
     fpath = os.path.join(DATA_DIR, fname)
-    with pkg_resources.resource_stream(__name__, fpath) as f:
-        data = np.genfromtxt(f, delimiter=",", names=True)
+    f = pkg_resources.resource_stream(__name__, fpath)
+    data = np.genfromtxt(f, delimiter=",", names=True)
+    f.close()
     return data
 

setup.py

@@ -127,7 +127,9 @@ def write_readme():
           data_files=[(os.path.join(ipython_dir, "nbextensions/gmaps_js"),
               ["gmaps/js/heatmap_view.js"])],
           classifiers=classifiers,
-          packages=["gmaps"],
+          packages=["gmaps", "gmaps.datasets"],
+          package_dir={"gmaps.datasets" : "gmaps/datasets" },
+          package_data={"gmaps.datasets": ["metadata.yaml","data/*.csv"]},
           url=r"https://github.com/pbugnion/gmaps",
           license="BSD License", 
           platforms=["Linux", "Mac OS", "Windows"]