Skip to content

Commit 0083e02

Browse files
Merge remote-tracking branch 'upstream/main' into apachegh-43410-arrow-pycapsule-dataset
2 parents 563b30c + 0f7b5e5 commit 0083e02

File tree

725 files changed

+21031
-9525
lines changed

Some content is hidden

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

725 files changed

+21031
-9525
lines changed

.clang-format

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,4 @@ BasedOnStyle: Google
1919
ColumnLimit: 90
2020
DerivePointerAlignment: false
2121
IncludeBlocks: Preserve
22+
IndentPPDirectives: AfterHash

.dockerignore

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@
2727
# include explicitly
2828
!ci/**
2929
!c_glib/Gemfile
30-
!dev/archery/setup.py
3130
!dev/release/setup-*.sh
3231
!docs/requirements*.txt
32+
!go/go.mod
33+
!go/go.sum
3334
!python/requirements*.txt
34-
!python/manylinux1/**
3535
!r/DESCRIPTION
3636
!ruby/Gemfile
3737
!ruby/red-arrow/Gemfile
@@ -46,20 +46,3 @@
4646
!ruby/red-parquet/Gemfile
4747
!ruby/red-parquet/lib/parquet/version.rb
4848
!ruby/red-parquet/red-parquet.gemspec
49-
!ruby/red-plasma/Gemfile
50-
!ruby/red-plasma/lib/plasma/version.rb
51-
!ruby/red-plasma/red-plasma.gemspec
52-
!rust/Cargo.toml
53-
!rust/benchmarks/Cargo.toml
54-
!rust/arrow/Cargo.toml
55-
!rust/arrow/benches
56-
!rust/arrow-flight/Cargo.toml
57-
!rust/parquet/Cargo.toml
58-
!rust/parquet/build.rs
59-
!rust/parquet_derive/Cargo.toml
60-
!rust/parquet_derive_test/Cargo.toml
61-
!rust/datafusion/Cargo.toml
62-
!rust/datafusion/benches
63-
!rust/integration-testing/Cargo.toml
64-
!go/go.mod
65-
!go/go.sum

.env

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,6 @@ CUDA=11.2.2
5858
DASK=latest
5959
DOTNET=8.0
6060
GCC_VERSION=""
61-
GO=1.21.8
62-
STATICCHECK=v0.4.7
6361
HDFS=3.2.1
6462
JDK=11
6563
KARTOTHEK=latest
@@ -70,7 +68,9 @@ NODE=18
7068
NUMBA=latest
7169
NUMPY=latest
7270
PANDAS=latest
73-
PYTHON=3.8
71+
PYTHON=3.9
72+
PYTHON_IMAGE_TAG=3.9
73+
PYTHON_ABI_TAG=cp39
7474
R=4.4
7575
SPARK=master
7676
TURBODBC=latest
@@ -95,7 +95,7 @@ VCPKG="943c5ef1c8f6b5e6ced092b242c8299caae2ff01" # 2024.04.26 Release
9595
# ci/docker/python-wheel-windows-vs2019.dockerfile.
9696
# This is a workaround for our CI problem that "archery docker build" doesn't
9797
# use pulled built images in dev/tasks/python-wheels/github.windows.yml.
98-
PYTHON_WHEEL_WINDOWS_IMAGE_REVISION=2024-06-18
98+
PYTHON_WHEEL_WINDOWS_IMAGE_REVISION=2024-08-06
9999

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

.github/dependabot.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,6 @@ updates:
2424
commit-message:
2525
prefix: "MINOR: [CI] "
2626
open-pull-requests-limit: 10
27-
- package-ecosystem: "gomod"
28-
directory: "/go/"
29-
schedule:
30-
interval: "weekly"
31-
commit-message:
32-
prefix: "MINOR: [Go] "
33-
open-pull-requests-limit: 10
3427
- package-ecosystem: "maven"
3528
directory: "/java/"
3629
schedule:

.github/workflows/archery.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,14 @@ name: Archery & Crossbow
2020
on:
2121
push:
2222
paths:
23+
- '.dockerignore'
2324
- '.github/workflows/archery.yml'
2425
- 'dev/archery/**'
2526
- 'dev/tasks/**'
2627
- 'docker-compose.yml'
2728
pull_request:
2829
paths:
30+
- '.dockerignore'
2931
- '.github/workflows/archery.yml'
3032
- 'dev/archery/**'
3133
- 'dev/tasks/**'
@@ -58,7 +60,7 @@ jobs:
5860
shell: bash
5961
run: git branch $ARCHERY_DEFAULT_BRANCH origin/$ARCHERY_DEFAULT_BRANCH || true
6062
- name: Setup Python
61-
uses: actions/setup-python@v5.1.1
63+
uses: actions/setup-python@v5.2.0
6264
with:
6365
python-version: '3.9'
6466
- name: Install pygit2 binary wheel

.github/workflows/comment_bot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
# fetch the tags for version number generation
4242
fetch-depth: 0
4343
- name: Set up Python
44-
uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # v5.1.1
44+
uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
4545
with:
4646
python-version: 3.12
4747
- name: Install Archery and Crossbow dependencies

.github/workflows/cpp.yml

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ name: C++
2020
on:
2121
push:
2222
paths:
23+
- '.dockerignore'
2324
- '.github/workflows/cpp.yml'
2425
- 'ci/conda_env_*'
2526
- 'ci/docker/**'
@@ -35,6 +36,7 @@ on:
3536
- 'testing'
3637
pull_request:
3738
paths:
39+
- '.dockerignore'
3840
- '.github/workflows/cpp.yml'
3941
- 'ci/conda_env_*'
4042
- 'ci/docker/**'
@@ -99,7 +101,6 @@ jobs:
99101
cat <<JSON >> "$GITHUB_OUTPUT"
100102
{
101103
"arch": "arm64v8",
102-
"archery-use-legacy-docker-compose": "1",
103104
"clang-tools": "10",
104105
"image": "ubuntu-cpp",
105106
"llvm": "10",
@@ -124,9 +125,6 @@ jobs:
124125
include: ${{ fromJson(needs.docker-targets.outputs.targets) }}
125126
env:
126127
ARCH: ${{ matrix.arch }}
127-
# By default, use `docker compose` because docker-compose v1 is obsolete,
128-
# except where the Docker client version is too old.
129-
ARCHERY_USE_LEGACY_DOCKER_COMPOSE: ${{ matrix.archery-use-legacy-docker-compose || '0' }}
130128
ARROW_SIMD_LEVEL: ${{ matrix.simd-level }}
131129
CLANG_TOOLS: ${{ matrix.clang-tools }}
132130
LLVM: ${{ matrix.llvm }}
@@ -147,6 +145,7 @@ jobs:
147145
run: |
148146
sudo apt update
149147
sudo apt install -y --no-install-recommends python3 python3-dev python3-pip
148+
python3 -m pip install -U pip
150149
- name: Setup Archery
151150
run: python3 -m pip install -e dev/archery[docker]
152151
- name: Execute Docker Build
@@ -156,8 +155,7 @@ jobs:
156155
run: |
157156
# GH-40558: reduce ASLR to avoid ASAN/LSAN crashes
158157
sudo sysctl -w vm.mmap_rnd_bits=28
159-
sudo sysctl -w kernel.core_pattern="core.%e.%p"
160-
ulimit -c unlimited
158+
source ci/scripts/util_enable_core_dumps.sh
161159
archery docker run ${{ matrix.image }}
162160
- name: Docker Push
163161
if: >-
@@ -246,7 +244,7 @@ jobs:
246244
$(brew --prefix bash)/bin/bash \
247245
ci/scripts/install_minio.sh latest ${ARROW_HOME}
248246
- name: Set up Python
249-
uses: actions/setup-python@v5.1.1
247+
uses: actions/setup-python@v5.2.0
250248
with:
251249
python-version: 3.12
252250
- name: Install Google Cloud Storage Testbench
@@ -273,7 +271,7 @@ jobs:
273271
shell: bash
274272
run: |
275273
sudo sysctl -w kern.coredump=1
276-
sudo sysctl -w kern.corefile=core.%N.%P
274+
sudo sysctl -w kern.corefile=/tmp/core.%N.%P
277275
ulimit -c unlimited # must enable within the same shell
278276
ci/scripts/cpp_test.sh $(pwd) $(pwd)/build
279277
@@ -412,12 +410,10 @@ jobs:
412410
ARROW_WITH_SNAPPY: ON
413411
ARROW_WITH_ZLIB: ON
414412
ARROW_WITH_ZSTD: ON
415-
# Don't use preinstalled Boost by empty BOOST_ROOT and
416-
# -DBoost_NO_BOOST_CMAKE=ON
413+
# Don't use preinstalled Boost by empty BOOST_ROOT
417414
BOOST_ROOT: ""
418415
ARROW_CMAKE_ARGS: >-
419416
-DARROW_PACKAGE_PREFIX=/${{ matrix.msystem_lower}}
420-
-DBoost_NO_BOOST_CMAKE=ON
421417
-DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
422418
# We can't use unity build because we don't have enough memory on
423419
# GitHub Actions.
@@ -467,16 +463,18 @@ jobs:
467463
https://dl.min.io/server/minio/release/windows-amd64/archive/minio.RELEASE.2022-05-26T05-48-41Z
468464
chmod +x /usr/local/bin/minio.exe
469465
- name: Set up Python
470-
uses: actions/[email protected]
466+
uses: actions/[email protected]
467+
id: python-install
471468
with:
472469
python-version: 3.9
473470
- name: Install Google Cloud Storage Testbench
474-
shell: bash
471+
shell: msys2 {0}
472+
env:
473+
PIPX_BIN_DIR: /usr/local/bin
474+
PIPX_BASE_PYTHON: ${{ steps.python-install.outputs.python-path }}
475475
run: |
476476
ci/scripts/install_gcs_testbench.sh default
477-
echo "PYTHON_BIN_DIR=$(cygpath --windows $(dirname $(which python3.exe)))" >> $GITHUB_ENV
478477
- name: Test
479478
shell: msys2 {0}
480479
run: |
481-
PATH="$(cygpath --unix ${PYTHON_BIN_DIR}):${PATH}"
482480
ci/scripts/cpp_test.sh "$(pwd)" "$(pwd)/build"

.github/workflows/csharp.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ jobs:
108108
with:
109109
dotnet-version: ${{ matrix.dotnet }}
110110
- name: Setup Python
111-
uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # v5.1.1
111+
uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
112112
with:
113113
python-version: 3.12
114114
- name: Checkout Arrow

.github/workflows/dev.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
with:
4646
fetch-depth: 0
4747
- name: Setup Python
48-
uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # v5.1.1
48+
uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
4949
with:
5050
python-version: 3.12
5151
- name: Install pre-commit
@@ -66,9 +66,9 @@ jobs:
6666
env:
6767
ARCHERY_DOCKER_USER: ${{ secrets.DOCKERHUB_USER }}
6868
ARCHERY_DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }}
69+
UBUNTU: 22.04
6970
run: |
70-
sudo sysctl -w kernel.core_pattern="core.%e.%p"
71-
ulimit -c unlimited
71+
source ci/scripts/util_enable_core_dumps.sh
7272
archery docker run -e GITHUB_ACTIONS=true ubuntu-lint
7373
- name: Docker Push
7474
if: >-
@@ -104,7 +104,7 @@ jobs:
104104
with:
105105
fetch-depth: 0
106106
- name: Install Python
107-
uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # v5.1.1
107+
uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
108108
with:
109109
python-version: '3.12'
110110
- name: Install Ruby

.github/workflows/docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
key: debian-docs-${{ hashFiles('cpp/**') }}
5353
restore-keys: debian-docs-
5454
- name: Setup Python
55-
uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # v5.1.1
55+
uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
5656
with:
5757
python-version: 3.12
5858
- name: Setup Archery

0 commit comments

Comments
 (0)