DEP: update python-calamine to 0.1.7

dimastbk · dimastbk · commit 9c36833596e0 · 2023-12-01T17:32:09.000+06:00
diff --git a/ci/deps/actions-310.yaml b/ci/deps/actions-310.yaml
@@ -46,7 +46,7 @@ dependencies:
   - pyqt>=5.15.9
   - pyreadstat>=1.2.0
   - pytables>=3.8.0
-  - python-calamine>=0.1.6
+  - python-calamine>=0.1.7
   - pyxlsb>=1.0.10
   - s3fs>=2022.11.0
   - scipy>=1.10.0
diff --git a/ci/deps/actions-311-downstream_compat.yaml b/ci/deps/actions-311-downstream_compat.yaml
@@ -47,7 +47,7 @@ dependencies:
   - pyqt>=5.15.9
   - pyreadstat>=1.2.0
   - pytables>=3.8.0
-  - python-calamine>=0.1.6
+  - python-calamine>=0.1.7
   - pyxlsb>=1.0.10
   - s3fs>=2022.11.0
   - scipy>=1.10.0
diff --git a/ci/deps/actions-311.yaml b/ci/deps/actions-311.yaml
@@ -46,7 +46,7 @@ dependencies:
   - pymysql>=1.0.2
   - pyreadstat>=1.2.0
   - pytables>=3.8.0
-  - python-calamine>=0.1.6
+  - python-calamine>=0.1.7
   - pyxlsb>=1.0.10
   - s3fs>=2022.11.0
   - scipy>=1.10.0
diff --git a/ci/deps/actions-39-minimum_versions.yaml b/ci/deps/actions-39-minimum_versions.yaml
@@ -48,7 +48,7 @@ dependencies:
   - pyqt=5.15.9
   - pyreadstat=1.2.0
   - pytables=3.8.0
-  - python-calamine=0.1.6
+  - python-calamine=0.1.7
   - pyxlsb=1.0.10
   - s3fs=2022.11.0
   - scipy=1.10.0
diff --git a/ci/deps/actions-39.yaml b/ci/deps/actions-39.yaml
@@ -46,7 +46,7 @@ dependencies:
   - pyqt>=5.15.9
   - pyreadstat>=1.2.0
   - pytables>=3.8.0
-  - python-calamine>=0.1.6
+  - python-calamine>=0.1.7
   - pyxlsb>=1.0.10
   - s3fs>=2022.11.0
   - scipy>=1.10.0
diff --git a/ci/deps/circle-310-arm64.yaml b/ci/deps/circle-310-arm64.yaml
@@ -46,7 +46,7 @@ dependencies:
   - pyqt>=5.15.9
   - pyreadstat>=1.2.0
   - pytables>=3.8.0
-  - python-calamine>=0.1.6
+  - python-calamine>=0.1.7
   - pyxlsb>=1.0.10
   - s3fs>=2022.11.0
   - scipy>=1.10.0
diff --git a/doc/source/getting_started/install.rst b/doc/source/getting_started/install.rst
@@ -281,7 +281,7 @@ xlrd                      2.0.1              excel           Reading Excel
 xlsxwriter                3.0.5              excel           Writing Excel
 openpyxl                  3.1.0              excel           Reading / writing for xlsx files
 pyxlsb                    1.0.10             excel           Reading for xlsb files
-python-calamine           0.1.6              excel           Reading for xls/xlsx/xlsb/ods files
+python-calamine           0.1.7              excel           Reading for xls/xlsx/xlsb/ods files
 ========================= ================== =============== =============================================================
 
 HTML
diff --git a/environment.yml b/environment.yml
@@ -48,7 +48,7 @@ dependencies:
   - pymysql>=1.0.2
   - pyreadstat>=1.2.0
   - pytables>=3.8.0
-  - python-calamine>=0.1.6
+  - python-calamine>=0.1.7
   - pyxlsb>=1.0.10
   - s3fs>=2022.11.0
   - scipy>=1.10.0
diff --git a/pandas/compat/_optional.py b/pandas/compat/_optional.py
@@ -39,7 +39,7 @@
     "pyarrow": "10.0.1",
     "pyreadstat": "1.2.0",
     "pytest": "7.3.2",
-    "python-calamine": "0.1.6",
+    "python-calamine": "0.1.7",
     "pyxlsb": "1.0.10",
     "s3fs": "2022.11.0",
     "scipy": "1.10.0",
diff --git a/pandas/io/excel/_calamine.py b/pandas/io/excel/_calamine.py
@@ -116,12 +116,11 @@ def _convert_cell(value: _CellValueT) -> Scalar:
 
             return value
 
