Skip to content

Commit ab49d1f

Browse files
jrebackjreback
authored
CI: bump version of xlsxwriter to 0.5.2 (#17142)
1 parent 7358f09 commit ab49d1f

14 files changed

+34
-23
lines changed

Diff for: ‎ci/install_travis.sh

-3
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,6 @@ conda update -q conda
5252

5353
echo
5454
echo "[add channels]"
55-
# add the pandas channel to take priority
56-
# to add extra packages
57-
conda config --add channels pandas || exit 1
5855
conda config --remove channels defaults || exit 1
5956
conda config --add channels defaults || exit 1
6057

Diff for: ‎ci/requirements-2.7.pip

+2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
blosc
22
pandas-gbq
3+
html5lib
4+
beautifulsoup4
35
pathlib
46
backports.lzma
57
py

Diff for: ‎ci/requirements-2.7.run

+2-4
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,11 @@ xlrd=0.9.2
1010
sqlalchemy=0.9.6
1111
lxml=3.2.1
1212
scipy
13-
xlsxwriter=0.4.6
13+
xlsxwriter=0.5.2
1414
s3fs
1515
bottleneck
16-
psycopg2=2.5.2
16+
psycopg2
1717
patsy
1818
pymysql=0.6.3
19-
html5lib=1.0b2
20-
beautiful-soup=4.2.1
2119
jinja2=2.8
2220
xarray=0.8.0

Diff for: ‎ci/requirements-2.7_COMPAT.pip

+2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
1+
html5lib==1.0b2
2+
beautifulsoup4==4.2.0
13
openpyxl
24
argparse

Diff for: ‎ci/requirements-2.7_COMPAT.run

+2-5
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,10 @@ pytz=2013b
44
scipy=0.11.0
55
xlwt=0.7.5
66
xlrd=0.9.2
7-
bottleneck=0.8.0
87
numexpr=2.2.2
98
pytables=3.0.0
10-
html5lib=1.0b2
11-
beautiful-soup=4.2.0
12-
psycopg2=2.5.1
9+
psycopg2
1310
pymysql=0.6.0
1411
sqlalchemy=0.7.8
15-
xlsxwriter=0.4.6
12+
xlsxwriter=0.5.2
1613
jinja2=2.8

Diff for: ‎ci/requirements-2.7_LOCALE.pip

+2
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1+
html5lib==1.0b2
2+
beautifulsoup4==4.2.1
13
blosc

Diff for: ‎ci/requirements-2.7_LOCALE.run

+1-4
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,9 @@ pytz=2013b
33
numpy=1.8.2
44
xlwt=0.7.5
55
openpyxl=1.6.2
6-
xlsxwriter=0.4.6
6+
xlsxwriter=0.5.2
77
xlrd=0.9.2
8-
bottleneck=0.8.0
98
matplotlib=1.3.1
109
sqlalchemy=0.8.1
11-
html5lib=1.0b2
1210
lxml=3.2.1
1311
scipy
14-
beautiful-soup=4.2.1

Diff for: ‎ci/requirements-2.7_SLOW.run

-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ pytables
1313
sqlalchemy
1414
lxml
1515
s3fs
16-
bottleneck
1716
psycopg2
1817
pymysql
1918
html5lib

Diff for: ‎ci/requirements-3.6.run

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ sqlalchemy
1616
pymysql
1717
feather-format
1818
pyarrow
19-
# psycopg2 (not avail on defaults ATM)
19+
psycopg2
2020
beautifulsoup4
2121
s3fs
2222
xarray

Diff for: ‎ci/requirements-3.6_LOCALE.run

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jinja2
1515
sqlalchemy
1616
pymysql
1717
# feather-format (not available on defaults ATM)
18-
# psycopg2 (not avail on defaults ATM)
18+
psycopg2
1919
beautifulsoup4
2020
s3fs
2121
xarray

Diff for: ‎ci/requirements-3.6_LOCALE_SLOW.run

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jinja2
1515
sqlalchemy
1616
pymysql
1717
# feather-format (not available on defaults ATM)
18-
# psycopg2 (not available on defaults ATM)
18+
psycopg2
1919
beautifulsoup4
2020
s3fs
2121
xarray

Diff for: ‎doc/source/install.rst

+2-1
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,8 @@ Recommended Dependencies
217217
If installed, must be Version 2.4.6 or higher.
218218

219219
* `bottleneck <http://berkeleyanalytics.com/bottleneck>`__: for accelerating certain types of ``nan``
220-
evaluations. ``bottleneck`` uses specialized cython routines to achieve large speedups.
220+
evaluations. ``bottleneck`` uses specialized cython routines to achieve large speedups. If installed,
221+
must be Version 1.0.0 or higher.
221222

222223
.. note::
223224

Diff for: ‎doc/source/whatsnew/v0.21.0.txt

+1
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,7 @@ Other API Changes
205205
^^^^^^^^^^^^^^^^^
206206

207207
- Support has been dropped for Python 3.4 (:issue:`15251`)
208+
- Support has been dropped for bottleneck < 1.0.0 (:issue:`15214`)
208209
- The Categorical constructor no longer accepts a scalar for the ``categories`` keyword. (:issue:`16022`)
209210
- Accessing a non-existent attribute on a closed :class:`~pandas.HDFStore` will now
210211
raise an ``AttributeError`` rather than a ``ClosedFileError`` (:issue:`16301`)

Diff for: ‎pandas/core/nanops.py

+17-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
import itertools
22
import functools
33
import operator
4+
import warnings
5+
from distutils.version import LooseVersion
46

57
import numpy as np
68
from pandas import compat
@@ -20,11 +22,24 @@
2022
from pandas.core.config import get_option
2123
from pandas.core.common import _values_from_object
2224

25+
_BOTTLENECK_INSTALLED = False
26+
_MIN_BOTTLENECK_VERSION = '1.0.0'
27+
2328
try:
2429
import bottleneck as bn
25-
_BOTTLENECK_INSTALLED = True
30+
ver = bn.__version__
31+
_BOTTLENCK_INSTALLED = ver >= LooseVersion(_MIN_BOTTLENECK_VERSION)
32+
33+
if not _BOTTLENECK_INSTALLED:
34+
warnings.warn(
35+
"The installed version of bottleneck {ver} is not supported "
36+
"in pandas and will be not be used\nThe minimum supported "
37+
"version is {min_ver}\n".format(
38+
ver=ver, min_ver=_MIN_BOTTLENECK_VERSION), UserWarning)
39+
2640
except ImportError: # pragma: no cover
27-
_BOTTLENECK_INSTALLED = False
41+
pass
42+
2843

2944
_USE_BOTTLENECK = False
3045

0 commit comments

Comments
 (0)