diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 2a39c518a672f2f34d24981eb8986d1a9e7a12f2..3c259ef294d3e2c5e9891356cf22d8ac34fc38f6 100644 --- a/CHANGELOG.rst +++ b/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. diff --git a/requirements-extra.txt b/requirements-extra.txt index 6d8a4c4b960fb3d8447940c410b486765be4fc41..774efb03f31ee244da45acd703238d60c02191b8 100644 --- a/requirements-extra.txt +++ b/requirements-extra.txt @@ -1,4 +1,4 @@ indexed_gzip>=0.7.0 wxpython==4.* -trimesh>=2.22.28 +trimesh>=2.37.29 rtree==0.8.3 diff --git a/tests/test_imagewrapper.py b/tests/test_imagewrapper.py index 61ed5c21bbdbccef14f769b4547f9fdb8c6fd8a4..65c790ce3f41300b13cc1dfec07b6f93c8a2e0dd 100644 --- a/tests/test_imagewrapper.py +++ b/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)