Skip to content

Commit 8f4c6b6

Browse files
authored
Merge branch 'main' into feature/url-encode-hive-values-clean
2 parents e166b0e + 8c16a08 commit 8f4c6b6

File tree

1,408 files changed

+97943
-97602
lines changed

Some content is hidden

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

1,408 files changed

+97943
-97602
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: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
# under the License.
1717

1818
# All of the following environment variables are required to set default values
19-
# for the parameters in docker-compose.yml.
19+
# for the parameters in compose.yaml.
2020

21-
# empty prefix means that the docker-compose configuration will use named
21+
# empty prefix means that the docker compose configuration will use named
2222
# volumes which potentially improves the performance on docker for macos and
2323
# docker for windows, it also prevents the contamination of the source
2424
# directory
@@ -37,6 +37,10 @@ DOCKER_BUILDKIT=1
3737
ARCH=amd64
3838
ARCH_ALIAS=x86_64
3939
ARCH_SHORT=amd64
40+
# For aarch64
41+
# ARCH=arm64v8
42+
# ARCH_ALIAS=aarch64
43+
# ARCH_SHORT=arm64
4044

4145
# Default repository to pull and push images from
4246
REPO=apache/arrow-dev
@@ -70,9 +74,9 @@ NUMBA=latest
7074
NUMBA_CUDA=latest
7175
NUMPY=latest
7276
PANDAS=latest
73-
PYTHON=3.9
74-
PYTHON_IMAGE_TAG=3.9
75-
PYTHON_ABI_TAG=cp39
77+
PYTHON=3.10
78+
PYTHON_IMAGE_TAG=3.10
79+
PYTHON_ABI_TAG=cp310
7680
R=4.5
7781
SPARK=master
7882
TURBODBC=latest
@@ -83,22 +87,23 @@ R_ORG=rhub
8387
R_TAG=latest
8488

8589
# Env vars for R builds
90+
R_UPDATE_CLANG=false
8691
R_CUSTOM_CCACHE=false
8792
ARROW_R_DEV=TRUE
8893
R_PRUNE_DEPS=FALSE
8994
TZ=UTC
9095

91-
# Used through docker-compose.yml and serves as the default version for the
96+
# Used through compose.yaml and serves as the default version for the
9297
# ci/scripts/install_vcpkg.sh script. Prefer to use short SHAs to keep the
9398
# docker tags more readable.
94-
VCPKG="f7423ee180c4b7f40d43402c2feb3859161ef625" # 2024.06.15 Release
99+
VCPKG="4334d8b4c8916018600212ab4dd4bbdc343065d1" # 2025.09.17 Release
95100

96101
# This must be updated when we update
97102
# ci/docker/python-*-windows-*.dockerfile or the vcpkg config.
98103
# This is a workaround for our CI problem that "archery docker build" doesn't
99104
# 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
105+
PYTHON_WHEEL_WINDOWS_IMAGE_REVISION=2025-10-13
106+
PYTHON_WHEEL_WINDOWS_TEST_IMAGE_REVISION=2025-10-13
102107

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

.gitattributes

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cpp/src/arrow/util/bpacking_*_generated.h linguist-generated=true
1+
cpp/src/arrow/util/bpacking_*_generated_internal.h linguist-generated=true
22
cpp/src/parquet/chunker_*_generated.h linguist-generated=true
33
cpp/src/generated/*.cpp linguist-generated=true
44
cpp/src/generated/*.h linguist-generated=true

.github/CODEOWNERS

Lines changed: 2 additions & 3 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
@@ -61,7 +60,7 @@ appveyor.yml @assignUser @kou @raulcd
6160
/dev/ @assignUser @jonkeane @kou @raulcd
6261
.dockerignore @raulcd
6362
.env @assignUser @jonkeane @kou @raulcd
64-
docker-compose.yml @assignUser @jonkeane @kou @raulcd
63+
compose.yaml @assignUser @jonkeane @kou @raulcd
6564

6665
# R specific packaging tooling
6766
/r/configure* @assignUser

.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: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@ on:
2929
- '.github/workflows/archery.yml'
3030
- 'dev/archery/**'
3131
- 'dev/tasks/**'
32-
- 'docker-compose.yml'
32+
- 'compose.yaml'
3333
pull_request:
3434
paths:
3535
- '.dockerignore'
3636
- '.github/workflows/archery.yml'
3737
- 'dev/archery/**'
3838
- 'dev/tasks/**'
39-
- 'docker-compose.yml'
39+
- 'compose.yaml'
4040

4141
env:
4242
ARCHERY_DEBUG: 1
@@ -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/check_labels.yml

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
18+
name: Check Labels Reusable
19+
20+
on:
21+
workflow_call:
22+
inputs:
23+
parent-workflow:
24+
description: "The parent workflow filename (without .yml)"
25+
required: true
26+
type: string
27+
outputs:
28+
ci-extra-labels:
29+
description: "The extra CI labels"
30+
value: ${{ jobs.check-labels.outputs.ci-extra-labels }}
31+
force:
32+
description: "Whether to force running the jobs"
33+
value: ${{ jobs.check-labels.outputs.force }}
34+
35+
jobs:
36+
check-labels:
37+
name: Check labels
38+
runs-on: ubuntu-latest
39+
timeout-minutes: 5
40+
outputs:
41+
ci-extra-labels: ${{ steps.check.outputs.ci-extra-labels }}
42+
force: ${{ steps.check.outputs.force }}
43+
steps:
44+
- name: Checkout Arrow
45+
if: github.event_name == 'pull_request'
46+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
47+
- name: Check
48+
id: check
49+
env:
50+
GH_TOKEN: ${{ github.token }}
51+
run: |
52+
set -ex
53+
case "${GITHUB_EVENT_NAME}" in
54+
push|schedule|workflow_dispatch)
55+
echo "force=true" >> "${GITHUB_OUTPUT}"
56+
;;
57+
pull_request)
58+
{
59+
echo "ci-extra-labels<<LABELS"
60+
gh pr view ${{ github.event.number }} \
61+
--jq '[.labels[].name | select(startswith("CI: Extra"))]' \
62+
--json labels \
63+
--repo ${GITHUB_REPOSITORY}
64+
echo "LABELS"
65+
} >> "${GITHUB_OUTPUT}"
66+
git fetch origin ${GITHUB_BASE_REF}
67+
git diff --stat origin/${GITHUB_BASE_REF}..
68+
if git diff --stat origin/${GITHUB_BASE_REF}.. | \
69+
grep \
70+
--fixed-strings ".github/workflows/${{ inputs.parent-workflow }}.yml" \
71+
--quiet; then
72+
echo "force=true" >> "${GITHUB_OUTPUT}"
73+
fi
74+
;;
75+
esac

.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: |

0 commit comments

Comments
 (0)