Merge branch 'fix-25959' of https://github.com/ThomasKluiters/pandas into fix-25959

Author: ThomasKluiters

.travis.yml

@@ -82,15 +82,10 @@ before_install:
 install:
   - echo "install start"
   - ci/prep_cython_cache.sh
-  - ci/install_travis.sh
+  - ci/setup_env.sh
   - ci/submit_cython_cache.sh
   - echo "install done"
 
-before_script:
-  - ci/install_db_travis.sh
-  - export DISPLAY=":99.0"
-  - ci/before_script_travis.sh
-
 script:
   - echo "script start"
   - source activate pandas-dev

asv_bench/benchmarks/io/csv.py

@@ -4,7 +4,7 @@
 import numpy as np
 import pandas.util.testing as tm
 from pandas import DataFrame, Categorical, date_range, read_csv
-from pandas.compat import cStringIO as StringIO
+from io import StringIO
 
 from ..pandas_vb_common import BaseIO
 

asv_bench/benchmarks/io/excel.py

@@ -1,6 +1,6 @@
+from io import BytesIO
 import numpy as np
 from pandas import DataFrame, date_range, ExcelWriter, read_excel
-from pandas.compat import BytesIO
 import pandas.util.testing as tm
 
 

azure-pipelines.yml

@@ -39,9 +39,8 @@ jobs:
   - script: |
       export PATH=$HOME/miniconda3/bin:$PATH
       sudo apt-get install -y libc6-dev-i386
-      ci/incremental/install_miniconda.sh
-      ci/incremental/setup_conda_environment.sh
-    displayName: 'Set up environment'
+      ci/setup_env.sh
+    displayName: 'Setup environment and build pandas'
     condition: true
 
   # Do not require pandas
@@ -59,13 +58,6 @@ jobs:
     displayName: 'Dependencies consistency'
     condition: true
 
-  - script: |
-      export PATH=$HOME/miniconda3/bin:$PATH
-      source activate pandas-dev
-      ci/incremental/build.sh
-    displayName: 'Build'
-    condition: true
-
   # Require pandas
   - script: |
       export PATH=$HOME/miniconda3/bin:$PATH

ci/azure/posix.yml

@@ -50,17 +50,9 @@ jobs:
   steps:
     - script: |
         if [ "$(uname)" == "Linux" ]; then sudo apt-get install -y libc6-dev-i386 $EXTRA_APT; fi
-        echo "Installing Miniconda"
-        ci/incremental/install_miniconda.sh
-        export PATH=$HOME/miniconda3/bin:$PATH
-        echo "Setting up Conda environment"
-        ci/incremental/setup_conda_environment.sh
-      displayName: 'Before Install'
-    - script: |
-        export PATH=$HOME/miniconda3/bin:$PATH
-        source activate pandas-dev
-        ci/incremental/build.sh
-      displayName: 'Build'
+        echo "Creating Environment"
+        ci/setup_env.sh
+      displayName: 'Setup environment and build pandas'
     - script: |
         export PATH=$HOME/miniconda3/bin:$PATH
         source activate pandas-dev

ci/before_script_travis.sh

@@ -111,8 +111,10 @@ fi
 if [[ -z "$CHECK" || "$CHECK" == "patterns" ]]; then
 
     # Check for imports from pandas.core.common instead of `import pandas.core.common as com`
+    # Check for imports from collections.abc instead of `from collections import abc`
     MSG='Check for non-standard imports' ; echo $MSG
     invgrep -R --include="*.py*" -E "from pandas.core.common import " pandas
+    invgrep -R --include="*.py*" -E "from collections.abc import " pandas
     # invgrep -R --include="*.py*" -E "from numpy import nan " pandas  # GH#24822 not yet implemented since the offending imports have not all been removed
     RET=$(($RET + $?)) ; echo $MSG "DONE"
 

ci/code_checks.sh

@@ -23,6 +23,7 @@ dependencies:
   - pytest-xdist
   - pytest-mock
   - isort
+  - pip
   - pip:
     # for python 3.5, pytest>=4.0.2 is not available in conda
     - pytest>=4.0.2

ci/deps/azure-35-compat.yaml

@@ -25,5 +25,6 @@ dependencies:
   - pytest-mock
   - hypothesis>=3.58.0
   - isort
+  - pip
   - pip:
     - html5lib==1.0b2

ci/deps/azure-36-locale.yaml

@@ -31,5 +31,6 @@ dependencies:
   - pytest-mock
   - moto
   - isort
+  - pip
   - pip:
     - hypothesis>=3.58.0