Skip to content

DEPS: require updated python-dateutil, openpyxl #18182

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Dec 4, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ci/environment-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ dependencies:
- Cython
- NumPy
- moto
- pytest
- python-dateutil
- pytest>=3.1
- python-dateutil>=2.5.0
- python=3
- pytz
- setuptools
Expand Down
2 changes: 1 addition & 1 deletion ci/requirements-2.7.build
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
python=2.7*
python-dateutil=2.4.1
python-dateutil=2.5.0
pytz=2013b
nomkl
numpy
Expand Down
4 changes: 2 additions & 2 deletions ci/requirements-2.7.run
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion ci/requirements-2.7_COMPAT.build
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
python=2.7*
numpy=1.9.2
cython=0.23
dateutil=1.5
python-dateutil=2.5.0
pytz=2013b
2 changes: 1 addition & 1 deletion ci/requirements-2.7_COMPAT.run
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions ci/requirements-2.7_LOCALE.run
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 3 additions & 1 deletion ci/requirements-optional-pip.txt
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions ci/requirements_dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
Cython
NumPy
moto
pytest
python-dateutil
pytest>=3.1
python-dateutil>=2.5.0
pytz
setuptools
sphinx
4 changes: 1 addition & 3 deletions conda.recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
8 changes: 4 additions & 4 deletions doc/source/install.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down Expand Up @@ -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.
Expand Down
6 changes: 2 additions & 4 deletions doc/source/io.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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``

Expand Down
15 changes: 14 additions & 1 deletion doc/source/whatsnew/v0.22.0.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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 | |
+-----------------+-----------------+----------+



Expand Down
20 changes: 4 additions & 16 deletions pandas/compat/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
35 changes: 0 additions & 35 deletions pandas/compat/openpyxl_compat.py

This file was deleted.

Loading