Updated package requirements, and patched a potential source of functional-spatial crashes.

Author: sgiavasis

qap/spatial_qc.py

@@ -383,15 +383,15 @@ def ghost_direction(epi_data, mask_data, direction="y", ref_file=None,
 
     # rotate by n/2
     if direction == "x":
-        n2 = np.floor(mask_data.shape[0]/2)
+        n2 = int(np.floor(mask_data.shape[0]/2))
         n2_mask_data[:n2,:,:] = mask_data[n2:(n2*2),:,:]
         n2_mask_data[n2:(n2*2),:,:] = mask_data[:n2,:,:]
     elif direction == "y":
-        n2 = np.floor(mask_data.shape[1]/2)
+        n2 = int(np.floor(mask_data.shape[1]/2))
         n2_mask_data[:,:n2,:] = mask_data[:,n2:(n2*2),:]
         n2_mask_data[:,n2:(n2*2),:] = mask_data[:,:n2,:]
     elif direction == "z":
-        n2 = np.floor(mask_data.shape[2]/2)
+        n2 = int(np.floor(mask_data.shape[2]/2))
         n2_mask_data[:,:,:n2] = mask_data[:,:,n2:(n2*2)]
         n2_mask_data[:,:,n2:(n2*2)] = mask_data[:,:,:n2]
     else:

qap/test_spatial_qc.py

@@ -275,7 +275,6 @@ def test_fwhm_no_out_vox():
 def test_ghost_direction():
 
     import os
-    import pickle
     import pkg_resources as p
 
     import numpy.testing as nt

qap/version.py

@@ -1 +1 @@
-__version__="1.0.8"
+__version__="1.0.8b"

setup.py

@@ -44,7 +44,8 @@ def main():
                     'reportlab (>=3.3.0)', 'scipy (>=0.17.1)', 
                     'seaborn (>=0.7.0)', 'simplejson (>=3.8.2)', 
                     'six (>=1.10.0)', 'traits (>=4.5.0)', 'wsgiref (>=0.1.2)',
-                    'xhtml2pdf (>=0.1a4)', 'configparser (>=3.5.0)'],
+                    'xhtml2pdf (>=0.1a4)', 'configparser (>=3.5.0)',
+                    'lockfile (>=0.12)'],
           install_requires=['numpy >=1.11.0', 'INDI-Tools >=0.0.6', 
                     'PyPDF2 >=1.26.0', 'PyYAML >=3.11', 'Pillow >=3.2.0', 
                     'argparse >=1.2.1', 'boto3 >=1.3.1', 
@@ -62,7 +63,7 @@ def main():
                     'seaborn >=0.7.0', 'simplejson >=3.8.2', 
                     'six >=1.10.0', 'traits >=4.5.0', 'wsgiref >=0.1.2',
                     'xhtml2pdf >=0.1a4', 'configparser >=3.5.0', 
-                    'numpy >=1.11.0'], 
+                    'numpy >=1.11.0', 'lockfile >=0.12'],
           zip_safe=False)
 
 if __name__ == "__main__":