Skip to content

Commit 075e9f8

Browse files
author
Rafał Hibner
committed
Merge branch 'main' into PushGeneratorWithBackpressure
2 parents 653b7eb + 4b55ea6 commit 075e9f8

File tree

967 files changed

+14313
-64093
lines changed

Some content is hidden

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

967 files changed

+14313
-64093
lines changed

.clang-format

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,4 @@ ColumnLimit: 90
2020
DerivePointerAlignment: false
2121
IncludeBlocks: Preserve
2222
IndentPPDirectives: AfterHash
23+
QualifierAlignment: Left

.env

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,9 @@ NUMBA=latest
7070
NUMBA_CUDA=latest
7171
NUMPY=latest
7272
PANDAS=latest
73-
PYTHON=3.9
74-
PYTHON_IMAGE_TAG=3.9
75-
PYTHON_ABI_TAG=cp39
73+
PYTHON=3.10
74+
PYTHON_IMAGE_TAG=3.10
75+
PYTHON_ABI_TAG=cp310
7676
R=4.5
7777
SPARK=master
7878
TURBODBC=latest
@@ -83,6 +83,7 @@ R_ORG=rhub
8383
R_TAG=latest
8484

8585
# Env vars for R builds
86+
R_UPDATE_CLANG=false
8687
R_CUSTOM_CCACHE=false
8788
ARROW_R_DEV=TRUE
8889
R_PRUNE_DEPS=FALSE
@@ -91,14 +92,14 @@ TZ=UTC
9192
# Used through docker-compose.yml and serves as the default version for the
9293
# ci/scripts/install_vcpkg.sh script. Prefer to use short SHAs to keep the
9394
# docker tags more readable.
94-
VCPKG="f7423ee180c4b7f40d43402c2feb3859161ef625" # 2024.06.15 Release
95+
VCPKG="4334d8b4c8916018600212ab4dd4bbdc343065d1" # 2025.09.17 Release
9596

9697
# This must be updated when we update
9798
# ci/docker/python-*-windows-*.dockerfile or the vcpkg config.
9899
# This is a workaround for our CI problem that "archery docker build" doesn't
99100
# use pulled built images in dev/tasks/python-wheels/github.windows.yml.
100-
PYTHON_WHEEL_WINDOWS_IMAGE_REVISION=2025-02-25
101-
PYTHON_WHEEL_WINDOWS_TEST_IMAGE_REVISION=2025-02-25
101+
PYTHON_WHEEL_WINDOWS_IMAGE_REVISION=2025-09-04
102+
PYTHON_WHEEL_WINDOWS_TEST_IMAGE_REVISION=2025-09-04
102103

103104
# Use conanio/${CONAN_BASE}:{CONAN_VERSION} for "docker compose run --rm conan".
104105
# See https://github.com/conan-io/conan-docker-tools#readme and

.github/CODEOWNERS

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,8 @@
3333
/cpp/src/arrow/engine @westonpace
3434
/cpp/src/arrow/flight/ @lidavidm
3535
/cpp/src/parquet @wgtmac
36-
/csharp/ @curthagenlocher
3736
/matlab/ @kevingurney @kou @sgilmore10
38-
/python/ @AlenkaF @raulcd @rok
37+
/python/ @AlenkaF @raulcd @rok
3938
/python/pyarrow/_flight.pyx @lidavidm
4039
/python/pyarrow/**/*gandiva* @wjones127
4140
/r/ @jonkeane @thisisnic

.github/dependabot.yml

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -24,34 +24,3 @@ updates:
2424
commit-message:
2525
prefix: "MINOR: [CI] "
2626
open-pull-requests-limit: 10
27-
- package-ecosystem: "gomod"
28-
directory: "/swift/CDataWGo/"
29-
schedule:
30-
interval: "weekly"
31-
commit-message:
32-
prefix: "MINOR: [Swift] "
33-
open-pull-requests-limit: 10
34-
- package-ecosystem: "gomod"
35-
directory: "/swift/data-generator/swift-datagen/"
36-
schedule:
37-
interval: "weekly"
38-
commit-message:
39-
prefix: "MINOR: [Swift] "
40-
open-pull-requests-limit: 10
41-
- package-ecosystem: "nuget"
42-
directory: "/csharp/"
43-
schedule:
44-
interval: "weekly"
45-
commit-message:
46-
prefix: "MINOR: [C#] "
47-
open-pull-requests-limit: 10
48-
ignore:
49-
- dependency-name: "Microsoft.Extensions.*"
50-
update-types:
51-
- "version-update:semver-major"
52-
- dependency-name: "Microsoft.Bcl.*"
53-
update-types:
54-
- "version-update:semver-major"
55-
- dependency-name: "System.*"
56-
update-types:
57-
- "version-update:semver-major"

.github/workflows/archery.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,9 @@ jobs:
6565
shell: bash
6666
run: git branch $ARCHERY_DEFAULT_BRANCH origin/$ARCHERY_DEFAULT_BRANCH || true
6767
- name: Setup Python
68-
uses: actions/setup-python@v5.6.0
68+
uses: actions/setup-python@v6.0.0
6969
with:
70-
python-version: '3.9'
70+
python-version: '3.12'
7171
- name: Install pygit2 binary wheel
7272
run: pip install pygit2 --only-binary pygit2
7373
- name: Install Archery, Crossbow- and Test Dependencies

