Merge branch 'rel/2.1.0' into 'v2.1'

Rel/2.1.0

See merge request fsl/fslpy!120

CHANGELOG.rst

@@ -2,8 +2,8 @@ This document contains the ``fslpy`` release history in reverse chronological
 order.
 
 
-2.1.0 (Friday April 12th 2019)
-------------------------------
+2.1.0 (Saturday April 13th 2019)
+--------------------------------
 
 
 Added
@@ -21,8 +21,8 @@ Changed
 
 
 * The :class:`.GiftiMesh` class no longer creates copies of the mesh
-  vertex/index arrays. This means that, with ``numpy>=1.16`` these arrays
-  will be flagged as read-only.
+  vertex/index arrays. This means that, these arrays will be flagged as
+  read-only.
 * The :class:`.Mesh` class handles vertex data sets requiring different
   triangle unwinding orders, at the cost of potentially having to store
   two copies of the mesh indices.

requirements-extra.txt

 indexed_gzip>=0.7.0
 wxpython==4.*
-trimesh>=2.22.28
+trimesh>=2.37.29
 rtree==0.8.3

tests/test_imagewrapper.py

@@ -906,8 +906,8 @@ def _test_ImageWrapper_write_in_overlap(niters, seed, threaded):
                 # on this copy
                 expCovSlice = [slice(int(lo), int(hi)) for lo, hi in expCov.T]
 
-                expLo = expData[expCovSlice].min()
-                expHi = expData[expCovSlice].max()
+                expLo = expData[tuple(expCovSlice)].min()
+                expHi = expData[tuple(expCovSlice)].max()
 
                 wrapper[tuple(sliceobjs)] = newData
                 _ImageWraper_busy_wait(wrapper)