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

python_calamine-0.8.1/.github/pyodide/pylock.314.toml

@@ -0,0 +1,57 @@
+lock-version = "1.0"
+created-by = "pip"
+
+[[packages]]
+name = "iniconfig"
+version = "2.3.0"
+
+[[packages.wheels]]
+name = "iniconfig-2.3.0-py3-none-any.whl"
+url = "https://files.pythonhosted.org/packages/cb/b1/3846dd7f199d53cb17f49cba7e651e9ce294d8497c8c150530ed11865bb8/iniconfig-2.3.0-py3-none-any.whl"
+
+[packages.wheels.hashes]
+sha256 = "f631c04d2c48c52b84d0d0549c99ff3859c98df65b3101406327ecc7d53fbf12"
+
+[[packages]]
+name = "packaging"
+version = "26.2"
+
+[[packages.wheels]]
+name = "packaging-26.2-py3-none-any.whl"
+url = "https://files.pythonhosted.org/packages/df/b2/87e62e8c3e2f4b32e5fe99e0b86d576da1312593b39f47d8ceef365e95ed/packaging-26.2-py3-none-any.whl"
+
+[packages.wheels.hashes]
+sha256 = "5fc45236b9446107ff2415ce77c807cee2862cb6fac22b8a73826d0693b0980e"
+
+[[packages]]
+name = "pluggy"
+version = "1.6.0"
+
+[[packages.wheels]]
+name = "pluggy-1.6.0-py3-none-any.whl"
+url = "https://files.pythonhosted.org/packages/54/20/4d324d65cc6d9205fabedc306948156824eb9f0ee1633355a8f7ec5c66bf/pluggy-1.6.0-py3-none-any.whl"
+
+[packages.wheels.hashes]
+sha256 = "e920276dd6813095e9377c0bc5566d94c932c33b27a3e3945d8389c374dd4746"
+
+[[packages]]
+name = "pygments"
+version = "2.20.0"
+
+[[packages.wheels]]
+name = "pygments-2.20.0-py3-none-any.whl"
+url = "https://files.pythonhosted.org/packages/f4/7e/a72dd26f3b0f4f2bf1dd8923c85f7ceb43172af56d63c7383eb62b332364/pygments-2.20.0-py3-none-any.whl"
+
+[packages.wheels.hashes]
+sha256 = "81a9e26dd42fd28a23a2d169d86d7ac03b46e2f8b59ed4698fb4785f946d0176"
+
+[[packages]]
+name = "pytest"
+version = "9.1.1"
+
+[[packages.wheels]]
+name = "pytest-9.1.1-py3-none-any.whl"
+url = "https://files.pythonhosted.org/packages/24/25/1de2678b631f5a49215c6c96fff41ba892b0a34df68d6d80292b1b48aa7f/pytest-9.1.1-py3-none-any.whl"
+
+[packages.wheels.hashes]
+sha256 = "37a86b45efb9a47a61a36449063e8e18d0cab3161329fc099eb21783169c4f0c"

python_calamine-0.8.1/.github/pyodide/requirements.in

@@ -0,0 +1,7 @@
+# Selected dependencies (including dev ones) to run the test suite with Pyodide.
+# Dependencies should be installed from the derived `pylock.toml` file.
+# To generate the lockfile, run `python -m pip lock -r requirements.in -o pylock.31x.toml`,
+# in a Pyodide venv matching the target Python version. Such a venv can be created using
+# `pyodide venv .venv-pyodide` (and this must be done from a Python venv matching the target
+# Python version).
+pytest~=9.0

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

@@ -1,4 +1,5 @@
 # some code from https://github.com/pydantic/pydantic-core/blob/d6e7890b36ef21cb28180a7f5b1479da2319012d/.github/workflows/ci.yml
+# and https://github.com/pydantic/pydantic/blob/f59e929c999e8b2efc7b12fd0bc1685c1a186be3/.github/workflows/ci.yml
 # MIT License, see author list by link
 
 name: CI
@@ -11,6 +12,9 @@ on:
       - "**"
   pull_request: {}
 
+env:
+  UV_FROZEN: true
+
 permissions: {}
 
 jobs:
@@ -28,15 +32,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 +50,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 +66,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: >
@@ -92,13 +98,50 @@ jobs:
 
       - run: pytest
 
+  test-pyemscripten:
+    name: test ${{ matrix.python-version }} PyEmscripten
+    needs: [build-pyemscripten]
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - python-version: "3.14"
+            pylock-suffix: "314"
+
+    steps:
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        with:
+          persist-credentials: false
+
+      - name: install uv
+        uses: astral-sh/setup-uv@fac544c07dec837d0ccb6301d7b5580bf5edae39 # v8.2.0
+        with:
+          python-version: ${{ matrix.python-version }}
+          enable-cache: true # zizmor: ignore[cache-poisoning] -- Job does not produce release artifacts and does not have sensitive permissions
+
+      - name: get dist artifacts
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+        with:
+          name: python_calamine_pypi_files_pyemscripten_${{ matrix.python-version }}
+          path: dist
+
+      - run: |
+          uv sync --only-group pyodide-build
+          uv run pyodide venv .venv-pyodide
+          source .venv-pyodide/bin/activate
+          python -m pip install --upgrade pip>=26.1.1
+          python -m pip install -r .github/pyodide/pylock.${{ matrix.pylock-suffix }}.toml
+          python -m pip install python-calamine --no-index --no-deps --find-links dist
+          python -m pytest
+
   lint:
     permissions:
       contents: read
     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 +153,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:
