Skip to content

Commit 9c36833

Browse files
committed
DEP: update python-calamine to 0.1.7
1 parent 0e8174f commit 9c36833

16 files changed

+22
-27
lines changed

ci/deps/actions-310.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ dependencies:
4646
- pyqt>=5.15.9
4747
- pyreadstat>=1.2.0
4848
- pytables>=3.8.0
49-
- python-calamine>=0.1.6
49+
- python-calamine>=0.1.7
5050
- pyxlsb>=1.0.10
5151
- s3fs>=2022.11.0
5252
- scipy>=1.10.0

ci/deps/actions-311-downstream_compat.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ dependencies:
4747
- pyqt>=5.15.9
4848
- pyreadstat>=1.2.0
4949
- pytables>=3.8.0
50-
- python-calamine>=0.1.6
50+
- python-calamine>=0.1.7
5151
- pyxlsb>=1.0.10
5252
- s3fs>=2022.11.0
5353
- scipy>=1.10.0

ci/deps/actions-311.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ dependencies:
4646
- pymysql>=1.0.2
4747
- pyreadstat>=1.2.0
4848
- pytables>=3.8.0
49-
- python-calamine>=0.1.6
49+
- python-calamine>=0.1.7
5050
- pyxlsb>=1.0.10
5151
- s3fs>=2022.11.0
5252
- scipy>=1.10.0

ci/deps/actions-39-minimum_versions.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ dependencies:
4848
- pyqt=5.15.9
4949
- pyreadstat=1.2.0
5050
- pytables=3.8.0
51-
- python-calamine=0.1.6
51+
- python-calamine=0.1.7
5252
- pyxlsb=1.0.10
5353
- s3fs=2022.11.0
5454
- scipy=1.10.0

ci/deps/actions-39.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ dependencies:
4646
- pyqt>=5.15.9
4747
- pyreadstat>=1.2.0
4848
- pytables>=3.8.0
49-
- python-calamine>=0.1.6
49+
- python-calamine>=0.1.7
5050
- pyxlsb>=1.0.10
5151
- s3fs>=2022.11.0
5252
- scipy>=1.10.0

ci/deps/circle-310-arm64.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ dependencies:
4646
- pyqt>=5.15.9
4747
- pyreadstat>=1.2.0
4848
- pytables>=3.8.0
49-
- python-calamine>=0.1.6
49+
- python-calamine>=0.1.7
5050
- pyxlsb>=1.0.10
5151
- s3fs>=2022.11.0
5252
- scipy>=1.10.0

doc/source/getting_started/install.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ xlrd 2.0.1 excel Reading Excel
281281
xlsxwriter 3.0.5 excel Writing Excel
282282
openpyxl 3.1.0 excel Reading / writing for xlsx files
283283
pyxlsb 1.0.10 excel Reading for xlsb files
284-
python-calamine 0.1.6 excel Reading for xls/xlsx/xlsb/ods files
284+
python-calamine 0.1.7 excel Reading for xls/xlsx/xlsb/ods files
285285
========================= ================== =============== =============================================================
286286

287287
HTML

environment.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ dependencies:
4848
- pymysql>=1.0.2
4949
- pyreadstat>=1.2.0
5050
- pytables>=3.8.0
51-
- python-calamine>=0.1.6
51+
- python-calamine>=0.1.7
5252
- pyxlsb>=1.0.10
5353
- s3fs>=2022.11.0
5454
- scipy>=1.10.0

pandas/compat/_optional.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"pyarrow": "10.0.1",
4040
"pyreadstat": "1.2.0",
4141
"pytest": "7.3.2",
42-
"python-calamine": "0.1.6",
42+
"python-calamine": "0.1.7",
4343
"pyxlsb": "1.0.10",
4444
"s3fs": "2022.11.0",
4545
"scipy": "1.10.0",

pandas/io/excel/_calamine.py

+6-7
Original file line numberDiff line numberDiff line change
@@ -116,12 +116,11 @@ def _convert_cell(value: _CellValueT) -> Scalar:
116116

117117
return value
118118

119-
rows: list[list[_CellValueT]] = sheet.to_python(skip_empty_area=False)
120-
data: list[list[Scalar]] = []
121-
122-
for row in rows:
123-
data.append([_convert_cell(cell) for cell in row])
124-
if file_rows_needed is not None and len(data) >= file_rows_needed:
125-
break
119+
rows: list[list[_CellValueT]] = sheet.to_python(
120+
skip_empty_area=False, nrows=file_rows_needed
121+
)
122+
data: list[list[Scalar]] = [
123+
[_convert_cell(cell) for cell in row] for row in rows
124+
]
126125

127126
return data

pandas/tests/io/excel/test_readers.py

