Merge branch 'main-master' into integration

matthew-brett · matthew-brett · commit 8b99c93b24e7 · 2018-01-15T19:00:56.000Z
* main-master:
  BF: oh dear - another fix for doctest omission
diff --git a/tools/nipnost b/tools/nipnost
@@ -22,7 +22,7 @@ from nipy.fixes.numpy.testing.noseclasses import KnownFailure
 if __name__ == '__main__':
     prepare_imports()
     argv = sys.argv[:] + [fpw_opt_str()]
-    if '--without-doctests' in argv:
+    if '--without-doctest' in argv:
         argv.remove('--without-doctest')
     else:
         argv.append('--with-nipydoctest')
