Merge branch 'master' of https://github.com/pandas-dev/pandas into bool_ops3

Author: jbrockmendel

.pep8speaks.yml

@@ -6,5 +6,7 @@ scanner:
 pycodestyle:
     max-line-length: 79
     ignore:  # Errors and warnings to ignore
-        - E731
-        - E402
+        - E402,  # module level import not at top of file
+        - E731,  # do not assign a lambda expression, use a def
+        - E741,  # do not use variables named 'l', 'O', or 'I'
+        - W503   # line break before binary operator

ci/lint.sh

@@ -37,6 +37,13 @@ if [ "$LINT" ]; then
     fi
     echo "Linting scripts/*.py DONE"
 
+    echo "Linting doc scripts"
+    flake8 doc/make.py doc/source/conf.py
+    if [ $? -ne "0" ]; then
+        RET=1
+    fi
+    echo "Linting doc scripts DONE"
+
     echo "Linting *.pyx"
     flake8 pandas --filename=*.pyx --select=E501,E302,E203,E111,E114,E221,E303,E128,E231,E126,E265,E305,E301,E127,E261,E271,E129,W291,E222,E241,E123,F403
     if [ $? -ne "0" ]; then
@@ -149,6 +156,7 @@ if [ "$LINT" ]; then
         RET=1
     fi
     echo "Check for deprecated messages without sphinx directive DONE"
+    
 else
     echo "NOT Linting"
 fi