Merge branch 'v0.28.3' into 'v0.28'

V0.28.3

See merge request fsl/fsleyes/fsleyes!122

.ci/test_template.sh

@@ -4,16 +4,6 @@ set -e
 
 apt-get install -y bc
 
-# If running on a fork repository, we merge in the
-# upstream/master branch. This is done so that merge
-# requests from fork to the parent repository will
-# have unit tests run on the merged code, something
-# which gitlab CE does not currently do for us.
-if [[ "$CI_PROJECT_PATH" != "$UPSTREAM_PROJECT" ]]; then
-  git fetch upstream;
-  git merge --no-commit --no-ff upstream/master;
-fi;
-
 source /test.venv/bin/activate
 pip install --upgrade pip
 
@@ -31,11 +21,17 @@ pip install $PIPARGS -r requirements-dev.txt
 # our master versions of the core packages
 # first, they might get downgraded during
 # a subsequent installation.
-#
+
+cat requirements.txt | grep -v "fsl" > tmp.txt
+
 # pyopengl-accelerate is not currently
-# compatible with python 3.7. And it's
-# not necessary for testing.
-cat requirements.txt | grep -v "fsl" | grep -iv "pyopengl-accel" > requirements-ci.txt
+# compatible with python 3.7.
+if [[ `python -V` == "Python 3.7"* ]]; then
+  cat tmp.txt | grep -iv "pyopengl-accel" > requirements-ci.txt
+else
+  mv tmp.txt requirements-ci.txt
+fi
+
 pip install $PIPARGS -r requirements-ci.txt
 pip install $PIPARGS -r requirements-extra.txt
 pip install $PIPARGS -r requirements-notebook.txt

CHANGELOG.rst

@@ -9,6 +9,17 @@ This document contains the ``fsleyes`` release history in reverse
 chronological order.
 
 
+0.28.3 (Sunday 14th April 2019)
+-------------------------------
+
+
+Fixed
+^^^^^
+
+
+* More PyOpenGL / read-only ``numpy`` array workarounds.
+
+
 0.28.2 (Sunday 14th April 2019)
 -------------------------------
 

apidoc/mock_modules.txt

@@ -82,6 +82,7 @@ numpy
 numpy.fft
 numpy.linalg
 pyparsing
+PIL
 scipy
 scipy.interpolate
 scipy.ndimage

fsleyes/gl/gl21/glmesh_funcs.py

@@ -71,8 +71,8 @@ def updateShaderState(self, **kwargs):
         dshader.set('lighting', copts.light)
         dshader.set('lightPos', kwargs['lightPos'])
 
-        dshader.setAtt('vertex',     self.vertices)
-        dshader.setAtt('normal',     self.normals)
+        dshader.setAtt('vertex', self.vertices)
+        dshader.setAtt('normal', self.normals)
 
         if vdata is not None:
 

fsleyes/gl/glmesh.py

@@ -14,6 +14,7 @@ import numpy.linalg as npla
 import OpenGL.GL    as gl
 
 from . import                 globject
+import fsl.data.utils      as dutils
 import fsl.utils.transform as transform
 import fsleyes.gl          as fslgl
 import fsleyes.gl.routines as glroutines
@@ -357,6 +358,9 @@ class GLMesh(globject.GLObject):
         self.vertices = np.asarray(vertices,          dtype=np.float32)
         self.indices  = np.asarray(indices.flatten(), dtype=np.uint32)
 
+        self.vertices = dutils.makeWriteable(self.vertices)
+        self.indices  = dutils.makeWriteable(self.indices)
+
         if self.threedee:
             self.normals = np.array(normals, dtype=np.float32)
 

fsleyes/version.py

@@ -14,7 +14,7 @@ version number. See also the :mod:`fsl.version` module.
 """
 
 
-__version__ = '0.28.2'
+__version__ = '0.28.3'
 """Current version number, as a string. The FSLeyes version number consists
 of three numbers, separated by a period, which roughly obeys the Semantic
 Versioning conventions (http://semver.org/).