Merge branch 'apache:main' into main

Author: peasee

.github/ISSUE_TEMPLATE/iceberg_bug_report.yml

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

.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/audit.yml

@@ -40,7 +40,7 @@ jobs:
   security_audit:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Setup Rust toolchain
         uses: ./.github/actions/setup-builder
         with:

.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 }}
@@ -33,16 +44,18 @@ jobs:
   check-rust:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Check format
+        working-directory: "bindings/python"
         run: cargo fmt --all -- --check
       - name: Check clippy
+        working-directory: "bindings/python"
         run: cargo clippy --all-targets --all-features -- -D warnings
 
   check-python:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Install tools
         run: |
           pip install ruff
@@ -64,8 +77,8 @@ jobs:
           - macos-latest
           - windows-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/checkout@v5
+      - uses: actions/setup-python@v6
         with:
           python-version: 3.9
       - uses: PyO3/maturin-action@v1

.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.84.0"
+  rust_msrv: "1.87"
 
 jobs:
   check:
@@ -41,21 +52,22 @@ jobs:
           - ubuntu-latest
           - macos-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Setup Rust toolchain
         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: taplo-cli@0.9.3
       - 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,14 +89,31 @@ jobs:
           - macos-latest
           - windows-latest
     steps:
-      - uses: actions/checkout@v4
+      - 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
         uses: ./.github/actions/setup-builder
 
       - 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
 
@@ -101,7 +126,7 @@ jobs:
           - macos-latest
           - windows-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Setup Rust toolchain
         uses: ./.github/actions/setup-builder
@@ -118,27 +143,32 @@ jobs:
       - name: Maximize build space
         uses: easimon/maximize-build-space@master
         with:
-          remove-dotnet: 'true'
-          remove-android: 'true'
-          remove-haskell: 'true'
-          remove-codeql: 'true'
-          remove-docker-images: 'true'
+          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@v4
+      - uses: actions/checkout@v5
 
       - 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
 
       - 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: Smol Test
+        run: cargo test --no-fail-fast --all-targets --no-default-features --features "smol" --features "storage-all" --workspace
 
       - name: Doc Test
         run: cargo test --no-fail-fast --doc --all-features --workspace
@@ -147,16 +177,16 @@ jobs:
     name: Verify MSRV
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - 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
+      - uses: actions/checkout@v5
+      - 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

@@ -40,6 +40,6 @@ jobs:
     env:
       FORCE_COLOR: 1
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Check typos
-        uses: crate-ci/typos@v1.31.1
+        uses: crate-ci/typos@v1.38.1

.github/workflows/publish.yml

@@ -20,11 +20,14 @@ name: Publish
 on:
   push:
     tags:
-      - '*'
+      # Trigger this workflow when tag follows the versioning format: v<major>.<minor>.<patch> OR v<major>.<minor>.<patch>-rc.<release_candidate>
+      # Example valid tags: v0.4.0, v0.4.0-rc.1
+      - "v[0-9]+.[0-9]+.[0-9]+"
+      - "v[0-9]+.[0-9]+.[0-9]+-rc.[0-9]+"
   workflow_dispatch:
 
 env:
-  rust_msrv: "1.77.1"
+  rust_msrv: "1.87"
 
 jobs:
   publish:
@@ -38,13 +41,11 @@ jobs:
           - "crates/iceberg"
           - "crates/catalog/glue"
           - "crates/catalog/hms"
-          - "crates/catalog/memory"
           - "crates/catalog/rest"
-          # sql is not ready for release yet.
-          # - "crates/catalog/sql"
+          - "crates/catalog/sql"
           - "crates/integrations/datafusion"
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Setup Rust toolchain
         uses: ./.github/actions/setup-builder
@@ -57,4 +58,4 @@ jobs:
         if: ${{ startsWith(github.ref, 'refs/tags/') && !contains(github.ref, '-') }}
         run: cargo publish --all-features
         env:
-          CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}
+          CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}