@@ -136,7 +179,7 @@ jobs:
   # https://github.com/marketplace/actions/alls-green#why used for branch protection checks
   check:
     if: always()
-    needs: [test, lint]
+    needs: [test, test-pyemscripten, lint]
     runs-on: ubuntu-latest
     steps:
       - name: Decide whether the needed jobs succeeded or failed
@@ -214,12 +257,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"
 
@@ -253,8 +296,60 @@ jobs:
           name: wheels-${{ matrix.os }}-${{ matrix.target }}-${{ matrix.manylinux || 'auto' }}
           path: dist
 
+  build-pyemscripten:
+    name: build PyEmscripten (${{ matrix.python-version }})
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - python-version: "3.14"
+    steps:
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        with:
+          persist-credentials: false
+
+      - uses: astral-sh/setup-uv@fac544c07dec837d0ccb6301d7b5580bf5edae39 # v8.2.0
+        with:
+          python-version: ${{ matrix.python-version }}
+          enable-cache: ${{ !startsWith(github.ref, 'refs/tags/') }} # zizmor: ignore[cache-poisoning]
+
+      - run: uv sync --only-group pyodide-build
+
+      - name: Get pyodide config
+        id: pyodide-config
+        run: |
+          echo "rust-toolchain=$(uv run pyodide config get rust_toolchain)" >> "$GITHUB_OUTPUT"
+          echo "emscripten-version=$(uv run pyodide config get emscripten_version)" >> "$GITHUB_OUTPUT"
+          echo "pyodide-abi-version=$(uv run pyodide config get pyodide_abi_version)" >> "$GITHUB_OUTPUT"
+          echo "rustflags=$(uv run pyodide config get rustflags)" >> "$GITHUB_OUTPUT"
+
+      - uses: emscripten-core/setup-emsdk@4528d102f7230f0e7b276855c01ea1159be0e984 # v16
+        with:
+          version: ${{ steps.pyodide-config.outputs.emscripten-version }}
+          no-cache: ${{ startsWith(github.ref, 'refs/tags/') }}
+
+      - name: Build wheels
+        uses: PyO3/maturin-action@e83996d129638aa358a18fbd1dfb82f0b0fb5d3b # v1.51.0
+        # Unclear how to avoid manually specifying this yet (https://github.com/PyO3/maturin/issues/3189):
+        env:
+          CARGO_TARGET_WASM32_UNKNOWN_EMSCRIPTEN_RUSTFLAGS: ${{ steps.pyodide-config.outputs.rustflags }}
+          MATURIN_PYEMSCRIPTEN_PLATFORM_VERSION: ${{ steps.pyodide-config.outputs.pyodide-abi-version }}
+        with:
+          target: wasm32-unknown-emscripten
+          args: --release --out dist --interpreter ${{ matrix.python-version }}
+          sccache: ${{ !startsWith(github.ref, 'refs/tags/') }} # zizmor: ignore[cache-poisoning]
+          rust-toolchain: ${{ steps.pyodide-config.outputs.rust-toolchain }}
+
+      - run: ls -lh dist/
+
+      - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+        with:
+          name: python_calamine_pypi_files_pyemscripten_${{ matrix.python-version }}
+          path: dist
+
   release:
-    needs: [build, check]
+    needs: [build, build-pyemscripten, check]
     if: success() && startsWith(github.ref, 'refs/tags/')
 
     runs-on: ubuntu-latest
@@ -278,7 +373,7 @@ jobs:
         uses: pypa/gh-action-pypi-publish@cef221092ed1bacb1cc03d23a2d87d1d172e277b # release/v1.14
 
   gh-release:
-    needs: [build, check]
+    needs: [build, build-pyemscripten, check]
     if: success() && startsWith(github.ref, 'refs/tags/')
 
     runs-on: ubuntu-latest
@@ -295,7 +390,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.1}/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.1"
 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.1}/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "python-calamine"
-version = "0.7.0"
+version = "0.8.1"
 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.1}/PKG-INFO

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

{python_calamine-0.7.0 → python_calamine-0.8.1}/pyproject.toml

@@ -24,6 +24,7 @@ dev = [
   "pytest~=9.0",
   "pandas[excel]>=2.2",
 ]
+pyodide-build = ["pyodide-build"]
 
 [project.urls]
 homepage = "https://github.com/dimastbk/python-calamine"

{python_calamine-0.7.0 → python_calamine-0.8.1}/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),