Merge branch 'master' of https://github.com/USGS-Astrogeology/plio

README.rst

@@ -12,7 +12,8 @@ Planetary Input / Output
 .. image:: https://travis-ci.org/USGS-Astrogeology/plio.svg?branch=master
    :target: https://travis-ci.org/USGS-Astrogeology/plio
 
-.. image:: https://coveralls.io/repos/github/USGS-Astrogeology/plio/badge.svg?branch=master :target: https://coveralls.io/github/USGS-Astrogeology/plio?branch=master
+.. image:: https://coveralls.io/repos/github/USGS-Astrogeology/plio/badge.svg?branch=master 
+   :target: https://coveralls.io/github/USGS-Astrogeology/plio?branch=master
 
 .. image:: https://readthedocs.org/projects/plio/badge/?version=latest
    :target: http://plio.readthedocs.io/en/latest/?badge=latest

conda/build.sh

-#!/bin/bash
-$PYTHON setup.py install

conda/meta.yaml

@@ -3,15 +3,21 @@ package:
   version: 0.1.0
 
 source:
-  git_url: https://github.com/USGS-Astrogeology/plio.git
+  path: ../
+
+build:
+  number: 0
+  skip: true  #[win]
+  script: python setup.py install --single-version-externally-managed --record=record.txt
 
 requirements:
   build:
     - python
+    - setuptools
     - numpy
     - pvl
     - protobuf 3.0.0b2
-    - gdal >=2
+    - gdal
     - icu
     - h5py
     - pandas
@@ -19,14 +25,21 @@ requirements:
     - pyyaml
   run:
     - python
+    - setuptools
     - numpy
     - pvl
     - protobuf 3.0.0b2
-    - gdal >=2
+    - gdal
     - icu
     - h5py
     - pandas
     - sqlalchemy
     - pyyaml
 
+test:
+  imports:
+    - plio
 
+about:
+  home: http://github.com/USGS-Astrogeology/plio
+  license: Public Domain

plio/io/io_gdal.py

@@ -567,7 +567,8 @@ def match_rasters(match_to, match_from, destination,
     match_from__srs = match_from.dataset.GetProjection()
     match_from__gt = match_from.geotransform
 
-    dst = gdal.GetDriverByName('GTiff').Create(destination, width, height, 1, gdalconst.GDT_Float32)
+    dst = gdal.GetDriverByName('GTiff').Create(destination, width, height, match_from.RasterCount,
+                                               gdalconst.GDT_Float32)
     dst.SetGeoTransform(match_to_gt)
     dst.SetProjection(match_to_srs)
 

setup.py

@@ -37,13 +37,16 @@ def setup_package():
                 ['sqlalchemy_json/*.py', 'sqlalchemy_json/LICENSE']},
         zip_safe=False,
         install_requires=[
-            'gdal>=2',
+            'gdal',
+            'numpy',
             'pvl',
             'protobuf==3.0.0b2',
             'h5py',
+            'icu',
             'pandas',
             'sqlalchemy',
-            'pyyaml'],
+            'pyyaml',
+            'certifi'],
         classifiers=[
             "Development Status :: 3 - Alpha",
             "Topic :: Utilities",