Skip to content

Commit e16991f

Browse files
authored
Merge branch 'main' into feature/implement-repartition-node-for-insert-into-datafusion
2 parents 1a8d65d + dc34928 commit e16991f

File tree

97 files changed

+9389
-6529
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+9389
-6529
lines changed

.github/ISSUE_TEMPLATE/iceberg_bug_report.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ body:
2828
description: What Apache Iceberg Rust version are you using?
2929
multiple: false
3030
options:
31-
- 0.5.1 (latest version)
31+
- 0.6.0 (latest version)
32+
- 0.5.1
3233
- 0.4.0
3334
- 0.3.0
3435
- 0.2.0

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

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,24 @@ runs:
3838
env:
3939
TIMESTAMP: ${{ inputs.timestamp }}
4040
run: |
41-
CURRENT_VERSION=$(python -c "import toml; print(toml.load('bindings/python/pyproject.toml')['project']['version'])")
42-
NEW_VERSION="${CURRENT_VERSION}.dev${TIMESTAMP}"
43-
NEW_VERSION=$NEW_VERSION python -c "
41+
# Read the current version from the Rust crate's Cargo.toml
42+
CURRENT_VERSION=$(python -c "import toml; print(toml.load('bindings/python/Cargo.toml')['package']['version'])")
43+
export NEW_VERSION="${CURRENT_VERSION}.dev${TIMESTAMP}"
44+
echo "Current version: ${CURRENT_VERSION}"
45+
echo "New dev version: ${NEW_VERSION}"
46+
47+
# Update bindings/python/pyproject.toml:
48+
# - Set project.version = NEW_VERSION
49+
# - Ensure 'version' is not listed in project.dynamic
50+
python -c "
4451
import toml
4552
import os
4653
config = toml.load('bindings/python/pyproject.toml')
47-
config['project']['version'] = os.environ['NEW_VERSION']
54+
new_version = os.environ['NEW_VERSION']
55+
config['project']['version'] = new_version
56+
if 'dynamic' in config['project']:
57+
config['project']['dynamic'] = [v for v in config['project']['dynamic'] if v != 'version']
4858
with open('bindings/python/pyproject.toml', 'w') as f:
4959
toml.dump(config, f)
50-
print(f'Updated version to: {config[\"project\"][\"version\"]}')
60+
print(f'Updated version to: {new_version}')
5161
"

.github/workflows/bindings_python_ci.yml

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,19 @@ on:
2222
branches:
2323
- main
2424
pull_request:
25-
branches:
26-
- main
25+
paths:
26+
- '**' # Include all files and directories in the repository by default.
27+
- '!.github/ISSUE_TEMPLATE/**' # Exclude files and directories that don't impact tests or code like templates, metadata, and documentation.
28+
- '!scripts/**'
29+
- '!website/**'
30+
- '!.asf.yml'
31+
- '!.gitattributes'
32+
- '!.gitignore'
33+
- '!CONTRIBUTING.md'
34+
- '!CHANGELOG.md'
35+
- '!LICENSE'
36+
- '!NOTICE'
37+
- '!README.md'
2738

2839
concurrency:
2940
group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event_name }}
@@ -67,7 +78,7 @@ jobs:
6778
- windows-latest
6879
steps:
6980
- uses: actions/checkout@v5
70-
- uses: actions/setup-python@v5
81+
- uses: actions/setup-python@v6
7182
with:
7283
python-version: 3.9
7384
- uses: PyO3/maturin-action@v1

.github/workflows/ci.yml

Lines changed: 37 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,26 @@ on:
2222
branches:
2323
- main
2424
pull_request:
25-
branches:
26-
- main
25+
paths:
26+
- '**' # Include all files and directories in the repository by default.
27+
- '!.github/ISSUE_TEMPLATE/**' # Exclude files and directories that don't impact tests or code like templates, metadata, and documentation.
28+
- '!scripts/**'
29+
- '!website/**'
30+
- '!.asf.yml'
31+
- '!.gitattributes'
32+
- '!.gitignore'
33+
- '!CONTRIBUTING.md'
34+
- '!CHANGELOG.md'
35+
- '!LICENSE'
36+
- '!NOTICE'
37+
- '!README.md'
2738

