Skip to content

Commit bb6faf4

Browse files
committed
Merge remote-tracking branch 'upstream/main' into equality-delete-index
# Conflicts: # pyiceberg/io/pyarrow.py # pyiceberg/table/delete_file_index.py # tests/table/test_delete_file_index.py
2 parents 69795b9 + 639a3bf commit bb6faf4

129 files changed

Lines changed: 7925 additions & 2665 deletions

File tree

Some content is hidden

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

‎.asf.yaml‎

Lines changed: 45 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -33,43 +33,65 @@ github:
3333
squash: true
3434
squash_commit_message: PR_TITLE_AND_COMMIT_DETAILS
3535
rebase: true
36-
protected_branches:
37-
main:
38-
required_status_checks:
39-
contexts:
40-
# Repository policy and security checks.
41-
- Analyze Actions
42-
- Run zizmor 🌈
43-
- asf-allowlist-check
44-
- rat
45-
46-
# Documentation checks.
47-
- docs
48-
- markdown-link-check
49-
50-
# Python workflow gates.
51-
- python-ci-required
52-
- python-integration-required
53-
36+
# Disabled: GitHub blocks ruleset bypass while classic protection exists.
37+
# The "Default Branch Protection" ruleset replaces it.
38+
protected_branches: ~
39+
rulesets:
40+
- name: "Default Branch Protection"
41+
type: branch
42+
branches:
43+
includes:
44+
- "~DEFAULT_BRANCH"
45+
excludes: []
46+
bypass_teams:
47+
- root
48+
restrict_deletion: true
49+
restrict_force_push: true
50+
required_linear_history: true
5451
required_pull_request_reviews:
5552
required_approving_review_count: 1
56-
57-
required_linear_history: true
58-
rulesets:
5953
- name: Merge Queue
6054
target: branch
6155
enforcement: active
56+
bypass_actors:
57+
# apache/root (ASF Infra).
58+
- actor_id: 118420
59+
actor_type: Team
60+
bypass_mode: always
61+
# apache/iceberg-public. Iceberg committers can opt into this team via
62+
# https://gitbox.apache.org/boxer/.
63+
- actor_id: 20107235
64+
actor_type: Team
65+
bypass_mode: pull_request
6266
conditions:
6367
ref_name:
6468
include:
6569
- "~DEFAULT_BRANCH"
6670
exclude: []
6771
rules:
72+
- type: required_status_checks
73+
parameters:
74+
# Merge Queue already tests each entry against the latest main
75+
strict_required_status_checks_policy: false
76+
required_status_checks:
77+
# Repository policy and security checks.
78+
- context: Analyze Actions
79+
- context: Run zizmor 🌈
80+
- context: asf-allowlist-check
81+
- context: rat
82+
83+
# Documentation checks.
84+
- context: docs
85+
- context: markdown-link-check
86+
87+
# Python workflow gates.
88+
- context: python-ci-required
89+
- context: python-integration-required
6890
- type: merge_queue
6991
parameters:
70-
check_response_timeout_minutes: 90
92+
check_response_timeout_minutes: 180
7193
grouping_strategy: ALLGREEN
72-
max_entries_to_build: 1
94+
max_entries_to_build: 2
7395
max_entries_to_merge: 1
7496
merge_method: SQUASH
7597
min_entries_to_merge: 1

‎.codespellrc‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎.github/workflows/asf-allowlist-check.yml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,13 @@ on:
3030
permissions:
3131
contents: read
3232

33+
concurrency:
34+
group: ${{ github.workflow }}-${{ github.ref }}
35+
cancel-in-progress: ${{ github.event_name == 'pull_request' }}
36+
3337
jobs:
3438
asf-allowlist-check:
35-
runs-on: ubuntu-24.04
39+
runs-on: ubuntu-slim
3640
steps:
3741
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
3842
with:

‎.github/workflows/check-md-link.yml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,13 @@ on:
2727
permissions:
2828
contents: read
2929

30+
concurrency:
31+
group: ${{ github.workflow }}-${{ github.ref }}
32+
cancel-in-progress: true
33+
3034
jobs:
3135
markdown-link-check:
32-
runs-on: ubuntu-latest
36+
runs-on: ubuntu-24.04
3337
steps:
3438
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
3539
with:

‎.github/workflows/codeql.yml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ on:
3131
permissions:
3232
contents: read
3333

34+
concurrency:
35+
group: ${{ github.workflow }}-${{ github.ref }}
36+
cancel-in-progress: ${{ github.event_name == 'pull_request' }}
37+
3438
jobs:
3539
analyze:
3640
name: Analyze Actions
@@ -47,11 +51,11 @@ jobs:
4751
persist-credentials: false
4852

4953
- name: Initialize CodeQL
50-
uses: github/codeql-action/init@cdf488f595d80d6e07e03d4674febd5ab45fa938 # v4.37.9
54+
uses: github/codeql-action/init@9b3254085494b55a0f7c4c2b3d2d52cc712ce370 # v4.39.1
5155
with:
5256
languages: actions
5357

