python-calamine 0.3.2__tar.gz → 0.4.0__tar.gz

{python_calamine-0.3.2 → python_calamine-0.4.0}/Cargo.lock

@@ -133,9 +133,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "chrono"
-version = "0.4.40"
+version = "0.4.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a7964611d71df112cb1730f2ee67324fcf4d0fc6606acbbe9bfe06df124637c"
+checksum = "c469d952047f47f91b68d1cba3f10d63c11d73e4636f24f08daf0278abf01c4d"
 dependencies = [
  "android-tzdata",
  "iana-time-zone",
@@ -429,11 +429,10 @@ dependencies = [
 
 [[package]]
 name = "pyo3"
-version = "0.24.1"
+version = "0.25.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17da310086b068fbdcefbba30aeb3721d5bb9af8db4987d6735b2183ca567229"
+checksum = "8970a78afe0628a3e3430376fc5fd76b6b45c4d43360ffd6cdd40bdde72b682a"
 dependencies = [
- "cfg-if",
  "chrono",
  "indoc",
  "libc",
@@ -448,9 +447,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-build-config"
-version = "0.24.1"
+version = "0.25.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e27165889bd793000a098bb966adc4300c312497ea25cf7a690a9f0ac5aa5fc1"
+checksum = "458eb0c55e7ece017adeba38f2248ff3ac615e53660d7c71a238d7d2a01c7598"
 dependencies = [
  "once_cell",
  "python3-dll-a",
@@ -459,9 +458,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-ffi"
-version = "0.24.1"
+version = "0.25.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05280526e1dbf6b420062f3ef228b78c0c54ba94e157f5cb724a609d0f2faabc"
+checksum = "7114fe5457c61b276ab77c5055f206295b812608083644a5c5b2640c3102565c"
 dependencies = [
  "libc",
  "pyo3-build-config",
@@ -469,9 +468,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-file"
-version = "0.12.0"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d97fbb05588c29774af01833e598fae7e714a3f87d36b286e0466f6b678e4a7"
+checksum = "75916300df50dbfa6958ec05fe53473e69474542dac7fd1275aa6869a18a241a"
 dependencies = [
  "pyo3",
  "skeptic",
@@ -479,9 +478,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros"
-version = "0.24.1"
+version = "0.25.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c3ce5686aa4d3f63359a5100c62a127c9f15e8398e5fdeb5deef1fed5cd5f44"
+checksum = "a8725c0a622b374d6cb051d11a0983786448f7785336139c3c94f5aa6bef7e50"
 dependencies = [
  "proc-macro2",
  "pyo3-macros-backend",
@@ -491,9 +490,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros-backend"
-version = "0.24.1"
+version = "0.25.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4cf6faa0cbfb0ed08e89beb8103ae9724eb4750e3a78084ba4017cbe94f3855"
+checksum = "4109984c22491085343c05b0dbc54ddc405c3cf7b4374fc533f5c3313a572ccc"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -504,7 +503,7 @@ dependencies = [
 
 [[package]]
 name = "python-calamine"
-version = "0.3.2"
+version = "0.4.0"
 dependencies = [
  "calamine",
  "chrono",

{python_calamine-0.3.2 → python_calamine-0.4.0}/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "python-calamine"
-version = "0.3.2"
+version = "0.4.0"
 authors = ["Dmitriy <dimastbk@proton.me>"]
 description = "Python binding for Rust's library for reading excel and odf file - calamine"
 edition = "2021"
@@ -15,13 +15,13 @@ crate-type = ["cdylib"]
 
 [dependencies]
 calamine = { git = "https://github.com/tafia/calamine.git", rev = "5cda5c734661f656bdfb7ac7a1b95e77bf89aa09", features = ["dates"] }
-pyo3 = { version = "0.24.0", features = [
+pyo3 = { version = "0.25.1", features = [
     "extension-module",
     "chrono",
     "generate-import-lib",
 ] }
 chrono = { version = "0.4.38", features = ["serde"] }
-pyo3-file = "0.12.0"
+pyo3-file = "0.13.0"
 
 [build-dependencies]
-pyo3-build-config = "0.24.0"
+pyo3-build-config = "0.25.1"

{python_calamine-0.3.2 → python_calamine-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-calamine
-Version: 0.3.2
+Version: 0.4.0
 Classifier: Development Status :: 4 - Beta
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Rust

{python_calamine-0.3.2 → python_calamine-0.4.0}/python/python_calamine/_python_calamine.pyi

@@ -89,6 +89,18 @@ class CalamineSheet:
     ]:
         """Retunrning data from sheet as iterator of lists."""
 
+    @property
+    def merged_cell_ranges(
+        self,
+    ) -> list[tuple[tuple[int, int], tuple[int, int]]] | None:
+        """Return a copy of merged cell ranges.
+
+        Support only for xlsx/xls.
+
+        Returns:
+            list of merged cell ranges (tuple[start coordinate, end coordinate]) or None for unsuported format
+        """
+
 @typing.final
 class CalamineWorkbook(contextlib.AbstractContextManager):
     path: str | None

{python_calamine-0.3.2 → python_calamine-0.4.0}/src/types/sheet.rs

@@ -1,7 +1,7 @@
 use std::fmt::Display;
 use std::sync::Arc;
 
-use calamine::{Data, Range, Rows, SheetType, SheetVisible};
+use calamine::{Data, Dimensions, Range, Rows, SheetType, SheetVisible};
 use pyo3::class::basic::CompareOp;
 use pyo3::prelude::*;
 use pyo3::types::PyList;
@@ -25,7 +25,7 @@ pub enum SheetTypeEnum {
 
 impl Display for SheetTypeEnum {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "SheetTypeEnum.{:?}", self)
+        write!(f, "SheetTypeEnum.{self:?}")
     }
 }
 
@@ -54,7 +54,7 @@ pub enum SheetVisibleEnum {
 
 impl Display for SheetVisibleEnum {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "SheetVisibleEnum.{:?}", self)
+        write!(f, "SheetVisibleEnum.{self:?}")
     }
 }
 
@@ -68,6 +68,8 @@ impl From<SheetVisible> for SheetVisibleEnum {
     }
 }
 
+type MergedCellRange = ((u32, u32), (u32, u32));
+
 #[pyclass]
 #[derive(Clone, PartialEq)]
 pub struct SheetMetadata {
@@ -132,13 +134,19 @@ pub struct CalamineSheet {
     #[pyo3(get)]
     name: String,
     range: Arc<Range<Data>>,
+    merged_cell_ranges: Option<Vec<Dimensions>>,
 }
 
 impl CalamineSheet {
-    pub fn new(name: String, range: Range<Data>) -> Self {
+    pub fn new(
+        name: String,
+        range: Range<Data>,
+        merged_cell_ranges: Option<Vec<Dimensions>>,
+    ) -> Self {
         CalamineSheet {
             name,
             range: Arc::new(range),
+            merged_cell_ranges,
         }
     }
 }
@@ -212,6 +220,13 @@ impl CalamineSheet {
     fn iter_rows(&self) -> CalamineCellIterator {
         CalamineCellIterator::from_range(Arc::clone(&self.range))
     }
+
+    #[getter]
+    fn merged_cell_ranges(slf: PyRef<'_, Self>) -> Option<Vec<MergedCellRange>> {
+        slf.merged_cell_ranges
+            .as_ref()
+            .map(|r| r.iter().map(|d| (d.start, d.end)).collect())
+    }
 }
 
 #[pyclass]

{python_calamine-0.3.2 → python_calamine-0.4.0}/src/types/workbook.rs

@@ -2,7 +2,9 @@ use std::fs::File;
 use std::io::{BufReader, Cursor, Read};
 use std::path::PathBuf;
 
-use calamine::{open_workbook_auto, open_workbook_auto_from_rs, Reader, Sheets};
+use calamine::{
+    open_workbook_auto, open_workbook_auto_from_rs, Error as CalamineCrateError, Reader, Sheets,
+};
 use pyo3::exceptions::PyTypeError;
 use pyo3::prelude::*;
 use pyo3::types::{PyString, PyType};
@@ -44,6 +46,35 @@ impl SheetsEnum {
             SheetsEnum::None => Err(Error::WorkbookClosed),
         }
     }
+
+    fn worksheet_merge_cells(
+        &mut self,
+        name: &str,
+    ) -> Result<Option<Vec<calamine::Dimensions>>, Error> {
+        match self {
+            SheetsEnum::File(f) => match f {
+                Sheets::Xls(xls_f) => Ok(xls_f.worksheet_merge_cells(name)),
+                Sheets::Xlsx(xlsx_f) => xlsx_f
+                    .worksheet_merge_cells(name)
+                    .transpose()
+                    .map_err(CalamineCrateError::Xlsx)
+                    .map_err(Error::Calamine)
+                    .map(|inner| inner.or(Some(Vec::new()))),
+                _ => Ok(None),
+            },
+            SheetsEnum::FileLike(f) => match f {
+                Sheets::Xls(xls_f) => Ok(xls_f.worksheet_merge_cells(name)),
+                Sheets::Xlsx(xlsx_f) => xlsx_f
+                    .worksheet_merge_cells(name)
+                    .transpose()
+                    .map_err(CalamineCrateError::Xlsx)
+                    .map_err(Error::Calamine)
+                    .map(|inner| inner.or(Some(Vec::new()))),
+                _ => Ok(None),
+            },
+            SheetsEnum::None => Err(Error::WorkbookClosed),
+        }
+    }
 }
 
 #[pyclass]
@@ -61,7 +92,7 @@ pub struct CalamineWorkbook {
 impl CalamineWorkbook {
     fn __repr__(&self) -> PyResult<String> {
         match &self.path {
-            Some(path) => Ok(format!("CalamineWorkbook(path='{}')", path)),
+            Some(path) => Ok(format!("CalamineWorkbook(path='{path}')")),
             None => Ok("CalamineWorkbook(path='bytes')".to_string()),
         }
     }
@@ -192,14 +223,19 @@ impl CalamineWorkbook {
 
     fn get_sheet_by_name(&mut self, name: &str) -> PyResult<CalamineSheet> {
         let range = self.sheets.worksheet_range(name).map_err(err_to_py)?;
-        Ok(CalamineSheet::new(name.to_owned(), range))
+        let merge_cells_range = self.sheets.worksheet_merge_cells(name).map_err(err_to_py)?;
+        Ok(CalamineSheet::new(
+            name.to_owned(),
+            range,
+            merge_cells_range,
+        ))
     }
 
     fn get_sheet_by_index(&mut self, index: usize) -> PyResult<CalamineSheet> {
         let name = self
             .sheet_names
             .get(index)
-            .ok_or_else(|| WorksheetNotFound::new_err(format!("Worksheet '{}' not found", index)))?
+            .ok_or_else(|| WorksheetNotFound::new_err(format!("Worksheet '{index}' not found")))?
             .to_string();
         self.get_sheet_by_name(&name)
     }

{python_calamine-0.3.2 → python_calamine-0.4.0}/tests/test_base.py

@@ -15,7 +15,7 @@ PATH = Path(__file__).parent / "data"
 
 
 def test_ods_read():
-    names = ["Sheet1", "Sheet2"]
+    names = ["Sheet1", "Sheet2", "Merged Cells"]
     data = [
         ["", "", "", "", "", "", "", "", "", ""],
         [
@@ -59,9 +59,11 @@ def test_ods_read():
     assert [] == reader.get_sheet_by_index(1).to_python()
     assert [] == reader.get_sheet_by_index(1).to_python(skip_empty_area=False)
 
+    assert None is reader.get_sheet_by_name("Merged Cells").merged_cell_ranges
+
 
 def test_xls_read():
-    names = ["Sheet1", "Sheet2"]
+    names = ["Sheet1", "Sheet2", "Merged Cells"]
     data = [
         ["", "", "", "", "", "", "", "", "", ""],
         [
@@ -101,9 +103,13 @@ def test_xls_read():
     assert [] == reader.get_sheet_by_index(1).to_python()
     assert [] == reader.get_sheet_by_index(1).to_python(skip_empty_area=False)
 
+    assert [((0, 0), (1, 0)), ((0, 1), (1, 1))] == reader.get_sheet_by_name(
+        "Merged Cells"
+    ).merged_cell_ranges
+
 
 def test_xlsb_read():
-    names = ["Sheet1", "Sheet2", "Sheet3"]
+    names = ["Sheet1", "Sheet2", "Sheet3", "Merged Cells"]
     data = [
         ["", "", "", "", "", "", "", "", "", ""],
         [
@@ -143,9 +149,11 @@ def test_xlsb_read():
     assert [] == reader.get_sheet_by_index(1).to_python()
     assert [] == reader.get_sheet_by_index(1).to_python(skip_empty_area=False)
 
+    assert None is reader.get_sheet_by_name("Merged Cells").merged_cell_ranges
+
 
 def test_xlsx_read():
-    names = ["Sheet1", "Sheet2", "Sheet3"]
+    names = ["Sheet1", "Sheet2", "Sheet3", "Merged Cells"]
     data = [
         ["", "", "", "", "", "", "", "", "", ""],
         [
@@ -185,9 +193,13 @@ def test_xlsx_read():
     assert [] == reader.get_sheet_by_index(1).to_python()
     assert [] == reader.get_sheet_by_index(1).to_python(skip_empty_area=False)
 
+    assert [((0, 0), (1, 0)), ((0, 1), (1, 1))] == reader.get_sheet_by_name(
+        "Merged Cells"
+    ).merged_cell_ranges
+
 
 def test_xlsx_iter_rows():
-    names = ["Sheet1", "Sheet2", "Sheet3"]
+    names = ["Sheet1", "Sheet2", "Sheet3", "Merged Cells"]
     data = [
         ["", "", "", "", "", "", "", "", "", ""],
         [