-        rows: list[list[_CellValueT]] = sheet.to_python(skip_empty_area=False)
-        data: list[list[Scalar]] = []
-
-        for row in rows:
-            data.append([_convert_cell(cell) for cell in row])
-            if file_rows_needed is not None and len(data) >= file_rows_needed:
-                break
+        rows: list[list[_CellValueT]] = sheet.to_python(
+            skip_empty_area=False, nrows=file_rows_needed
+        )
+        data: list[list[Scalar]] = [
+            [_convert_cell(cell) for cell in row] for row in rows
+        ]
 
         return data
diff --git a/pandas/tests/io/excel/test_readers.py b/pandas/tests/io/excel/test_readers.py
@@ -1010,10 +1010,6 @@ def test_read_excel_multiindex(self, request, engine, read_ext):
         # see gh-4679
         xfail_datetimes_with_pyxlsb(engine, request)
 
-        # https://github.com/tafia/calamine/issues/354
-        if engine == "calamine" and read_ext == ".ods":
-            request.applymarker(pytest.mark.xfail(reason="Last test fails in calamine"))
-
         mi = MultiIndex.from_product([["foo", "bar"], ["a", "b"]])
         mi_file = "testmultiindex" + read_ext
 
diff --git a/pyproject.toml b/pyproject.toml
@@ -69,7 +69,7 @@ computation = ['scipy>=1.10.0', 'xarray>=2022.12.0']
 fss = ['fsspec>=2022.11.0']
 aws = ['s3fs>=2022.11.0']
 gcp = ['gcsfs>=2022.11.0', 'pandas-gbq>=0.19.0']
-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']
+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']
 parquet = ['pyarrow>=10.0.1']
 feather = ['pyarrow>=10.0.1']
 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',
        'pyreadstat>=1.2.0',
        'pytest>=7.3.2',
        'pytest-xdist>=2.2.0',
-       'python-calamine>=0.1.6',
+       'python-calamine>=0.1.7',
        'pyxlsb>=1.0.10',
        'qtpy>=2.3.0',
        'scipy>=1.10.0',
diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -37,7 +37,7 @@ pyarrow>=10.0.1
 pymysql>=1.0.2
 pyreadstat>=1.2.0
 tables>=3.8.0
-python-calamine>=0.1.6
+python-calamine>=0.1.7
 pyxlsb>=1.0.10
 s3fs>=2022.11.0
 scipy>=1.10.0
diff --git a/scripts/tests/data/deps_expected_random.yaml b/scripts/tests/data/deps_expected_random.yaml
@@ -42,7 +42,7 @@ dependencies:
   - pymysql>=1.0.2
   - pyreadstat>=1.1.2
   - pytables>=3.6.1
-  - python-calamine>=0.1.6
+  - python-calamine>=0.1.7
   - pyxlsb>=1.0.8
   - s3fs>=2021.08.0
   - scipy>=1.7.1
diff --git a/scripts/tests/data/deps_minimum.toml b/scripts/tests/data/deps_minimum.toml
@@ -62,7 +62,7 @@ computation = ['scipy>=1.7.1', 'xarray>=0.21.0']
 fss = ['fsspec>=2021.07.0']
 aws = ['s3fs>=2021.08.0']
 gcp = ['gcsfs>=2021.07.0']
-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']
+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']
 parquet = ['pyarrow>=7.0.0']
 feather = ['pyarrow>=7.0.0']
 hdf5 = [# blosc only available on conda (https://github.com/Blosc/python-blosc/issues/297)
@@ -101,7 +101,7 @@ all = ['beautifulsoup4>=5.9.3',
        'pyreadstat>=1.1.2',
        'pytest>=7.3.2',
        'pytest-xdist>=2.2.0',
-       'python-calamine>=0.1.6',
+       'python-calamine>=0.1.7',
        'pyxlsb>=1.0.8',
        'qtpy>=2.2.0',
        'scipy>=1.7.1',
diff --git a/scripts/tests/data/deps_unmodified_random.yaml b/scripts/tests/data/deps_unmodified_random.yaml
@@ -42,7 +42,7 @@ dependencies:
   - pymysql>=1.0.2
   - pyreadstat>=1.1.2
   - pytables>=3.6.1
-  - python-calamine>=0.1.6
+  - python-calamine>=0.1.7
   - pyxlsb>=1.0.8
   - s3fs>=2021.08.0
   - scipy>=1.7.1