5458
- name: Perform CodeQL Analysis
55-
uses: github/codeql-action/analyze@cdf488f595d80d6e07e03d4674febd5ab45fa938 # v4.37.9
59+
uses: github/codeql-action/analyze@9b3254085494b55a0f7c4c2b3d2d52cc712ce370 # v4.39.1
5660
with:
5761
category: "/language:actions"

‎.github/workflows/license_check.yml‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,19 @@ on:
2525
permissions:
2626
contents: read
2727

28+
concurrency:
29+
group: ${{ github.workflow }}-${{ github.ref }}
30+
cancel-in-progress: ${{ github.event_name == 'pull_request' }}
31+
2832
jobs:
2933
rat:
30-
runs-on: ubuntu-latest
34+
runs-on: ubuntu-slim
3135
steps:
3236
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
3337
with:
3438
persist-credentials: false
39+
- uses: actions/setup-java@b843ebf9b913146b38da2eaa7aeddf76074ae1ad # v6.1.0
40+
with:
41+
distribution: temurin
42+
java-version: 21
3543
- run: dev/check-license

‎.github/workflows/nightly-pypi-build.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ permissions:
3030
jobs:
3131
set-version:
3232
if: github.repository == 'apache/iceberg-python' || github.event_name == 'workflow_dispatch' # Run on schedule for apache repo, or on manual dispatch from any repo
33-
runs-on: ubuntu-latest
33+
runs-on: ubuntu-slim
3434
outputs:
3535
VERSION: ${{ steps.set-version.outputs.VERSION }}
3636
steps:
@@ -44,7 +44,7 @@ jobs:
4444
python-version: 3.12
4545

4646
- name: Install UV
47-
uses: astral-sh/setup-uv@fac544c07dec837d0ccb6301d7b5580bf5edae39 # v8.2.0
47+
uses: astral-sh/setup-uv@c18668ad3cf93ea998bef934396af7bb5c839dc7 # v10.2.0
4848

4949
- name: Set version
5050
id: set-version
@@ -69,7 +69,7 @@ jobs:
6969
if: github.repository == 'apache/iceberg-python' # Only run for apache repo
7070
needs:
7171
- nightly-build
72-
runs-on: ubuntu-latest
72+
runs-on: ubuntu-24.04
7373
environment:
7474
name: testpypi
7575
url: https://test.pypi.org/p/pyiceberg
@@ -79,7 +79,7 @@ jobs:
7979

8080
steps:
8181
- name: Download all the artifacts
82-
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
82+
uses: actions/download-artifact@9000827ccba6bdab643e8b6fd33ac0654aef8333 # v8.0.2
8383
with:
8484
merge-multiple: true
8585
path: dist/
@@ -88,7 +88,7 @@ jobs:
8888
- name: Publish to TestPyPI
8989
id: publish-testpypi
9090
continue-on-error: true
91-
uses: pypa/gh-action-pypi-publish@dc37677b2e1c63e2034f94d8a5b11f265b73ba33 # v1.14.2
91+
uses: pypa/gh-action-pypi-publish@7245906fb61fa33a13554f9d5fb856fe61758086 # v1.14.3
9292
with:
9393
repository-url: https://test.pypi.org/legacy/
9494
skip-existing: true

‎.github/workflows/pypi-build-artifacts.yml‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
strategy:
3737
max-parallel: 15
3838
matrix:
39-
os: [ ubuntu-latest, ubuntu-24.04-arm, windows-latest, macos-15-intel, macos-latest ]
39+
os: [ ubuntu-24.04, ubuntu-24.04-arm, windows-latest, macos-15-intel, macos-latest ]
4040

4141
steps:
4242
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
@@ -47,14 +47,13 @@ jobs:
4747
- uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
4848
with:
4949
python-version: |
50-
3.10
5150
3.11
5251
3.12
5352
3.13
5453
3.14
5554
5655
- name: Install UV
57-
uses: astral-sh/setup-uv@fac544c07dec837d0ccb6301d7b5580bf5edae39 # v8.2.0
56+
uses: astral-sh/setup-uv@c18668ad3cf93ea998bef934396af7bb5c839dc7 # v10.2.0
5857

5958
- name: Set version with RC
6059
shell: bash
@@ -66,17 +65,17 @@ jobs:
6665
# the repository, otherwise the tests will fail
6766
- name: Compile source distribution
6867
run: uv build --sdist
69-
if: matrix.os == 'ubuntu-latest'
68+
if: matrix.os == 'ubuntu-24.04'
7069

7170
- name: Build wheels
72-
uses: pypa/cibuildwheel@1828c10ab37f080699c7b81cea34097c684a7074 # v4.2.0
71+
uses: pypa/cibuildwheel@b9e566a2b284570af229f6c2a33673410d0389a3 # v4.3.4
7372
with:
7473
output-dir: wheelhouse
7574
config-file: "pyproject.toml"
7675
env:
7776
# Ignore 32 bit architectures
7877
CIBW_ARCHS: "auto64"
79-
CIBW_PROJECT_REQUIRES_PYTHON: ">=3.10,<3.15"
78+
CIBW_PROJECT_REQUIRES_PYTHON: ">=3.11,<3.15"
8079
# Keep these in sync with Python CI job `cibw-dev-env-smoke-test`
8180
# in .github/workflows/python-ci.yml to catch import-time regressions early.
8281
CIBW_BEFORE_TEST: "uv sync --directory {project} --only-group dev --no-install-project"
@@ -86,7 +85,7 @@ jobs:
8685