2839
concurrency:
2940
group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event_name }}
3041
cancel-in-progress: true
3142

3243
env:
33-
rust_msrv: "1.85.0"
44+
rust_msrv: "1.87"
3445

3546
jobs:
3647
check:
@@ -49,13 +60,14 @@ jobs:
4960
- name: Check License Header
5061
uses: apache/skywalking-eyes/[email protected]
5162

52-
- name: Install taplo-cli
53-
uses: taiki-e/install-action@v2
54-
with:
55-
5663
- name: Check toml format
5764
run: make check-toml
5865

66+
- name: Install protoc
67+
uses: arduino/setup-protoc@v3
68+
with:
69+
repo-token: ${{ secrets.GITHUB_TOKEN }}
70+
5971
- name: Cargo format
6072
run: make check-fmt
6173

@@ -65,12 +77,8 @@ jobs:
6577
- name: Cargo clippy
6678
run: make check-clippy
6779

68-
- name: Install cargo-machete
69-
uses: taiki-e/install-action@v2
70-
with:
71-
tool: cargo-machete
7280
- name: Cargo Machete
73-
run: cargo machete
81+
run: make cargo-machete
7482

7583
build:
7684
runs-on: ${{ matrix.os }}
@@ -89,6 +97,11 @@ jobs:
8997
- name: Cache Rust artifacts
9098
uses: Swatinem/rust-cache@v2
9199

100+
- name: Install protoc
101+
uses: arduino/setup-protoc@v3
102+
with:
103+
repo-token: ${{ secrets.GITHUB_TOKEN }}
104+
92105
- name: Build
93106
run: make build
94107

@@ -131,6 +144,11 @@ jobs:
131144
- name: Setup Rust toolchain
132145
uses: ./.github/actions/setup-builder
133146

147+
- name: Install protoc
148+
uses: arduino/setup-protoc@v3
149+
with:
150+
repo-token: ${{ secrets.GITHUB_TOKEN }}
151+
134152
- name: Cache Rust artifacts
135153
uses: Swatinem/rust-cache@v2
136154

@@ -148,15 +166,15 @@ jobs:
148166
runs-on: ubuntu-latest
149167
steps:
150168
- uses: actions/checkout@v5
151-
- name: Setup Nightly Rust toolchain
152-
uses: ./.github/actions/setup-builder
153-
- name: Generate minimal versions lockfile
154-
run: |
155-
cargo generate-lockfile -Z direct-minimal-versions -Z minimal-versions
169+
- name: Install protoc
170+
uses: arduino/setup-protoc@v3
171+
with:
172+
repo-token: ${{ secrets.GITHUB_TOKEN }}
156173
- name: Setup MSRV Rust toolchain
157174
uses: ./.github/actions/setup-builder
158175
with:
159176
rust-version: ${{ env.rust_msrv }}
177+
- name: Setup Nightly Rust toolchain
178+
uses: ./.github/actions/setup-builder
160179
- name: Check MSRV
161-
run: |
162-
cargo +${{ env.rust_msrv }} check --locked --workspace
180+
run: make check-msrv

.github/workflows/ci_typos.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,4 @@ jobs:
4242
steps:
4343
- uses: actions/checkout@v5
4444
- name: Check typos
45-
uses: crate-ci/typos@v1.35.5
45+
uses: crate-ci/typos@v1.36.3

.github/workflows/publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ on:
2727
workflow_dispatch:
2828

2929
env:
30-
rust_msrv: "1.85"
30+
rust_msrv: "1.87"
3131

3232
jobs:
3333
publish:

