Skip to content

Commit a46dabe

Browse files
committed
Merge remote-tracking branch 'origin/main' into fix/collect-nan-value-counts
# Conflicts: # tests/catalog/test_catalog_behaviors.py
2 parents a475538 + 042165a commit a46dabe

73 files changed

Lines changed: 2560 additions & 248 deletions

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

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,10 @@ 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:
3539
runs-on: ubuntu-slim

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ concurrency:
3333

3434
jobs:
3535
markdown-link-check:
36-
runs-on: ubuntu-latest
36+
runs-on: ubuntu-24.04
3737
steps:
3838
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
3939
with:

‎.github/workflows/codeql.yml‎

Lines changed: 4 additions & 0 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

‎.github/workflows/license_check.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@ 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:
3034
runs-on: ubuntu-slim

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

Lines changed: 2 additions & 2 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:
@@ -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

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

Lines changed: 4 additions & 4 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
@@ -66,7 +66,7 @@ jobs:
6666
# the repository, otherwise the tests will fail
6767
- name: Compile source distribution
6868
run: uv build --sdist
69-
if: matrix.os == 'ubuntu-latest'
69+
if: matrix.os == 'ubuntu-24.04'
7070

7171
- name: Build wheels
7272
uses: pypa/cibuildwheel@e090b81e30c4d855ea63bf4b6e59204c09a101ae # v4.2.1
@@ -86,7 +86,7 @@ jobs:
8686

8787

8888
- name: Add source distribution
89-
if: matrix.os == 'ubuntu-latest'
89+
if: matrix.os == 'ubuntu-24.04'
9090
run: ls -lah dist/* && cp dist/* wheelhouse/
9191

9292
- uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
@@ -95,7 +95,7 @@ jobs:
9595
path: ./wheelhouse/*
9696

9797
pypi-merge-artifacts:
98-
runs-on: ubuntu-latest
98+
runs-on: ubuntu-slim
9999
needs:
100100
- pypi-build-artifacts
101101
steps:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ concurrency:
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

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ concurrency:
3232

3333
jobs:
3434
integration-test:
35-
runs-on: ubuntu-latest
35+
runs-on: ubuntu-24.04
3636
timeout-minutes: 20
3737
steps:
3838
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
@@ -62,7 +62,7 @@ jobs:
6262
include-hidden-files: true
6363

6464
integration-test-s3:
65-
runs-on: ubuntu-latest
65+
runs-on: ubuntu-24.04
6666
timeout-minutes: 10
6767
steps:
6868
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
@@ -92,7 +92,7 @@ jobs:
9292
include-hidden-files: true
9393

9494
integration-test-adls:
95-
runs-on: ubuntu-latest
95+
runs-on: ubuntu-24.04
9696
timeout-minutes: 10
9797
steps:
9898
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
@@ -122,7 +122,7 @@ jobs:
122122
include-hidden-files: true
123123

124124
integration-test-gcs:
125-
runs-on: ubuntu-latest
125+
runs-on: ubuntu-24.04
126126
timeout-minutes: 10
127127
steps:
128128
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ concurrency:
3030

3131
jobs:
3232
docs:
33-
runs-on: ubuntu-latest
33+
runs-on: ubuntu-slim
3434
permissions:
3535
contents: write
3636

0 commit comments

Comments
 (0)