python-calamine 0.7.0__tar.gz → 0.8.0__tar.gz

{python_calamine-0.7.0 → python_calamine-0.8.0}/.github/workflows/CI.yml

@@ -28,15 +28,17 @@ jobs:
           - "3.13"
           - "3.14"
         pandas-version:
-          - "2.2.*"
           - "2.3.*"
+          - "3.0.*"
         include:
           # https://github.com/pandas-dev/pandas/issues/42509
           - python-version: "pypy3.11"
             pandas-version: "none"
-          # https://github.com/pandas-dev/pandas/issues/60016
           - python-version: "3.14t"
-            pandas-version: "none"
+            pandas-version: "3.0.*"
+        exclude:
+          - python-version: "3.10"
+            pandas-version: "3.0.*"
 
     runs-on: ubuntu-latest
 
@@ -44,7 +46,7 @@ jobs:
       PYTHON: ${{ matrix.python-version }}
 
     steps:
-      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
         with:
           persist-credentials: false
 
@@ -60,14 +62,14 @@ jobs:
           key: v3
 
       - name: set up python
-        uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
+        uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0
         with:
           python-version: ${{ matrix.python-version }}
           allow-prereleases: true
 
       - id: cache-py
         name: cache python
-        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+        uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
         with:
           path: ${{ env.pythonLocation }}
           key: >
@@ -98,7 +100,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
         with:
           persist-credentials: false
 
@@ -110,11 +112,11 @@ jobs:
       - name: cache rust
         uses: Swatinem/rust-cache@c19371144df3bb44fab255c43d04cbc2ab54d1c4 # v2.9.1
 
-      - uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
+      - uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0
         with:
           python-version: "3.14"
 
-      - uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+      - uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
         id: cache-py
         name: cache python
         with:
@@ -214,12 +216,12 @@ jobs:
 
     runs-on: ${{ matrix.runs-on || format('{0}-latest', (matrix.os == 'linux' && 'ubuntu') || matrix.os) }}
     steps:
-      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
         with:
           persist-credentials: false
 
       - name: set up python
-        uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
+        uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0
         with:
           python-version: "3.14"
 
@@ -295,7 +297,7 @@ jobs:
           merge-multiple: true
 
       - name: Upload to GitHub
-        uses: softprops/action-gh-release@b4309332981a82ec1c5618f44dd2e27cc8bfbfda # v3.0.0
+        uses: softprops/action-gh-release@718ea10b132b3b2eba29c1007bb80653f286566b # v3.0.1
         with:
           generate_release_notes: true
           files: |

{python_calamine-0.7.0 → python_calamine-0.8.0}/Cargo.lock

@@ -19,11 +19,12 @@ dependencies = [
 
 [[package]]
 name = "atoi_simd"
-version = "0.17.0"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ad17c7c205c2c28b527b9845eeb91cf1b4d008b438f98ce0e628227a822758e"
+checksum = "f3cdb3708a128e559a30fb830e8a77a5022ee6902806925c216658652b452a44"
 dependencies = [
  "debug_unsafe",
+ "rustversion",
 ]
 
 [[package]]
@@ -46,9 +47,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "calamine"
-version = "0.35.0"
+version = "0.36.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8822fe6253ca47aa5ad9a3be09f6fe7cd20c6a74e41b0aa42e8f4e3d523508df"
+checksum = "6975084f43060e56343ffba7f9731fa52a7dcf2e1cd8e2459fd4c6bf4a1bff59"
 dependencies = [
  "atoi_simd",
  "byteorder",
@@ -372,7 +373,7 @@ dependencies = [
 
 [[package]]
 name = "python-calamine"
-version = "0.7.0"
+version = "0.8.0"
 dependencies = [
  "calamine",
  "chrono",
@@ -383,9 +384,9 @@ dependencies = [
 
 [[package]]
 name = "quick-xml"
-version = "0.39.4"
+version = "0.41.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdcc8dd4e2f670d309a5f0e83fe36dfdc05af317008fea29144da1a2ac858e5e"
+checksum = "e660451e55124f798a69a5af3f49ccfbefbd41910eefd25caf2393e1f3473ec1"
 dependencies = [
  "encoding_rs",
  "memchr",
@@ -588,9 +589,9 @@ dependencies = [
 
 [[package]]
 name = "zip"
-version = "7.2.0"
+version = "8.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c42e33efc22a0650c311c2ef19115ce232583abbe80850bc8b66509ebef02de0"
+checksum = "2d04a6b5381502aa6087c94c669499eb1602eb9c5e8198e534de571f7154809b"
 dependencies = [
  "crc32fast",
  "flate2",

{python_calamine-0.7.0 → python_calamine-0.8.0}/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "python-calamine"
-version = "0.7.0"
+version = "0.8.0"
 edition = "2021"
 readme = "README.md"
 
@@ -9,7 +9,7 @@ name = "python_calamine"
 crate-type = ["cdylib"]
 
 [dependencies]
-calamine = { version = "0.35.0", features = ["chrono"] }
+calamine = { version = "0.36.0", features = ["chrono"] }
 pyo3 = { version = "0.29.0", features = [
     "extension-module",
     "chrono",

{python_calamine-0.7.0 → python_calamine-0.8.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-calamine
-Version: 0.7.0
+Version: 0.8.0
 Classifier: Development Status :: 4 - Beta
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: 3.10

{python_calamine-0.7.0 → python_calamine-0.8.0}/src/types/workbook.rs

@@ -79,23 +79,29 @@ impl SheetsEnum {
     ) -> 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::Xls(xls_f) => xls_f
+                    .merge_cells_by_sheet_name(name)
+                    .map(Some)
+                    .map_err(CalamineCrateError::Xls)
+                    .map_err(Error::Calamine),
                 Sheets::Xlsx(xlsx_f) => xlsx_f
-                    .worksheet_merge_cells(name)
-                    .transpose()
+                    .merge_cells_by_sheet_name(name)
+                    .map(Some)
                     .map_err(CalamineCrateError::Xlsx)
-                    .map_err(Error::Calamine)
-                    .map(|inner| inner.or(Some(Vec::new()))),
+                    .map_err(Error::Calamine),
                 _ => Ok(None),
             },
             SheetsEnum::FileLike(f) => match f {
-                Sheets::Xls(xls_f) => Ok(xls_f.worksheet_merge_cells(name)),
+                Sheets::Xls(xls_f) => xls_f
+                    .merge_cells_by_sheet_name(name)
+                    .map(Some)
+                    .map_err(CalamineCrateError::Xls)
+                    .map_err(Error::Calamine),
                 Sheets::Xlsx(xlsx_f) => xlsx_f
-                    .worksheet_merge_cells(name)
-                    .transpose()
+                    .merge_cells_by_sheet_name(name)
+                    .map(Some)
                     .map_err(CalamineCrateError::Xlsx)
-                    .map_err(Error::Calamine)
-                    .map(|inner| inner.or(Some(Vec::new()))),
+                    .map_err(Error::Calamine),
                 _ => Ok(None),
             },
             SheetsEnum::None => Err(Error::WorkbookClosed),