Merge branch 'release/v0.1.4' of github.com:descarteslabs/descarteslabs-python into release/v0.1.4

Author: samskillman

descarteslabs/scripts/descarteslabs

@@ -1,3 +1,4 @@
+#!/usr/bin/env python
 # Copyright 2017 Descartes Labs.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,7 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-#!/usr/bin/env python
 from __future__ import print_function
 
 import os

descarteslabs/services/raster.py

@@ -226,7 +226,10 @@ def ndarray(
         array = npz['data']
         metadata = json.loads(npz['metadata'].tostring().decode('utf-8'))
 
-        if order == 'image':
-            return array.transpose((1, 2, 0)), metadata
-        elif order == 'gdal':
+        if len(array.shape) > 2:
+            if order == 'image':
+                return array.transpose((1, 2, 0)), metadata
+            elif order == 'gdal':
+                return array, metadata
+        else:
             return array, metadata

descarteslabs/tests/test_raster.py

@@ -54,6 +54,20 @@ def test_ndarray(self):
         except ImportError:
             pass
 
+    @unittest.skipIf(is_external_user(), "currently requires internal user")
+    def test_ndarray_single_band(self):
+        try:
+            data, metadata = self.raster.ndarray(
+                    inputs=['meta_LC80270312016188_v1'],
+                    bands=['red'],
+                    resolution=960,
+                    )
+            self.assertEqual(data.shape, (249, 245))
+            self.assertEqual(data.dtype, np.uint16)
+            self.assertEqual(len(metadata['bands']), 1)
+        except ImportError:
+            pass
+
     @unittest.skipIf(is_external_user(), "currently requires internal user")
     def test_thumbnail(self):
         r = self.raster.raster(