Merge remote-tracking branch 'upstream/master' into get_dummies_dtype

Author: Scorpil

.gitignore

@@ -106,4 +106,3 @@ doc/build/html/index.html
 doc/tmp.sv
 doc/source/styled.xlsx
 doc/source/templates/
-doc/source/savefig/

ci/lint.sh

@@ -72,7 +72,13 @@ if [ "$LINT" ]; then
     echo "Linting *.c and *.h DONE"
 
     echo "Check for invalid testing"
-    grep -r -E --include '*.py' --exclude testing.py '(numpy|np)\.testing' pandas
+
+    # Check for the following code in testing:
+    #
+    # np.testing
+    # np.array_equal
+    grep -r -E --include '*.py' --exclude testing.py '(numpy|np)(\.testing|\.array_equal)' pandas/tests/
+
     if [ $? = "0" ]; then
         RET=1
     fi

ci/requirements-3.6.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+source activate pandas
+
+echo "[install 3.6 downstream deps]"
+
+conda install -n pandas -c conda-forge pandas-datareader xarray geopandas seaborn statsmodels scikit-learn dask

ci/requirements-3.6_NUMPY_DEV.build.sh

@@ -12,7 +12,8 @@ PRE_WHEELS="https://7933911d6844c6c53a7d-47bd50c35cd79bd838daf386af554a83.ssl.cf
 pip install --pre --upgrade --timeout=60 -f $PRE_WHEELS numpy scipy
 
 # install dateutil from master
-pip install -U git+git://github.com/dateutil/dateutil.git
+# pip install -U git+git://github.com/dateutil/dateutil.git
+pip install dateutil
 
 # cython via pip
 pip install cython

ci/script_multi.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -e
 
 echo "[script multi]"