Merge branch 'main' into ctty/sort-partition

Author: CTTY

.asf.yaml

@@ -40,7 +40,7 @@ github:
 
       required_pull_request_reviews:
         required_approving_review_count: 1
-        dismiss_stale_reviews: true
+        dismiss_stale_reviews: false
 
       required_linear_history: true
   del_branch_on_merge: true
@@ -52,12 +52,15 @@ github:
   collaborators:
     - JanKaul
     - c-thiel
+    - mbutrovich
+    - CTTY
   ghp_branch: gh-pages
   ghp_path: /
 
 notifications:
   commits: [email protected]
   issues: [email protected]
   pullrequests: [email protected]
+  jobs:         [email protected]
   jira_options: link label link label
   discussions: [email protected]

.github/ISSUE_TEMPLATE/iceberg_bug_report.yml

@@ -28,7 +28,8 @@ body:
       description: What Apache Iceberg Rust version are you using?
       multiple: false
       options:
-        - 0.5.1 (latest version)
+        - 0.6.0 (latest version)
+        - 0.5.1
         - 0.4.0
         - 0.3.0
         - 0.2.0

.github/actions/overwrite-package-version/action.yml

@@ -38,14 +38,24 @@ runs:
       env:
         TIMESTAMP: ${{ inputs.timestamp }}
       run: |
-        CURRENT_VERSION=$(python -c "import toml; print(toml.load('bindings/python/pyproject.toml')['project']['version'])")
-        NEW_VERSION="${CURRENT_VERSION}.dev${TIMESTAMP}"
-        NEW_VERSION=$NEW_VERSION python -c "
+        # Read the current version from the Rust crate's Cargo.toml
+        CURRENT_VERSION=$(python -c "import toml; print(toml.load('bindings/python/Cargo.toml')['package']['version'])")
+        export NEW_VERSION="${CURRENT_VERSION}.dev${TIMESTAMP}"
+        echo "Current version: ${CURRENT_VERSION}"
+        echo "New dev version: ${NEW_VERSION}"
+
+        # Update bindings/python/pyproject.toml:
+        # - Set project.version = NEW_VERSION
+        # - Ensure 'version' is not listed in project.dynamic
+        python -c "
         import toml
         import os
         config = toml.load('bindings/python/pyproject.toml')
-        config['project']['version'] = os.environ['NEW_VERSION']
+        new_version = os.environ['NEW_VERSION']
+        config['project']['version'] = new_version
+        if 'dynamic' in config['project']:
+          config['project']['dynamic'] = [v for v in config['project']['dynamic'] if v != 'version']
         with open('bindings/python/pyproject.toml', 'w') as f:
             toml.dump(config, f)
-        print(f'Updated version to: {config[\"project\"][\"version\"]}')
+        print(f'Updated version to: {new_version}')
         "

.github/workflows/bindings_python_ci.yml

@@ -22,8 +22,19 @@ on:
     branches:
       - main
   pull_request:
-    branches:
-      - main
+    paths:
+      - '**'                                       # Include all files and directories in the repository by default.
+      - '!.github/ISSUE_TEMPLATE/**'               # Exclude files and directories that don't impact tests or code like templates, metadata, and documentation.
+      - '!scripts/**'
+      - '!website/**'
+      - '!.asf.yml'
+      - '!.gitattributes'
+      - '!.gitignore'
+      - '!CONTRIBUTING.md'
+      - '!CHANGELOG.md'
+      - '!LICENSE'
+      - '!NOTICE'
+      - '!README.md'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event_name }}
@@ -45,17 +56,21 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v5
+      - uses: astral-sh/setup-uv@v7
+        with:
+          version: "0.9.3"
+          enable-cache: true
       - name: Install tools
         run: |
-          pip install ruff
+          uv tool install ruff
       - name: Check format
         working-directory: "bindings/python"
         run: |
