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

Author: jbrockmendel

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

@@ -11,7 +11,7 @@ dependencies:
   - matplotlib
   - numexpr
   - numpy=1.14*
-  - openpyxl=2.5.5
+  - openpyxl
   - parquet-cpp
   - pyarrow
   - pytables

ci/circle-36-locale.yaml

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

ci/requirements-optional-conda.txt

@@ -12,7 +12,7 @@ lxml
 matplotlib>=2.0.0
 nbsphinx
 numexpr>=2.6.1
-openpyxl=2.5.5
+openpyxl
 pyarrow
 pymysql
 pytables>=3.4.2

ci/requirements-optional-pip.txt

@@ -14,7 +14,7 @@ lxml
 matplotlib>=2.0.0
 nbsphinx
 numexpr>=2.6.1
-openpyxl==2.5.5
+openpyxl
 pyarrow
 pymysql
 tables

ci/travis-36-doc.yaml

@@ -22,7 +22,7 @@ dependencies:
   - notebook
   - numexpr
   - numpy=1.13*
-  - openpyxl=2.5.5
+  - openpyxl
   - pandoc
   - pyqt
   - pytables

ci/travis-36-slow.yaml

@@ -10,7 +10,7 @@ dependencies:
   - matplotlib
   - numexpr
   - numpy
-  - openpyxl=2.5.5
+  - openpyxl
   - patsy
   - psycopg2
   - pymysql