Merge pull request #4 from developmentseed/bug/2-pwd

Add abs paths to allow label-maker cli to work outside module dir

Author: drewbo

.circleci/config.yml

@@ -32,3 +32,9 @@ jobs:
             python test/verify-labels.py
             label-maker package --dest integration --config test/fixtures/integration/config.integration.json
             python test/verify-package.py
+
+            # Retest that `label-maker labels` works, but from outside the module directory
+            cd ~
+            label-maker labels --dest label-maker/integration --config label-maker/test/fixtures/integration/config.integration.json > stdout
+            cd ~/label-maker            
+            python test/verify-labels.py

MANIFEST.in

@@ -1,2 +1,3 @@
 include requirements.txt
 include README.md
+include label_maker/countries.txt

label_maker/label.py

@@ -16,6 +16,7 @@
 from PIL import Image, ImageDraw
 from tilepie import tilereduce
 
+import label_maker
 from label_maker.filter import create_filter
 
 # declare a global accumulator so the workers will have access
@@ -61,9 +62,13 @@ def make_labels(dest_folder, zoom, country, classes, ml_type, bounding_box, **kw
         print('Retiling QA Tiles to zoom level {} (takes a bit)'.format(zoom))
         filtered_geo = op.join(dest_folder, '{}.geojson'.format(country))
         ps = Popen(['tippecanoe-decode', '-c', '-f', mbtiles_file], stdout=PIPE)
-        run(['python', 'label_maker/stream_filter.py', json.dumps(bounding_box)], stdin=ps.stdout, stdout=open(filtered_geo, 'w'))
+        stream_filter_fpath = op.join(op.dirname(label_maker.__file__), 'stream_filter.py')
+        run(['python', stream_filter_fpath, json.dumps(bounding_box)],
+            stdin=ps.stdout, stdout=open(filtered_geo, 'w'))
         ps.wait()
-        run(['tippecanoe', '--no-feature-limit', '--no-tile-size-limit', '-P', '-l', 'osm', '-f', '-z', str(zoom), '-Z', str(zoom), '-o', mbtiles_file_zoomed, filtered_geo])
+        run(['tippecanoe', '--no-feature-limit', '--no-tile-size-limit', '-P',
+             '-l', 'osm', '-f', '-z', str(zoom), '-Z', str(zoom), '-o',
+             mbtiles_file_zoomed, filtered_geo])
 
     # Call tilereduce
     print('Determining labels for each tile')

label_maker/main.py

@@ -18,14 +18,16 @@
 
 logger = logging.getLogger(__name__)
 
+
 def parse_args(args):
     """Create an argument parser with subcommands"""
     desc = 'label_maker (v%s)' % __version__
     dhf = argparse.ArgumentDefaultsHelpFormatter
     parser = argparse.ArgumentParser(description=desc)
 
     pparser = argparse.ArgumentParser(add_help=False)
-    pparser.add_argument('--version', help='Print version and exit', action='version', version=__version__)
+    pparser.add_argument('--version', help='Print version and exit',
+                         action='version', version=__version__)
     pparser.add_argument('--log', default=2, type=int,
                          help='0:all, 1:debug, 2:info, 3:warning, 4:error, 5:critical')
     pparser.add_argument('-c', '--config', default='config.json', type=str,

label_maker/validate.py

@@ -1,7 +1,11 @@
 """Expose a schema for use with cerberus for config validation"""
+import os.path as op
+import label_maker
 
 countries = []
-with open('label_maker/countries.txt') as f:
+module_dir = op.dirname(label_maker.__file__)  # Get module home directory
+
+with open(op.join(module_dir, 'countries.txt')) as f:
     lines = f.readlines()
     for line in lines:
         countries.append(line.strip())