Skip to content

Commit eca6869

Browse files
jorisvandenbosschejorisvandenbossche
committed
Merge remote-tracking branch 'upstream/main' into device-interface-cuda
2 parents 3e9f913 + f2ce331 commit eca6869

2,734 files changed

Lines changed: 106464 additions & 68698 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: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,12 @@ github:
2121
collaborators:
2222
- anjakefala
2323
- benibus
24-
- danepitkin
2524
- davisusanibar
25+
- jbonofre
2626
- js8544
2727
- vibhatha
28+
- zanmato1984
29+
- ZhangHuiGui
2830

2931
notifications:
3032
commits: commits@arrow.apache.org

‎.env‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ UBUNTU=20.04
5656
CLANG_TOOLS=14
5757
CUDA=11.2.2
5858
DASK=latest
59-
DOTNET=7.0
59+
DOTNET=8.0
6060
GCC_VERSION=""
6161
GO=1.21.8
6262
STATICCHECK=v0.4.7
@@ -71,12 +71,12 @@ NUMBA=latest
7171
NUMPY=latest
7272
PANDAS=latest
7373
PYTHON=3.8
74-
R=4.2
74+
R=4.4
7575
SPARK=master
7676
TURBODBC=latest
7777

78-
# These correspond to images on Docker Hub that contain R, e.g. rhub/ubuntu-gcc-release:latest
79-
R_IMAGE=ubuntu-gcc-release
78+
# These correspond to images on Docker Hub that contain R, e.g. rhub/ubuntu-release:latest
79+
R_IMAGE=ubuntu-release
8080
R_ORG=rhub
8181
R_TAG=latest
8282

@@ -86,9 +86,6 @@ ARROW_R_DEV=TRUE
8686
R_PRUNE_DEPS=FALSE
8787
TZ=UTC
8888

89-
# Any non-empty string will install devtoolset-${DEVTOOLSET_VERSION}
90-
DEVTOOLSET_VERSION=
91-
9289
# Used through docker-compose.yml and serves as the default version for the
9390
# ci/scripts/install_vcpkg.sh script. Prefer to use short SHAs to keep the
9491
# docker tags more readable.
@@ -98,9 +95,10 @@ VCPKG="a42af01b72c28a8e1d7b48107b33e4f286a55ef6" # 2023.11.20 Release
9895
# ci/docker/python-wheel-windows-vs2019.dockerfile.
9996
# This is a workaround for our CI problem that "archery docker build" doesn't
10097
# use pulled built images in dev/tasks/python-wheels/github.windows.yml.
101-
PYTHON_WHEEL_WINDOWS_IMAGE_REVISION=2024-03-19
98+
PYTHON_WHEEL_WINDOWS_IMAGE_REVISION=2024-06-18
10299

103-
# Use conanio/${CONAN} for "docker-compose run --rm conan". See
104-
# https://github.com/conan-io/conan-docker-tools#readme for available
105-
# images.
106-
CONAN=gcc10
100+
# Use conanio/${CONAN_BASE}:{CONAN_VERSION} for "docker-compose run --rm conan".
101+
# See https://github.com/conan-io/conan-docker-tools#readme and
102+
# https://hub.docker.com/u/conanio for available images.
103+
CONAN_BASE=gcc10
104+
CONAN_VERSION=1.62.0

‎.github/CODEOWNERS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
/go/ @zeroshade
3838
/java/ @lidavidm
3939
/js/ @domoritz @trxcllnt
40-
/matlab/ @kevingurney @kou
40+
/matlab/ @kevingurney @kou @sgilmore10
4141
/python/pyarrow/_flight.pyx @lidavidm
4242
/python/pyarrow/**/*gandiva* @wjones127
4343
/r/ @paleolimbot @thisisnic