-          ruff format . --diff
+          uvx ruff format . --diff
       - name: Check style
         working-directory: "bindings/python"
         run: |
-          ruff check .
+          uvx ruff check .
 
   test:
     runs-on: ${{ matrix.os }}
@@ -67,19 +82,30 @@ jobs:
           - windows-latest
     steps:
       - uses: actions/checkout@v5
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v6
         with:
-          python-version: 3.9
+          python-version: 3.12
       - uses: PyO3/maturin-action@v1
         with:
           working-directory: "bindings/python"
           command: build
           args: --out dist --sdist
+      - uses: astral-sh/setup-uv@v7
+        with:
+          version: "0.9.3"
+          enable-cache: true
+      - name: Sync dependencies
+        working-directory: "bindings/python"
+        shell: bash
+        run: |
+          make install
+      - name: Install built wheel
+        working-directory: "bindings/python"
+        shell: bash
+        run: |
+          uv pip install --reinstall dist/pyiceberg_core-*.whl
       - name: Run tests
         working-directory: "bindings/python"
         shell: bash
         run: |
-          set -e
-          pip install hatch==1.12.0
-          hatch run dev:pip install dist/pyiceberg_core-*.whl --force-reinstall
-          hatch run dev:test
+          make test

.github/workflows/ci.yml

@@ -22,15 +22,26 @@ on:
     branches:
       - main
   pull_request:
-    branches:
-      - main
+    paths:
+      - '**'                              # Include all files and directories in the repository by default.
+      - '!.github/ISSUE_TEMPLATE/**'      # Exclude files and directories that don't impact tests or code like templates, metadata, and documentation.
+      - '!scripts/**'
+      - '!website/**'
+      - '!.asf.yml'
+      - '!.gitattributes'
+      - '!.gitignore'
+      - '!CONTRIBUTING.md'
+      - '!CHANGELOG.md'
+      - '!LICENSE'
+      - '!NOTICE'
+      - '!README.md'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event_name }}
   cancel-in-progress: true
 
 env:
-  rust_msrv: "1.85.0"
+  rust_msrv: "1.87"
 
 jobs:
   check:
@@ -47,15 +58,16 @@ jobs:
         uses: ./.github/actions/setup-builder
 
       - name: Check License Header
-        uses: apache/skywalking-eyes/header@v0.7.0
+        uses: apache/skywalking-eyes/header@v0.8.0
 
-      - name: Install taplo-cli
-        uses: taiki-e/install-action@v2
-        with:
-          tool: [email protected]
       - name: Check toml format
         run: make check-toml
 
+      - name: Install protoc
+        uses: arduino/setup-protoc@v3
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Cargo format
         run: make check-fmt
 
@@ -65,12 +77,8 @@ jobs:
       - name: Cargo clippy
         run: make check-clippy
 
-      - name: Install cargo-machete
-        uses: taiki-e/install-action@v2
-        with:
-          tool: cargo-machete
       - name: Cargo Machete
-        run: cargo machete
+        run: make cargo-machete
 
   build:
     runs-on: ${{ matrix.os }}
@@ -81,6 +89,18 @@ jobs:
           - macos-latest
           - windows-latest
     steps:
+      - name: Maximize build space (Ubuntu)
+        if: matrix.os == 'ubuntu-latest'
+        uses: easimon/maximize-build-space@master
+        with:
+          remove-dotnet: "true"
+          remove-android: "true"
+          remove-haskell: "true"
+          remove-codeql: "true"
+          remove-docker-images: "true"
+          root-reserve-mb: 10240
+          temp-reserve-mb: 10240
+
       - uses: actions/checkout@v5
 
       - name: Setup Rust toolchain
@@ -89,6 +109,11 @@ jobs:
       - name: Cache Rust artifacts
         uses: Swatinem/rust-cache@v2
 
+      - name: Install protoc
+        uses: arduino/setup-protoc@v3
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Build
         run: make build
 
