Merge remote-tracking branch 'poldracklab/master' into sbref

Author: tsalo

.pep8speaks.yml

@@ -0,0 +1,12 @@
+scanner:
+    diff_only: True  # Only show errors caused by the patch
+    linter: flake8
+
+message:  # Customize the comment made by the bot
+    opened:  # Messages when a new PR is submitted
+        header: "Hello @{name}, thank you for submitting the Pull Request!"
+        footer: "To test for issues locally, `pip install flake8` and then run `flake8 niworkflows`."
+    updated:  # Messages when new commits are added to the PR
+        header: "Hello @{name}, Thank you for updating!"
+        footer: "To test for issues locally, `pip install flake8` and then run `flake8 niworkflows`."
+    no_errors: "Cheers! There are no style issues detected in this Pull Request. :beers: "

setup.cfg

@@ -70,8 +70,7 @@ duecredit =
 pointclouds =
     pyntcloud
 style =
-    flake8 < 3.0
-    flake8-putty
+    flake8 >= 3.7.0
 test =
     pytest >= 4.4
     pytest-xdist >= 1.28

tox.ini

@@ -2,10 +2,9 @@
 max-line-length = 99
 doctests = False
 exclude=*build/
-putty-ignore =
-    */__init__.py : +F401
-    docs/conf.py : +E265
-    /^\s*\.\. _.*?: http/ : +E501
+per-file-ignores =
+    **/__init__.py : F401
+    docs/conf.py : E265
 
 [pytest]
 norecursedirs = .git