Merge remote-tracking branch 'upstream/master' into 5hirish-bug_agg_ea_dtype

Author: TomAugspurger

ci/azure-36-locale_slow.yaml

@@ -14,7 +14,7 @@ dependencies:
   - nomkl
   - numexpr
   - numpy
-  - openpyxl=2.5.5
+  - openpyxl
   - psycopg2
   - pymysql
   - pytables

ci/azure-37-locale.yaml

@@ -13,7 +13,7 @@ dependencies:
   - nomkl
   - numexpr
   - numpy
-  - openpyxl=2.5.5
+  - openpyxl
   - psycopg2
   - pymysql
   - pytables

ci/azure-macos-35.yaml

@@ -12,7 +12,7 @@ dependencies:
   - nomkl
   - numexpr
   - numpy=1.12.0
-  - openpyxl=2.5.5
+  - openpyxl
   - pytables
   - python=3.5*
   - pytz

ci/azure-windows-27.yaml

@@ -13,7 +13,7 @@ dependencies:
   - matplotlib=2.0.1
   - numexpr
   - numpy=1.12*
-  - openpyxl=2.5.5
+  - openpyxl
   - pytables
   - python=2.7.*
   - pytz

ci/azure-windows-36.yaml

@@ -7,11 +7,10 @@ dependencies:
   - bottleneck
   - boost-cpp<1.67
   - fastparquet
-  - feather-format
   - matplotlib
   - numexpr
   - numpy=1.14*
-  - openpyxl=2.5.5
+  - openpyxl
   - parquet-cpp
   - pyarrow
   - pytables

ci/azure/windows-py27.yml

@@ -37,7 +37,7 @@ jobs:
       displayName: 'Build'
     - script: |
         call activate %CONDA_ENV%
-        pytest --junitxml=test-data.xml --skip-slow --skip-network pandas -n 2 -r sxX --strict %*
+        pytest --junitxml=test-data.xml --skip-slow --skip-network pandas -n 2 -r sxX --strict --durations=10 %*
       displayName: 'Test'
     - task: PublishTestResults@2
       inputs:

ci/azure/windows.yml

@@ -28,7 +28,7 @@ jobs:
       displayName: 'Build'
     - script: |
         call activate %CONDA_ENV%
-        pytest --junitxml=test-data.xml --skip-slow --skip-network pandas -n 2 -r sxX --strict %*
+        pytest --junitxml=test-data.xml --skip-slow --skip-network pandas -n 2 -r sxX --strict --durations=10 %*
       displayName: 'Test'
     - task: PublishTestResults@2
       inputs:

ci/circle-36-locale.yaml

@@ -13,7 +13,7 @@ dependencies:
   - nomkl
   - numexpr
   - numpy
-  - openpyxl=2.5.5
+  - openpyxl
   - psycopg2
   - pymysql
   - pytables

ci/circle/run_circle.sh

@@ -5,5 +5,5 @@ export PATH="$MINICONDA_DIR/bin:$PATH"
 
 source activate pandas
 
-echo "pytest --strict --junitxml=$CIRCLE_TEST_REPORTS/reports/junit.xml $@ pandas"
-pytest --strict --color=no --junitxml=$CIRCLE_TEST_REPORTS/reports/junit.xml $@ pandas
+echo "pytest --strict --durations=10 --color=no --junitxml=$CIRCLE_TEST_REPORTS/reports/junit.xml $@ pandas"
+pytest       --strict --durations=10 --color=no --junitxml=$CIRCLE_TEST_REPORTS/reports/junit.xml $@ pandas

ci/requirements-optional-conda.txt

@@ -2,7 +2,6 @@ beautifulsoup4>=4.2.1
 blosc
 bottleneck>=1.2.0
 fastparquet
-feather-format
 gcsfs
 html5lib
 ipython>=5.6.0
@@ -12,8 +11,8 @@ lxml
 matplotlib>=2.0.0
 nbsphinx
 numexpr>=2.6.1
-openpyxl=2.5.5
-pyarrow
+openpyxl
+pyarrow>=0.4.1
 pymysql
 pytables>=3.4.2
 pytest-cov