Skip to content

Commit 36df550

Browse files
authored
Merge branch 'apache:main' into optionalConversionTraits
2 parents d208f70 + f8b20f1 commit 36df550

File tree

1,554 files changed

+45922
-92392
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,554 files changed

+45922
-92392
lines changed

.editorconfig

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -50,15 +50,6 @@ indent_style = space
5050
indent_size = 2
5151
indent_style = space
5252

53-
[*.go]
54-
indent_size = 8
55-
indent_style = tab
56-
tab_width = 8
57-
58-
[*.{js,ts}]
59-
indent_size = 4
60-
indent_style = space
61-
6253
[*.{py,pyx,pxd,pxi}]
6354
indent_size = 4
6455
indent_style = space

.env

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,14 @@ ULIMIT_CORE=-1
4747

4848
# Default versions for platforms
4949
ALMALINUX=8
50-
ALPINE_LINUX=3.18
50+
ALPINE_LINUX=3.22
5151
DEBIAN=12
52-
FEDORA=39
52+
FEDORA=42
5353
UBUNTU=22.04
5454

5555
# Default versions for various dependencies
5656
CLANG_TOOLS=14
57-
CMAKE=3.25.0
57+
CMAKE=3.26.0
5858
CUDA=11.7.1
5959
DASK=latest
6060
DOTNET=8.0
@@ -65,8 +65,9 @@ KARTOTHEK=latest
6565
# LLVM 12 and GCC 11 reports -Wmismatched-new-delete.
6666
LLVM=18
6767
MAVEN=3.8.7
68-
NODE=18
68+
NODE=20
6969
NUMBA=latest
70+
NUMBA_CUDA=latest
7071
NUMPY=latest
7172
PANDAS=latest
7273
PYTHON=3.9

.github/CODEOWNERS

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,16 +34,12 @@
3434
/cpp/src/arrow/flight/ @lidavidm
3535
/cpp/src/parquet @wgtmac
3636
/csharp/ @curthagenlocher
37-
/go/ @zeroshade
38-
/java/ @lidavidm
39-
/js/ @domoritz @trxcllnt
4037
/matlab/ @kevingurney @kou @sgilmore10
4138
/python/ @AlenkaF @raulcd @rok
4239
/python/pyarrow/_flight.pyx @lidavidm
4340
/python/pyarrow/**/*gandiva* @wjones127
4441
/r/ @jonkeane @thisisnic
4542
/ruby/ @kou
46-
/swift/ @kou
4743

4844
# Docs
4945
# /docs/

.github/dependabot.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,6 @@ updates:
3838
commit-message:
3939
prefix: "MINOR: [Swift] "
4040
open-pull-requests-limit: 10
41-
- package-ecosystem: "npm"
42-
directory: "/js/"
43-
schedule:
44-
interval: "monthly"
45-
commit-message:
46-
prefix: "MINOR: [JS] "
47-
open-pull-requests-limit: 10
4841
- package-ecosystem: "nuget"
4942
directory: "/csharp/"
5043
schedule:

.github/workflows/archery.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
timeout-minutes: 15
5959
steps:
6060
- name: Checkout Arrow
61-
uses: actions/checkout@v4
61+
uses: actions/checkout@v5
6262
with:
6363
fetch-depth: 0
6464
- name: Git Fixup

.github/workflows/comment_bot.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
pull-requests: write
3737
steps:
3838
- name: Checkout Arrow
39-
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
39+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
4040
with:
4141
path: arrow
4242
# fetch the tags for version number generation
@@ -49,7 +49,7 @@ jobs:
4949
run: pip install -e arrow/dev/archery[bot]
5050
- name: Handle GitHub comment event
5151
env:
52-
ARROW_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
52+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5353
CROSSBOW_GITHUB_TOKEN: ${{ secrets.CROSSBOW_GITHUB_TOKEN }}
5454
run: |
5555
archery --debug trigger-bot \

.github/workflows/cpp.yml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ on:
2929
- '.github/workflows/cpp.yml'
3030
- 'ci/conda_env_*'
3131
- 'ci/docker/**'
32+
- 'ci/scripts/ccache_setup.sh'
3233
- 'ci/scripts/cpp_*'
3334
- 'ci/scripts/install_azurite.sh'
3435
- 'ci/scripts/install_gcs_testbench.sh'
@@ -45,6 +46,7 @@ on:
4546
- '.github/workflows/cpp.yml'
4647
- 'ci/conda_env_*'
4748
- 'ci/docker/**'
49+
- 'ci/scripts/ccache_setup.sh'
4850
- 'ci/scripts/cpp_*'
4951
- 'ci/scripts/install_azurite.sh'
5052
- 'ci/scripts/install_gcs_testbench.sh'
@@ -108,7 +110,7 @@ jobs:
108110
UBUNTU: ${{ matrix.ubuntu }}
109111
steps:
110112
- name: Checkout Arrow
111-
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
113+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
112114
with:
113115
fetch-depth: 0
114116
submodules: recursive
@@ -161,7 +163,7 @@ jobs:
161163
timeout-minutes: 45
162164
steps:
163165
- name: Checkout Arrow
164-
uses: actions/checkout@v4
166+
uses: actions/checkout@v5
165167
with:
166168
fetch-depth: 0
167169
submodules: recursive
@@ -216,7 +218,7 @@ jobs:
216218
sysctl -a | grep cpu
217219
sysctl -a | grep "hw.optional"
218220
- name: Checkout Arrow
219-
uses: actions/checkout@v4
221+
uses: actions/checkout@v5
220222
with:
221223
fetch-depth: 0
222224
submodules: recursive
@@ -332,7 +334,7 @@ jobs:
332334
/d 1 `
333335
/f
334336
- name: Checkout Arrow
335-
uses: actions/checkout@v4
337+
uses: actions/checkout@v5
336338
with:
337339
fetch-depth: 0
338340
submodules: recursive
@@ -375,7 +377,7 @@ jobs:
375377
376378
windows-mingw:
377379
name: AMD64 Windows MinGW ${{ matrix.msystem_upper }} C++
378-
runs-on: windows-2019
380+
runs-on: windows-2022
379381
if: ${{ !contains(github.event.pull_request.title, 'WIP') }}
380382
# Build may take 1h+ without cache.
381383
timeout-minutes: 120
@@ -395,6 +397,7 @@ jobs:
395397
ARROW_DATASET: ON
396398
ARROW_FLIGHT: ON
397399
ARROW_FLIGHT_SQL: ON
400+
ARROW_FLIGHT_SQL_ODBC: ON
398401
ARROW_GANDIVA: ON
399402
ARROW_GCS: ON
400403
ARROW_HDFS: OFF
@@ -428,7 +431,7 @@ jobs:
428431
/d 1 `
429432
/f
430433
- name: Checkout Arrow
431-
uses: actions/checkout@v4
434+
uses: actions/checkout@v5
432435
with:
433436
fetch-depth: 0
434437
submodules: recursive

0 commit comments

Comments
 (0)