.github/workflows/comment_bot.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
# fetch the tags for version number generation
4343
fetch-depth: 0
4444
- name: Set up Python
45-
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
45+
uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
4646
with:
4747
python-version: 3.12
4848
- name: Install Archery and Crossbow dependencies
@@ -63,7 +63,7 @@ jobs:
6363
if: github.event.comment.body == 'take'
6464
runs-on: ubuntu-latest
6565
steps:
66-
- uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
66+
- uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
6767
with:
6868
github-token: ${{ secrets.GITHUB_TOKEN }}
6969
script: |

.github/workflows/cpp.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,8 @@ jobs:
9393
image: ubuntu-cpp-sanitizer
9494
llvm: 14
9595
runs-on: ubuntu-latest
96-
title: AMD64 Ubuntu 22.04 C++ ASAN UBSAN
97-
ubuntu: 22.04
96+
title: AMD64 Ubuntu 24.04 C++ ASAN UBSAN
97+
ubuntu: 24.04
9898
- arch: arm64v8
9999
clang-tools: 14
100100
image: ubuntu-cpp
@@ -123,7 +123,7 @@ jobs:
123123
- name: Setup Python on hosted runner
124124
if: |
125125
matrix.runs-on == 'ubuntu-latest'
126-
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
126+
uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
127127
with:
128128
python-version: 3
129129
- name: Setup Python on self-hosted runner
@@ -235,7 +235,7 @@ jobs:
235235
$(brew --prefix bash)/bin/bash \
236236
ci/scripts/install_minio.sh latest ${ARROW_HOME}
237237
- name: Set up Python
238-
uses: actions/setup-python@v5.6.0
238+
uses: actions/setup-python@v6.0.0
239239
with:
240240
python-version: 3.12
241241
- name: Install Google Cloud Storage Testbench
@@ -465,10 +465,10 @@ jobs:
465465
https://dl.min.io/server/minio/release/windows-amd64/archive/minio.RELEASE.2024-09-13T20-26-02Z
466466
chmod +x /usr/local/bin/minio.exe
467467
- name: Set up Python
468-
uses: actions/setup-python@v5.6.0
468+
uses: actions/setup-python@v6.0.0
469469
id: python-install
470470
with:
471-
python-version: 3.9
471+
python-version: '3.12'
472472
- name: Install Google Cloud Storage Testbench
473473
shell: msys2 {0}
474474
env:

.github/workflows/cpp_extra.yml

Lines changed: 58 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ jobs:
161161
key: extra-${{ matrix.image }}-${{ hashFiles('cpp/**') }}
162162
restore-keys: extra-${{ matrix.image }}-
163163
- name: Setup Python
164-
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
164+
uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
165165
with:
166166
python-version: 3
167167
- name: Setup Archery
@@ -278,3 +278,60 @@ jobs:
278278
cmake --build cpp/examples/minimal_build.build
279279
cd cpp/examples/minimal_build
280280
../minimal_build.build/arrow-example
281+
282+
report-extra-cpp:
283+
runs-on: ubuntu-latest
284+
needs:
285+
- docker
286+
- jni-macos
287+
# We don't have the job id as part of the context neither the job name.
288+
# The GitHub API exposes numeric id or job name but not the github.job (report-extra-cpp).
289+
# We match github.job to the name so we can pass it via context in order to be ignored on the report.
290+
# The job is still running.
291+
name: ${{ github.job }}
292+
if: github.event_name == 'schedule' && always()
293+
steps:
294+
- name: Checkout Arrow
295+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
296+
with:
297+
fetch-depth: 0
298+
- name: Setup Python
299+
uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
300+
with:
301+
python-version: 3
302+
- name: Setup Archery
303+
run: python3 -m pip install -e dev/archery[crossbow]
304+
- name: Prepare common options
305+
run: |
306+
if [ "${GITHUB_REPOSITORY}" = "apache/arrow" ]; then
307+
echo "COMMON_OPTIONS=--send" >> "${GITHUB_ENV}"
308+
else
309+
echo "COMMON_OPTIONS=--dry-run" >> "${GITHUB_ENV}"
310+
fi
311+
- name: Send email
312+
env:
313+
GH_TOKEN: ${{ github.token }}
314+
SMTP_PASSWORD: ${{ secrets.ARROW_SMTP_PASSWORD }}
315+
run: |
316+
archery ci report-email \
317+
--ignore ${{ github.job }} \
318+
--recipient-email 'builds@arrow.apache.org' \
319+
--repository ${{ github.repository }} \
320+
--sender-email 'arrow@commit-email.info' \
321+
--sender-name Arrow \
322+
--smtp-port 587 \
323+
--smtp-server 'commit-email.info' \
324+
--smtp-user arrow \
325+
${COMMON_OPTIONS} \
326+
${{ github.run_id }}
327+
- name: Send chat message
328+
if: always()
329+
env:
330+
GH_TOKEN: ${{ github.token }}
331+
CHAT_WEBHOOK: ${{ secrets.ARROW_ZULIP_WEBHOOK }}
332+
run: |
333+
archery ci report-chat \
334+
--ignore ${{ github.job }} \
335+
--repository ${{ github.repository }} \
336+
${COMMON_OPTIONS} \
337+
${{ github.run_id }}

0 commit comments

Comments
 (0)