DEPS: require updated python-dateutil, openpyxl (#18182)

jreback · web-flow · commit 3e4e4b3bfc38 · 2017-12-04T06:35:44.000-05:00
diff --git a/ci/environment-dev.yaml b/ci/environment-dev.yaml
@@ -6,8 +6,8 @@ dependencies:
   - Cython
   - NumPy
   - moto
-  - pytest
-  - python-dateutil
+  - pytest>=3.1
+  - python-dateutil>=2.5.0
   - python=3
   - pytz
   - setuptools
diff --git a/ci/requirements-2.7.build b/ci/requirements-2.7.build
@@ -1,5 +1,5 @@
 python=2.7*
-python-dateutil=2.4.1
+python-dateutil=2.5.0
 pytz=2013b
 nomkl
 numpy
diff --git a/ci/requirements-2.7.run b/ci/requirements-2.7.run
@@ -1,11 +1,11 @@
-python-dateutil=2.4.1
+python-dateutil=2.5.0
 pytz=2013b
 numpy
 xlwt=0.7.5
 numexpr
 pytables
 matplotlib
-openpyxl=1.6.2
+openpyxl=2.4.0
 xlrd=0.9.2
 sqlalchemy=0.9.6
 lxml
diff --git a/ci/requirements-2.7_COMPAT.build b/ci/requirements-2.7_COMPAT.build
@@ -1,5 +1,5 @@
 python=2.7*
 numpy=1.9.2
 cython=0.23
-dateutil=1.5
+python-dateutil=2.5.0
 pytz=2013b
diff --git a/ci/requirements-2.7_COMPAT.run b/ci/requirements-2.7_COMPAT.run
@@ -1,5 +1,5 @@
 numpy=1.9.2
-dateutil=1.5
+python-dateutil=2.5.0
 pytz=2013b
 scipy=0.14.0
 xlwt=0.7.5
diff --git a/ci/requirements-2.7_LOCALE.run b/ci/requirements-2.7_LOCALE.run
@@ -1,8 +1,8 @@
 python-dateutil
-pytz=2013b
+pytz
 numpy=1.9.2
 xlwt=0.7.5
-openpyxl=1.6.2
+openpyxl=2.4.0
 xlsxwriter=0.5.2
 xlrd=0.9.2
 bottleneck=1.0.0
diff --git a/ci/requirements-optional-pip.txt b/ci/requirements-optional-pip.txt
@@ -1,11 +1,13 @@
 # This file was autogenerated by scripts/convert_deps.py
-# Do not modify directlybeautifulsoup4
+# Do not modify directly
+beautifulsoup4
 blosc
 bottleneck
 fastparquet
 feather-format
 html5lib
 ipython
+ipykernel
 jinja2
 lxml
 matplotlib
diff --git a/ci/requirements_dev.txt b/ci/requirements_dev.txt
@@ -3,8 +3,8 @@
 Cython
 NumPy
 moto
-pytest
-python-dateutil
+pytest>=3.1
+python-dateutil>=2.5.0
 pytz
 setuptools
 sphinx
diff --git a/conda.recipe/meta.yaml b/conda.recipe/meta.yaml
@@ -16,13 +16,11 @@ requirements:
     - cython
     - numpy x.x
     - setuptools
-    - pytz
-    - python-dateutil
 
   run:
     - python
     - numpy x.x
-    - python-dateutil
+    - python-dateutil >=2.5.0
     - pytz
 
 test:
diff --git a/doc/source/install.rst b/doc/source/install.rst
@@ -200,8 +200,8 @@ Dependencies
 
 * `setuptools <https://setuptools.readthedocs.io/en/latest/>`__
 * `NumPy <http://www.numpy.org>`__: 1.9.0 or higher
-* `python-dateutil <http://labix.org/python-dateutil>`__: 1.5 or higher
-* `pytz <http://pytz.sourceforge.net/>`__: Needed for time zone support
+* `python-dateutil <//https://dateutil.readthedocs.io/en/stable/>`__: 2.5.0 or higher
+* `pytz <http://pytz.sourceforge.net/>`__
 
 .. _install.recommended_dependencies:
 
@@ -244,8 +244,8 @@ Optional Dependencies
 * For Excel I/O:
 
   * `xlrd/xlwt <http://www.python-excel.org/>`__: Excel reading (xlrd) and writing (xlwt)
-  * `openpyxl <http://packages.python.org/openpyxl/>`__: openpyxl version 1.6.1
-    or higher (but lower than 2.0.0), or version 2.2 or higher, for writing .xlsx files (xlrd >= 0.9.0)
+  * `openpyxl <http://https://openpyxl.readthedocs.io/en/default/>`__: openpyxl version 2.4.0
+    for writing .xlsx files (xlrd >= 0.9.0)
   * `XlsxWriter <https://pypi.python.org/pypi/XlsxWriter>`__: Alternative Excel writer
 
 * `Jinja2 <http://jinja.pocoo.org/>`__: Template engine for conditional HTML formatting.
diff --git a/doc/source/io.rst b/doc/source/io.rst
@@ -2935,7 +2935,7 @@ Writing Excel Files to Memory
 +++++++++++++++++++++++++++++
 
 Pandas supports writing Excel files to buffer-like objects such as ``StringIO`` or
-``BytesIO`` using :class:`~pandas.io.excel.ExcelWriter`. Pandas also supports Openpyxl >= 2.2.
+``BytesIO`` using :class:`~pandas.io.excel.ExcelWriter`.
 
 .. code-block:: python
 
@@ -2991,9 +2991,7 @@ files if `Xlsxwriter`_ is not available.
 To specify which writer you want to use, you can pass an engine keyword
 argument to ``to_excel`` and to ``ExcelWriter``. The built-in engines are:
 
-- ``openpyxl``: This includes stable support for Openpyxl from 1.6.1. However,
-  it is advised to use version 2.2 and higher, especially when working with
-  styles.
+- ``openpyxl``: version 2.4 or higher is required
 - ``xlsxwriter``
 - ``xlwt``
 
diff --git a/doc/source/whatsnew/v0.22.0.txt b/doc/source/whatsnew/v0.22.0.txt
@@ -86,9 +86,22 @@ Backwards incompatible API changes
 - :func:`Series.fillna` now raises a ``TypeError`` instead of a ``ValueError`` when passed a list, tuple or DataFrame as a ``value`` (:issue:`18293`)
 - :func:`pandas.DataFrame.merge` no longer casts a ``float`` column to ``object`` when merging on ``int`` and ``float`` columns (:issue:`16572`)
 - The default NA value for :class:`UInt64Index` has changed from 0 to ``NaN``, which impacts methods that mask with NA, such as ``UInt64Index.where()`` (:issue:`18398`)
--
 
+.. _whatsnew_0220.api_breaking.deps:
+
+Dependencies have increased minimum versions
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+We have updated our minimum supported versions of dependencies (:issue:`15184`).
+If installed, we now require:
 
+   +-----------------+-----------------+----------+
+   | Package         | Minimum Version | Required |
+   +=================+=================+==========+
+   | python-dateutil | 2.5.0           |    X     |
+   +-----------------+-----------------+----------+
+   | openpyxl        | 2.4.0           |          |
+   +-----------------+-----------------+----------+
 
 
 
diff --git a/pandas/compat/__init__.py b/pandas/compat/__init__.py
@@ -396,25 +396,13 @@ def raise_with_traceback(exc, traceback=Ellipsis):
 If traceback is not passed, uses sys.exc_info() to get traceback."""
 
 
-# http://stackoverflow.com/questions/4126348
-# Thanks to @martineau at SO
-
+# dateutil minimum version
 import dateutil
 
-if PY2 and LooseVersion(dateutil.__version__) == '2.0':
-    # dateutil brokenness
-    raise Exception('dateutil 2.0 incompatible with Python 2.x, you must '
-    'install version 1.5 or 2.1+!')
-
+if LooseVersion(dateutil.__version__) < '2.5':
+    raise ImportError('dateutil 2.5.0 is the minimum required version')
 from dateutil import parser as _date_parser
-if LooseVersion(dateutil.__version__) < '2.0':
-
-    @functools.wraps(_date_parser.parse)
-    def parse_date(timestr, *args, **kwargs):
-        timestr = bytes(timestr)
-        return _date_parser.parse(timestr, *args, **kwargs)
-else:
-    parse_date = _date_parser.parse
+parse_date = _date_parser.parse
 
 
 # https://github.com/pandas-dev/pandas/pull/9123
diff --git a/pandas/compat/openpyxl_compat.py b/pandas/compat/openpyxl_compat.py
diff --git a/pandas/io/excel.py b/pandas/io/excel.py
diff --git a/pandas/tests/indexes/datetimes/test_tools.py b/pandas/tests/indexes/datetimes/test_tools.py
diff --git a/pandas/tests/io/test_excel.py b/pandas/tests/io/test_excel.py
diff --git a/pandas/tests/scalar/test_timestamp.py b/pandas/tests/scalar/test_timestamp.py
diff --git a/setup.py b/setup.py
