Merge pull request #60 from oesteban/sty/W504

MAINT: Better config on setup.py (binary operator starting line)

Author: oesteban

nitransforms/base.py

@@ -155,8 +155,8 @@ def _to_hdf5(self, group):
 
     def __eq__(self, other):
         """Overload equals operator."""
-        return (np.allclose(self.affine, other.affine, rtol=EQUALITY_TOL) and
-                self.shape == other.shape)
+        return (np.allclose(self.affine, other.affine, rtol=EQUALITY_TOL)
+                and self.shape == other.shape)
 
     def __ne__(self, other):
         """Overload not equal operator."""

nitransforms/io/afni.py

@@ -134,9 +134,9 @@ def from_image(cls, imgobj):
         shape = hdr.get_data_shape()
 
         if (
-            len(shape) != 5 or
-            shape[-2] != 1 or
-            not shape[-1] in (2, 3)
+            len(shape) != 5
+            or shape[-2] != 1
+            or not shape[-1] in (2, 3)
         ):
             raise TransformFileError(
                 'Displacements field "%s" does not come from AFNI.' %

nitransforms/io/itk.py

@@ -42,8 +42,8 @@ def __str__(self):
             'Transform: AffineTransform_float_3_3',
             'Parameters: {}'.format(' '.join(
                 ['%g' % p
-                 for p in sa['parameters'][:3, :3].reshape(-1).tolist() +
-                 sa['parameters'][:3, 3].tolist()])),
+                 for p in sa['parameters'][:3, :3].reshape(-1).tolist()
+                 + sa['parameters'][:3, 3].tolist()])),
             'FixedParameters: {:g} {:g} {:g}'.format(*sa['offset']),
             '',
         ]
@@ -241,10 +241,10 @@ def from_string(cls, string):
                  if l.strip()]
 
         if (
-            not lines or
-            not lines[0].startswith('#') or
-           'Insight Transform File V1.0' not in lines[0]
-           ):
+            not lines
+            or not lines[0].startswith('#')
+            or 'Insight Transform File V1.0' not in lines[0]
+        ):
             raise TransformFileError('Unknown Insight Transform File format.')
 
         string = '\n'.join(lines[1:])
@@ -264,9 +264,9 @@ def from_image(cls, imgobj):
         shape = hdr.get_data_shape()
 
         if (
-            len(shape) != 5 or
-            shape[-2] != 1 or
-            not shape[-1] in (2, 3)
+            len(shape) != 5
+            or shape[-2] != 1
+            or not shape[-1] in (2, 3)
         ):
             raise TransformFileError(
                 'Displacements field "%s" does not come from ITK.' %

nitransforms/tests/test_nonlinear.py

@@ -11,7 +11,6 @@
 from ..io.base import TransformFileError
 from ..nonlinear import DisplacementsFieldTransform, load as nlload
 from ..io.itk import ITKDisplacementsField
-from ..io.afni import AFNIDisplacementsField
 
 TESTS_BORDER_TOLERANCE = 0.05
 APPLY_NONLINEAR_CMD = {

setup.cfg

@@ -33,5 +33,22 @@ console_scripts =
     nt = nitransforms.cli:main
 
 [flake8]
-max-line-length = 100
-ignore = D100,D101,D102,D103,D104,D105,D200,D201,D202,D204,D205,D208,D209,D210,D300,D301,D400,D401,D403,E24,E121,E123,E126,E226,E266,E402,E704,E731,F821,I100,I101,I201,N802,N803,N804,N806,W503,W504,W605
+max-line-length = 99
+doctests = False
+ignore =
+    E266
+    W503
+exclude=*build/
+per-file-ignores =
+    **/__init__.py : F401
+    docs/conf.py : E265
+
+[tool:pytest]
+norecursedirs = .git
+addopts = -svx --doctest-modules
+doctest_optionflags = ALLOW_UNICODE NORMALIZE_WHITESPACE ELLIPSIS
+env =
+    PYTHONHASHSEED=0
+filterwarnings =
+    ignore::DeprecationWarning
+junit_family=xunit2