‎.github/dependabot.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,30 +23,35 @@ updates:
2323
interval: "weekly"
2424
commit-message:
2525
prefix: "MINOR: [CI] "
26+
open-pull-requests-limit: 10
2627
- package-ecosystem: "gomod"
2728
directory: "/go/"
2829
schedule:
2930
interval: "weekly"
3031
commit-message:
3132
prefix: "MINOR: [Go] "
33+
open-pull-requests-limit: 10
3234
- package-ecosystem: "maven"
3335
directory: "/java/"
3436
schedule:
3537
interval: "weekly"
3638
commit-message:
3739
prefix: "MINOR: [Java] "
40+
open-pull-requests-limit: 10
3841
- package-ecosystem: "npm"
3942
directory: "/js/"
4043
schedule:
4144
interval: "monthly"
4245
commit-message:
4346
prefix: "MINOR: [JS] "
47+
open-pull-requests-limit: 10
4448
- package-ecosystem: "nuget"
4549
directory: "/csharp/"
4650
schedule:
4751
interval: "weekly"
4852
commit-message:
4953
prefix: "MINOR: [C#] "
54+
open-pull-requests-limit: 10
5055
ignore:
5156
- dependency-name: "Microsoft.Extensions.*"
5257
update-types:

‎.github/workflows/cpp.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ on:
2121
push:
2222
paths:
2323
- '.github/workflows/cpp.yml'
24+
- 'ci/conda_env_*'
2425
- 'ci/docker/**'
2526
- 'ci/scripts/cpp_*'
2627
- 'ci/scripts/install_azurite.sh'
@@ -31,9 +32,11 @@ on:
3132
- 'cpp/**'
3233
- 'docker-compose.yml'
3334
- 'format/Flight.proto'
35+
- 'testing'
3436
pull_request:
3537
paths:
3638
- '.github/workflows/cpp.yml'
39+
- 'ci/conda_env_*'
3740
- 'ci/docker/**'
3841
- 'ci/scripts/cpp_*'
3942
- 'ci/scripts/install_azurite.sh'
@@ -44,6 +47,7 @@ on:
4447
- 'cpp/**'
4548
- 'docker-compose.yml'
4649
- 'format/Flight.proto'
50+
- 'testing'
4751

4852
concurrency:
4953
group: ${{ github.repository }}-${{ github.head_ref || github.sha }}-${{ github.workflow }}

‎.github/workflows/csharp.yml‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
strategy:
4747
fail-fast: false
4848
matrix:
49-
dotnet: ['7.0.x']
49+
dotnet: ['8.0.x']
5050
steps:
5151
- name: Install C#
5252
uses: actions/setup-dotnet@v4
@@ -74,7 +74,7 @@ jobs:
7474
strategy:
7575
fail-fast: false
7676
matrix:
77-
dotnet: ['7.0.x']
77+
dotnet: ['8.0.x']
7878
steps:
7979
- name: Install C#
8080
uses: actions/setup-dotnet@v4
@@ -94,19 +94,23 @@ jobs:
9494
run: ci/scripts/csharp_test.sh $(pwd)
9595

9696
macos:
97-
name: AMD64 macOS 11 C# ${{ matrix.dotnet }}
98-
runs-on: macos-latest
97+
name: AMD64 macOS 13 C# ${{ matrix.dotnet }}
98+
runs-on: macos-13 # Pending https://github.com/pythonnet/pythonnet/issues/2396
9999
if: ${{ !contains(github.event.pull_request.title, 'WIP') }}
100100
timeout-minutes: 15
101101
strategy:
102102
fail-fast: false
103103
matrix:
104-
dotnet: ['7.0.x']
104+
dotnet: ['8.0.x']
105105
steps:
106106
- name: Install C#
107107
uses: actions/setup-dotnet@v4
108108
with:
109109
dotnet-version: ${{ matrix.dotnet }}
110+
- name: Setup Python
111+
uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
112+
with:
113+
python-version: 3.12
110114
- name: Checkout Arrow
111115
uses: actions/checkout@v4
112116
with:

