Skip to content

Commit 6325a33

Browse files
authored
BLD: bump xlrd min version to 1.2.0 (#35728)
1 parent 0658ce3 commit 6325a33

File tree

6 files changed

+16
-37
lines changed

6 files changed

+16
-37
lines changed

ci/deps/azure-37-locale_slow.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ dependencies:
2424
- pytz=2017.3
2525
- scipy
2626
- sqlalchemy=1.2.8
27-
- xlrd=1.1.0
27+
- xlrd=1.2.0
2828
- xlsxwriter=1.0.2
2929
- xlwt=1.3.0
3030
- html5lib=1.0.1

ci/deps/azure-37-minimum_versions.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ dependencies:
2525
- pytz=2017.3
2626
- pyarrow=0.15
2727
- scipy=1.2
28-
- xlrd=1.1.0
28+
- xlrd=1.2.0
2929
- xlsxwriter=1.0.2
3030
- xlwt=1.3.0
3131
- html5lib=1.0.1

doc/source/getting_started/install.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ s3fs 0.4.0 Amazon S3 access
287287
tabulate 0.8.3 Printing in Markdown-friendly format (see `tabulate`_)
288288
xarray 0.12.0 pandas-like API for N-dimensional data
289289
xclip Clipboard I/O on linux
290-
xlrd 1.1.0 Excel reading
290+
xlrd 1.2.0 Excel reading
291291
xlwt 1.3.0 Excel writing
292292
xsel Clipboard I/O on linux
293293
zlib Compression for HDF5

doc/source/whatsnew/v1.2.0.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ Optional libraries below the lowest tested version may still work, but are not c
122122
+-----------------+-----------------+---------+
123123
| xarray | 0.12.0 | X |
124124
+-----------------+-----------------+---------+
125-
| xlrd | 1.1.0 | |
125+
| xlrd | 1.2.0 | X |
126126
+-----------------+-----------------+---------+
127127
| xlsxwriter | 1.0.2 | X |
128128
+-----------------+-----------------+---------+

pandas/compat/_optional.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"tables": "3.4.3",
2828
"tabulate": "0.8.3",
2929
"xarray": "0.8.2",
30-
"xlrd": "1.1.0",
30+
"xlrd": "1.2.0",
3131
"xlwt": "1.2.0",
3232
"xlsxwriter": "0.9.8",
3333
"numba": "0.46.0",

pandas/tests/io/excel/test_readers.py

+11-32
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
import contextlib
21
from datetime import datetime, time
32
from functools import partial
43
import os
54
from urllib.error import URLError
6-
import warnings
75

86
import numpy as np
97
import pytest
@@ -14,22 +12,6 @@
1412
from pandas import DataFrame, Index, MultiIndex, Series
1513
import pandas._testing as tm
1614

17-
18-
@contextlib.contextmanager
19-
def ignore_xlrd_time_clock_warning():
20-
"""
21-
Context manager to ignore warnings raised by the xlrd library,
22-
regarding the deprecation of `time.clock` in Python 3.7.
23-
"""
24-
with warnings.catch_warnings():
25-
warnings.filterwarnings(
26-
action="ignore",
27-
message="time.clock has been deprecated",
28-
category=DeprecationWarning,
29-
)
30-
yield
31-
32-
3315
read_ext_params = [".xls", ".xlsx", ".xlsm", ".xlsb", ".ods"]
3416
engine_params = [
3517
# Add any engines to test here
@@ -134,21 +116,19 @@ def test_usecols_int(self, read_ext, df_ref):
134116
# usecols as int
135117
msg = "Passing an integer for `usecols`"
136118
with pytest.raises(ValueError, match=msg):
137-
with ignore_xlrd_time_clock_warning():
138-
pd.read_excel(
139-
"test1" + read_ext, sheet_name="Sheet1", index_col=0, usecols=3
140-
)
119+
pd.read_excel(
120+
"test1" + read_ext, sheet_name="Sheet1", index_col=0, usecols=3
121+
)
141122

142123
# usecols as int
143124
with pytest.raises(ValueError, match=msg):
144-
with ignore_xlrd_time_clock_warning():
145-
pd.read_excel(
146-
"test1" + read_ext,
147-
sheet_name="Sheet2",
148-
skiprows=[1],
149-
index_col=0,
150-
usecols=3,
151-
)
125+
pd.read_excel(
126+
"test1" + read_ext,
127+
sheet_name="Sheet2",
128+
skiprows=[1],
129+
index_col=0,
130+
usecols=3,
131+
)
152132

153133
def test_usecols_list(self, read_ext, df_ref):
154134
if pd.read_excel.keywords["engine"] == "pyxlsb":
@@ -597,8 +577,7 @@ def test_sheet_name(self, read_ext, df_ref):
597577
df1 = pd.read_excel(
598578
filename + read_ext, sheet_name=sheet_name, index_col=0
599579
) # doc
600-
with ignore_xlrd_time_clock_warning():
601-
df2 = pd.read_excel(filename + read_ext, index_col=0, sheet_name=sheet_name)
580+
df2 = pd.read_excel(filename + read_ext, index_col=0, sheet_name=sheet_name)
602581

603582
tm.assert_frame_equal(df1, df_ref, check_names=False)
604583
tm.assert_frame_equal(df2, df_ref, check_names=False)

0 commit comments

Comments
 (0)