@@ -114,6 +139,13 @@ jobs:
 
   unit:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        test-suite:
+          - { name: "default", args: "--all-targets --all-features --workspace" }
+          - { name: "smol", args: "--all-targets --no-default-features --features smol --features storage-all --workspace" }
+          - { name: "doc", args: "--doc --all-features --workspace" }
+    name: Unit Tests (${{ matrix.test-suite.name }})
     steps:
       - name: Maximize build space
         uses: easimon/maximize-build-space@master
@@ -131,32 +163,33 @@ jobs:
       - name: Setup Rust toolchain
         uses: ./.github/actions/setup-builder
 
+      - name: Install protoc
+        uses: arduino/setup-protoc@v3
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Cache Rust artifacts
         uses: Swatinem/rust-cache@v2
+        with:
+          key: ${{ matrix.test-suite.name }}
 
       - name: Test
-        run: cargo test --no-fail-fast --all-targets --all-features --workspace
-
-      - name: Async-std Test
-        run: cargo test --no-fail-fast --all-targets --no-default-features  --features "async-std" --features "storage-all" --workspace
-
-      - name: Doc Test
-        run: cargo test --no-fail-fast --doc --all-features --workspace
+        run: cargo test --no-fail-fast ${{ matrix.test-suite.args }}
 
   msrv:
     name: Verify MSRV
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v5
-      - name: Setup Nightly Rust toolchain
-        uses: ./.github/actions/setup-builder
-      - name: Generate minimal versions lockfile
-        run: |
-          cargo generate-lockfile -Z direct-minimal-versions -Z minimal-versions
+      - name: Install protoc
+        uses: arduino/setup-protoc@v3
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
       - name: Setup MSRV Rust toolchain
         uses: ./.github/actions/setup-builder
         with:
           rust-version: ${{ env.rust_msrv }}
+      - name: Setup Nightly Rust toolchain
+        uses: ./.github/actions/setup-builder
       - name: Check MSRV
-        run: |
-          cargo +${{ env.rust_msrv }} check --locked --workspace
+        run: make check-msrv

.github/workflows/ci_typos.yml

@@ -42,4 +42,4 @@ jobs:
     steps:
       - uses: actions/checkout@v5
       - name: Check typos
-        uses: crate-ci/typos@v1.35.4
+        uses: crate-ci/typos@v1.39.2

.github/workflows/publish.yml

@@ -27,7 +27,7 @@ on:
   workflow_dispatch:
 
 env:
-  rust_msrv: "1.85"
+  rust_msrv: "1.87"
 
 jobs:
   publish:

.github/workflows/release_python.yml

@@ -25,7 +25,7 @@ on:
   workflow_dispatch:
 
 env:
-  rust_msrv: "1.85"
+  rust_msrv: "1.87"
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.workflow_run.head_branch }}-${{ github.event_name }}
@@ -107,7 +107,7 @@ jobs:
           command: sdist
           args: -o dist
       - name: Upload sdist
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: wheels-sdist
           path: bindings/python/dist
@@ -144,9 +144,9 @@ jobs:
           rm Cargo.toml
           mv Cargo.toml.tmp Cargo.toml
 
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v6
         with:
-          python-version: 3.9
+          python-version: 3.12
       - name: Setup Rust toolchain
         uses: ./.github/actions/setup-builder
         with:
@@ -159,7 +159,7 @@ jobs:
           command: build
           args: --release -o dist
       - name: Upload wheels
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: wheels-${{ matrix.os }}-${{ matrix.target }}
           path: bindings/python/dist
@@ -178,14 +178,14 @@ jobs:
 
     steps:
       - name: Download all the dists
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v6
         with:
           pattern: wheels-*
           merge-multiple: true
           path: bindings/python/dist
       - name: Publish to PyPI
         uses: pypa/gh-action-pypi-publish@release/v1
-
         with:
           skip-existing: true
           packages-dir: bindings/python/dist
+          verbose: true