‎.github/workflows/dev.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,18 +109,18 @@ jobs:
109109
with:
110110
python-version: '3.12'
111111
- name: Install Ruby
112-
uses: ruby/setup-ruby@250fcd6a742febb1123a77a841497ccaa8b9e939 # v1.152.0
112+
uses: ruby/setup-ruby@v1
113113
with:
114-
ruby-version: '2.7'
114+
ruby-version: ruby
115115
- name: Install .NET
116116
uses: actions/setup-dotnet@4d6c8fcf3c8f7a60068d26b594648e99df24cee3 # v4.0.0
117117
with:
118-
dotnet-version: '7.0.x'
118+
dotnet-version: '8.0.x'
119119
- name: Install Dependencies
120120
shell: bash
121121
run: |
122122
gem install test-unit
123-
pip install "cython>=0.29.31" setuptools six pytest jira
123+
pip install "cython>=0.29.31" setuptools six pytest jira setuptools-scm
124124
- name: Run Release Test
125125
env:
126126
ARROW_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/docs.yml‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@ env:
3232
jobs:
3333

3434
complete:
35-
name: AMD64 Ubuntu 22.04 Complete Documentation
35+
name: AMD64 Debian 12 Complete Documentation
3636
runs-on: ubuntu-latest
3737
if: ${{ !contains(github.event.pull_request.title, 'WIP') }}
3838
timeout-minutes: 150
3939
env:
40-
UBUNTU: "22.04"
40+
JDK: 17
4141
steps:
4242
- name: Checkout Arrow
4343
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
@@ -50,8 +50,8 @@ jobs:
5050
uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
5151
with:
5252
path: .docker
53-
key: ubuntu-docs-${{ hashFiles('cpp/**') }}
54-
restore-keys: ubuntu-docs-
53+
key: debian-docs-${{ hashFiles('cpp/**') }}
54+
restore-keys: debian-docs-
5555
- name: Setup Python
5656
uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
5757
with:
@@ -62,7 +62,8 @@ jobs:
6262
env:
6363
ARCHERY_DOCKER_USER: ${{ secrets.DOCKERHUB_USER }}
6464
ARCHERY_DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }}
65-
run: archery docker run ubuntu-docs
65+
JDK: 17
66+
run: archery docker run debian-docs
6667
- name: Docker Push
6768
if: >-
6869
success() &&
@@ -73,4 +74,4 @@ jobs:
7374
ARCHERY_DOCKER_USER: ${{ secrets.DOCKERHUB_USER }}
7475
ARCHERY_DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }}
7576
continue-on-error: true
76-
run: archery docker push ubuntu-docs
77+
run: archery docker push debian-docs

‎.github/workflows/docs_light.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ on:
3131

3232
permissions:
3333
contents: read
34-
34+
3535
env:
3636
ARCHERY_DEBUG: 1
3737
ARCHERY_USE_DOCKER_CLI: 1

‎.github/workflows/go.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -306,8 +306,8 @@ jobs:
306306
run: ci/scripts/go_test.sh $(pwd)
307307

308308
macos:
309-
name: AMD64 macOS 11 Go ${{ matrix.go }}
310-
runs-on: macos-latest
309+
name: AMD64 macOS 12 Go ${{ matrix.go }}
310+
runs-on: macos-12
311311
if: ${{ !contains(github.event.pull_request.title, 'WIP') }}
312312
timeout-minutes: 60
313313
strategy:
@@ -364,8 +364,8 @@ jobs:
364364
365365
366366
macos-cgo:
367-
name: AMD64 macOS 11 Go ${{ matrix.go }} - CGO
368-
runs-on: macos-latest
367+
name: AMD64 macOS 12 Go ${{ matrix.go }} - CGO
368+
runs-on: macos-12
369369
if: ${{ !contains(github.event.pull_request.title, 'WIP') }}
370370
timeout-minutes: 60
371371
strategy:

0 commit comments

Comments
 (0)