Merge remote-tracking branch 'origin/v1.0.x'

.gitignore

@@ -19,5 +19,5 @@ dist
 
 
 ## Ignore build output
-lib/gridfill/_gridfill.c
+gridfill/_gridfill.c
 *.so

.travis.yml

@@ -12,18 +12,18 @@ env:
         - NAME="Python 2.7 (extras)"
           PYTHON_VERSION=2.7
           PACKAGES="${PACKAGES_STANDARD} iris"
-        - NAME="Python 3.3 (standard)"
-          PYTHON_VERSION=3.3
-          PACKAGES="${PACKAGES_STANDARD}"
-        - NAME="Python 3.4 (standard)"
-          PYTHON_VERSION=3.4
-          PACKAGES="${PACKAGES_STANDARD}"
-        - NAME="Python 3.4 (extras)"
-          PYTHON_VERSION=3.4
-          PACKAGES="${PACKAGES_STANDARD} iris"
         - NAME="Python 3.5 (standard)"
           PYTHON_VERSION=3.5
           PACKAGES="${PACKAGES_STANDARD}"
+        - NAME="Python 3.5 (extras)"
+          PYTHON_VERSION=3.5
+          PACKAGES="${PACKAGES_STANDARD} iris"
+        - NAME="Python 3.6 (standard)"
+          PYTHON_VERSION=3.6
+          PACKAGES="${PACKAGES_STANDARD}"
+        - NAME="Python 3.6 (extras)"
+          PYTHON_VERSION=3.6
+          PACKAGES="${PACKAGES_STANDARD} iris"
 
 install:
     # Install Miniconda so we can use it to manage dependencies:
@@ -33,7 +33,7 @@ install:
     - hash -r
     # Set-up extra channels for dependencies:
     - conda config --set always_yes yes --set changeps1 no
-    - conda config --add channels scitools
+    - conda config --add channels conda-forge
     - conda update conda
     - conda info -a
     # Create a test environment with the required Python version:

gridfill/__init__.py

@@ -24,7 +24,7 @@
 
 
 # Define a version string.
-__version__ = '1.0.dev0'
+__version__ = '1.0.dev2'
 
 # Define the objects to be imported by imports of the form:
 #   from gridfill import *

gridfill/gridfill.py

@@ -48,7 +48,7 @@ def _prep_data(grid, xdim, ydim):
     origndim = grid.ndim
     grid, intorder = _order_dims(grid, xdim, ydim)
     intshape = grid.shape
-    grid = grid.reshape(grid.shape[:2] + (np.prod(grid.shape[2:]),))
+    grid = grid.reshape(grid.shape[:2] + (int(np.prod(grid.shape[2:])),))
     info = dict(intshape=intshape, intorder=intorder, origndim=origndim)
     grid = grid.astype(np.float64)
     return grid, info