.github/workflows/release_python.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ on:
2525
workflow_dispatch:
2626

2727
env:
28-
rust_msrv: "1.85"
28+
rust_msrv: "1.87"
2929

3030
concurrency:
3131
group: ${{ github.workflow }}-${{ github.event.workflow_run.head_branch }}-${{ github.event_name }}
@@ -144,7 +144,7 @@ jobs:
144144
rm Cargo.toml
145145
mv Cargo.toml.tmp Cargo.toml
146146
147-
- uses: actions/setup-python@v5
147+
- uses: actions/setup-python@v6
148148
with:
149149
python-version: 3.9
150150
- name: Setup Rust toolchain

.github/workflows/release_python_nightly.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ on:
2323
workflow_dispatch: # Allows manual triggering
2424

2525
env:
26-
rust_msrv: "1.85"
26+
rust_msrv: "1.87"
2727

2828
permissions:
2929
contents: read
@@ -84,7 +84,7 @@ jobs:
8484
with:
8585
timestamp: ${{ needs.set-version.outputs.TIMESTAMP }}
8686

87-
- uses: actions/setup-python@v5
87+
- uses: actions/setup-python@v6
8888
with:
8989
python-version: 3.9
9090

.github/workflows/stale.yml

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
#
2+
# Licensed to the Apache Software Foundation (ASF) under one
3+
# or more contributor license agreements. See the NOTICE file
4+
# distributed with this work for additional information
5+
# regarding copyright ownership. The ASF licenses this file
6+
# to you under the Apache License, Version 2.0 (the
7+
# "License"); you may not use this file except in compliance
8+
# with the License. You may obtain a copy of the License at
9+
#
10+
# http://www.apache.org/licenses/LICENSE-2.0
11+
#
12+
# Unless required by applicable law or agreed to in writing,
13+
# software distributed under the License is distributed on an
14+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
# KIND, either express or implied. See the License for the
16+
# specific language governing permissions and limitations
17+
# under the License.
18+
#
19+
20+
name: "Close Stale Issues"
21+
on:
22+
schedule:
23+
- cron: '0 0 * * *'
24+
25+
permissions:
26+
# All other permissions are set to none
27+
issues: write
28+
29+
jobs:
30+
stale:
31+
if: github.repository_owner == 'apache'
32+
runs-on: ubuntu-22.04
33+
steps:
34+
- uses: actions/[email protected]
35+
with:
36+
stale-issue-label: 'stale'
37+
exempt-issue-labels: 'not-stale'
38+
days-before-issue-stale: 180
39+
days-before-issue-close: 14
40+
# Only close stale issues, leave PRs alone
41+
days-before-pr-stale: -1
42+
stale-issue-message: >
43+
This issue has been automatically marked as stale because it has been open for 180 days
44+
with no activity. It will be closed in next 14 days if no further activity occurs. To
45+
permanently prevent this issue from being considered stale, add the label 'not-stale',
46+
but commenting on the issue is preferred when possible.
47+
close-issue-message: >
48+
This issue has been closed because it has not received any activity in the last 14 days
49+
since being marked as 'stale'

.github/workflows/website.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,9 @@ on:
2222
branches:
2323
- main
2424
pull_request:
25-
branches:
26-
- main
25+
paths:
26+
- ".github/workflows/website.yml"
27+
- "website/**"
2728

2829
concurrency:
2930
group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event_name }}
@@ -40,7 +41,12 @@ jobs:
4041
- name: Setup mdBook
4142
uses: peaceiris/actions-mdbook@v2
4243
with:
43-
mdbook-version: '0.4.36'
44+
mdbook-version: "0.4.36"
45+
46+
- name: Install protoc
47+
uses: arduino/setup-protoc@v3
48+
with:
49+
repo-token: ${{ secrets.GITHUB_TOKEN }}
4450

4551
- name: Build
4652
working-directory: website

0 commit comments

Comments
 (0)