8786

8887
- name: Add source distribution
89-
if: matrix.os == 'ubuntu-latest'
88+
if: matrix.os == 'ubuntu-24.04'
9089
run: ls -lah dist/* && cp dist/* wheelhouse/
9190

9291
- uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
@@ -95,7 +94,7 @@ jobs:
9594
path: ./wheelhouse/*
9695

9796
pypi-merge-artifacts:
98-
runs-on: ubuntu-latest
97+
runs-on: ubuntu-slim
9998
needs:
10099
- pypi-build-artifacts
101100
steps:

‎.github/workflows/python-ci-docs.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ permissions:
2929

3030
concurrency:
3131
group: ${{ github.workflow }}-${{ github.ref }}
32-
cancel-in-progress: ${{ github.event_name == 'pull_request' }}
32+
cancel-in-progress: true
3333

3434
jobs:
3535
docs:
@@ -43,6 +43,6 @@ jobs:
4343
with:
4444
python-version: 3.12
4545
- name: Install UV
46-
uses: astral-sh/setup-uv@fac544c07dec837d0ccb6301d7b5580bf5edae39 # v8.2.0
46+
uses: astral-sh/setup-uv@c18668ad3cf93ea998bef934396af7bb5c839dc7 # v10.2.0
4747
- name: Build docs
4848
run: make docs-build

‎.github/workflows/python-ci.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,17 @@ permissions:
2828

2929
concurrency:
3030
group: ${{ github.workflow }}-${{ github.ref }}
31-
cancel-in-progress: ${{ github.event_name == 'pull_request' }}
31+
cancel-in-progress: true
3232

3333
jobs:
3434
lint-and-unit-test:
35-
runs-on: ubuntu-latest
35+
runs-on: ubuntu-24.04
3636
timeout-minutes: 10
3737
strategy:
3838
max-parallel: 15
3939
fail-fast: true
4040
matrix:
41-
python: ['3.10', '3.11', '3.12', '3.13', '3.14']
41+
python: ['3.11', '3.12', '3.13', '3.14']
4242

4343
steps:
4444
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
@@ -48,18 +48,18 @@ jobs:
4848
with:
4949
python-version: ${{ matrix.python }}
5050
- name: Install UV
51-
uses: astral-sh/setup-uv@fac544c07dec837d0ccb6301d7b5580bf5edae39 # v8.2.0
51+
uses: astral-sh/setup-uv@c18668ad3cf93ea998bef934396af7bb5c839dc7 # v10.2.0
5252
with:
5353
enable-cache: true
5454
- name: Install system dependencies
5555
run: sudo apt-get update && sudo apt-get install -y libkrb5-dev # for kerberos
5656
- name: Check uv.lock is up to date
57-
if: matrix.python == '3.10'
57+
if: matrix.python == '3.11'
5858
run: uv lock --check
5959
- name: Install
6060
run: make install
6161
- name: Run linters
62-
if: matrix.python == '3.10'
62+
if: matrix.python == '3.11'
6363
run: make lint
6464
- name: Run unit tests with coverage
6565
run: COVERAGE=1 make test
@@ -82,7 +82,7 @@ jobs:
8282
with:
8383
python-version: ${{ matrix.python }}
8484
- name: Install UV
85-
uses: astral-sh/setup-uv@fac544c07dec837d0ccb6301d7b5580bf5edae39 # v8.2.0
85+
uses: astral-sh/setup-uv@c18668ad3cf93ea998bef934396af7bb5c839dc7 # v10.2.0
8686
with:
8787
enable-cache: true
8888
- name: Install
@@ -91,7 +91,7 @@ jobs:
9191
run: uv run python -m pytest tests/ -m unit --ignore=tests/integration -v -x
9292

9393
cibw-dev-env-smoke-test:
94-
runs-on: ubuntu-latest
94+
runs-on: ubuntu-slim
9595
steps:
9696
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
9797
with:
@@ -100,7 +100,7 @@ jobs:
100100
with:
101101
python-version: '3.12'
102102
- name: Install UV
103-
uses: astral-sh/setup-uv@fac544c07dec837d0ccb6301d7b5580bf5edae39 # v8.2.0
103+
uses: astral-sh/setup-uv@c18668ad3cf93ea998bef934396af7bb5c839dc7 # v10.2.0
104104
with:
105105
enable-cache: true
106106
# Why this exists:
@@ -118,7 +118,7 @@ jobs:
118118
python-ci-required:
119119
if: ${{ always() }}
120120
needs: [lint-and-unit-test, windows-unit-test, cibw-dev-env-smoke-test]
121-
runs-on: ubuntu-latest
121+
runs-on: ubuntu-slim
122122
steps:
123123
- name: Verify Python CI jobs succeeded
124124
env:

0 commit comments

Comments
 (0)