-4
Original file line numberDiff line numberDiff line change
@@ -1010,10 +1010,6 @@ def test_read_excel_multiindex(self, request, engine, read_ext):
10101010
# see gh-4679
10111011
xfail_datetimes_with_pyxlsb(engine, request)
10121012

1013-
# https://github.com/tafia/calamine/issues/354
1014-
if engine == "calamine" and read_ext == ".ods":
1015-
request.applymarker(pytest.mark.xfail(reason="Last test fails in calamine"))
1016-
10171013
mi = MultiIndex.from_product([["foo", "bar"], ["a", "b"]])
10181014
mi_file = "testmultiindex" + read_ext
10191015

pyproject.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ computation = ['scipy>=1.10.0', 'xarray>=2022.12.0']
6969
fss = ['fsspec>=2022.11.0']
7070
aws = ['s3fs>=2022.11.0']
7171
gcp = ['gcsfs>=2022.11.0', 'pandas-gbq>=0.19.0']
72-
excel = ['odfpy>=1.4.1', 'openpyxl>=3.1.0', 'python-calamine>=0.1.6', 'pyxlsb>=1.0.10', 'xlrd>=2.0.1', 'xlsxwriter>=3.0.5']
72+
excel = ['odfpy>=1.4.1', 'openpyxl>=3.1.0', 'python-calamine>=0.1.7', 'pyxlsb>=1.0.10', 'xlrd>=2.0.1', 'xlsxwriter>=3.0.5']
7373
parquet = ['pyarrow>=10.0.1']
7474
feather = ['pyarrow>=10.0.1']
7575
hdf5 = [# blosc only available on conda (https://github.com/Blosc/python-blosc/issues/297)
@@ -113,7 +113,7 @@ all = ['adbc-driver-postgresql>=0.8.0',
113113
'pyreadstat>=1.2.0',
114114
'pytest>=7.3.2',
115115
'pytest-xdist>=2.2.0',
116-
'python-calamine>=0.1.6',
116+
'python-calamine>=0.1.7',
117117
'pyxlsb>=1.0.10',
118118
'qtpy>=2.3.0',
119119
'scipy>=1.10.0',

requirements-dev.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ pyarrow>=10.0.1
3737
pymysql>=1.0.2
3838
pyreadstat>=1.2.0
3939
tables>=3.8.0
40-
python-calamine>=0.1.6
40+
python-calamine>=0.1.7
4141
pyxlsb>=1.0.10
4242
s3fs>=2022.11.0
4343
scipy>=1.10.0

scripts/tests/data/deps_expected_random.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ dependencies:
4242
- pymysql>=1.0.2
4343
- pyreadstat>=1.1.2
4444
- pytables>=3.6.1
45-
- python-calamine>=0.1.6
45+
- python-calamine>=0.1.7
4646
- pyxlsb>=1.0.8
4747
- s3fs>=2021.08.0
4848
- scipy>=1.7.1

scripts/tests/data/deps_minimum.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ computation = ['scipy>=1.7.1', 'xarray>=0.21.0']
6262
fss = ['fsspec>=2021.07.0']
6363
aws = ['s3fs>=2021.08.0']
6464
gcp = ['gcsfs>=2021.07.0']
65-
excel = ['odfpy>=1.4.1', 'openpyxl>=3.0.7', 'python-calamine>=0.1.6', 'pyxlsb>=1.0.8', 'xlrd>=2.0.1', 'xlsxwriter>=1.4.3']
65+
excel = ['odfpy>=1.4.1', 'openpyxl>=3.0.7', 'python-calamine>=0.1.7', 'pyxlsb>=1.0.8', 'xlrd>=2.0.1', 'xlsxwriter>=1.4.3']
6666
parquet = ['pyarrow>=7.0.0']
6767
feather = ['pyarrow>=7.0.0']
6868
hdf5 = [# blosc only available on conda (https://github.com/Blosc/python-blosc/issues/297)
@@ -101,7 +101,7 @@ all = ['beautifulsoup4>=5.9.3',
101101
'pyreadstat>=1.1.2',
102102
'pytest>=7.3.2',
103103
'pytest-xdist>=2.2.0',
104-
'python-calamine>=0.1.6',
104+
'python-calamine>=0.1.7',
105105
'pyxlsb>=1.0.8',
106106
'qtpy>=2.2.0',
107107
'scipy>=1.7.1',

scripts/tests/data/deps_unmodified_random.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ dependencies:
4242
- pymysql>=1.0.2
4343
- pyreadstat>=1.1.2
4444
- pytables>=3.6.1
45-
- python-calamine>=0.1.6
45+
- python-calamine>=0.1.7
4646
- pyxlsb>=1.0.8
4747
- s3fs>=2021.08.0
4848
- scipy>=1.7.1

0 commit comments

Comments
 (0)