Skip to content

Commit 7aa0cba

Browse files
Merge remote-tracking branch 'upstream/main' into apachegh-41126-cuda-testing
2 parents 17edaa9 + 3420c0d commit 7aa0cba

1,139 files changed

Lines changed: 23263 additions & 9913 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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ github:
2121
collaborators:
2222
- anjakefala
2323
- benibus
24-
- davisusanibar
2524
- jbonofre
2625
- js8544
26+
- laurentgo
2727
- vibhatha
2828
- zanmato1984
2929
- ZhangHuiGui

‎.env‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ GCC_VERSION=""
6161
GO=1.21.8
6262
STATICCHECK=v0.4.7
6363
HDFS=3.2.1
64-
JDK=8
64+
JDK=11
6565
KARTOTHEK=latest
6666
# LLVM 12 and GCC 11 reports -Wmismatched-new-delete.
6767
LLVM=14

‎.github/CODEOWNERS‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
/matlab/ @kevingurney @kou @sgilmore10
4141
/python/pyarrow/_flight.pyx @lidavidm
4242
/python/pyarrow/**/*gandiva* @wjones127
43-
/r/ @paleolimbot @thisisnic
43+
/r/ @jonkeane @thisisnic
4444
/ruby/ @kou
4545
/swift/ @kou
4646

@@ -53,19 +53,19 @@
5353
# *.txt
5454

5555
# PR CI and repository files
56-
/.github/ @assignUser @kou @raulcd
56+
/.github/ @assignUser @jonkeane @kou @raulcd
5757
.asf.yaml @assignUser @kou @raulcd
5858
.pre-commit-config.yaml @raulcd
5959
.travis.yml @assignUser @kou @raulcd
6060
appveyor.yml @assignUser @kou @raulcd
6161
# .git*
6262

6363
# release scripts, archery etc.
64-
/ci/ @assignUser @kou @raulcd
65-
/dev/ @assignUser @kou @raulcd
64+
/ci/ @assignUser @jonkeane @kou @raulcd
65+
/dev/ @assignUser @jonkeane @kou @raulcd
6666
.dockerignore @raulcd
67-
.env @assignUser @kou @raulcd
68-
docker-compose.yml @assignUser @kou @raulcd
67+
.env @assignUser @jonkeane @kou @raulcd
68+
docker-compose.yml @assignUser @jonkeane @kou @raulcd
6969

7070
# R specific packaging tooling
7171
/r/configure* @assignUser

‎.github/CONTRIBUTING.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ We prefer to receive contributions in the form of GitHub pull requests. Please
4040
send pull requests against the [github.com/apache/arrow][4] repository following
4141
the procedure below.
4242

43-
If you are looking for some ideas on what to contribute, check out the [JIRA
43+
If you are looking for some ideas on what to contribute, check out the [GitHub
4444
issues][3] for the Apache Arrow project. Comment on the issue and/or contact
4545
[[email protected]](https://lists.apache.org/[email protected])
4646
with your questions and ideas.
@@ -53,8 +53,8 @@ To contribute a patch:
5353

5454
1. Break your work into small, single-purpose patches if possible. It’s much
5555
harder to merge in a large change with a lot of disjoint features.
56-
2. If one doesn't already exist, create a JIRA for your patch on the [Arrow Project
57-
JIRA](https://issues.apache.org/jira/browse/ARROW).
56+
2. If one doesn't already exist, create a GitHub issue for your patch on the [Arrow Project
57+
GitHub](https://github.com/apache/arrow/issues).
5858
3. Submit the patch as a GitHub pull request against the main branch. For a
5959
tutorial, see the GitHub guides on [forking a repo](https://help.github.com/en/articles/fork-a-repo)
6060
and [sending a pull request](https://help.github.com/en/articles/creating-a-pull-request-from-a-fork). So that your pull request syncs with the JIRA issue, prefix your pull request
@@ -68,5 +68,5 @@ Thank you in advance for your contributions!
6868

6969
[1]: mailto:[email protected]
7070
[2]: https://github.com/apache/arrow/tree/main/format
71-
[3]: https://issues.apache.org/jira/browse/ARROW
71+
[3]: https://github.com/apache/arrow/issues
7272
[4]: https://github.com/apache/arrow

‎.github/workflows/archery.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ on:
3434
env:
3535
ARCHERY_DEBUG: 1
3636
ARCHERY_DEFAULT_BRANCH: ${{ github.event.repository.default_branch }}
37-
ARCHERY_USE_DOCKER_CLI: 1
3837

3938
concurrency:
4039
group: ${{ github.repository }}-${{ github.head_ref || github.sha }}-${{ github.workflow }}
@@ -59,7 +58,7 @@ jobs:
5958
shell: bash
6059
run: git branch $ARCHERY_DEFAULT_BRANCH origin/$ARCHERY_DEFAULT_BRANCH || true
6160
- name: Setup Python
62-
uses: actions/[email protected].0
61+
uses: actions/[email protected].1
6362
with:
6463
python-version: '3.9'
6564
- 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@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
44+
uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # v5.1.1
4545
with:
4646
python-version: 3.12
4747
- name: Install Archery and Crossbow dependencies

‎.github/workflows/cpp.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ jobs:
9999
cat <<JSON >> "$GITHUB_OUTPUT"
100100
{
101101
"arch": "arm64v8",
102-
"archery-use-docker-cli": "0",
102+
"archery-use-legacy-docker-compose": "1",
103103
"clang-tools": "10",
104104
"image": "ubuntu-cpp",
105105
"llvm": "10",
@@ -124,9 +124,9 @@ jobs:
124124
include: ${{ fromJson(needs.docker-targets.outputs.targets) }}
125125
env:
126126
ARCH: ${{ matrix.arch }}
127-
# By default, use Docker CLI because docker-compose v1 is obsolete,
127+
# By default, use `docker compose` because docker-compose v1 is obsolete,
128128
# except where the Docker client version is too old.
129-
ARCHERY_USE_DOCKER_CLI: ${{ matrix.archery-use-docker-cli || '1' }}
129+
ARCHERY_USE_LEGACY_DOCKER_COMPOSE: ${{ matrix.archery-use-legacy-docker-compose || '0' }}
130130
ARROW_SIMD_LEVEL: ${{ matrix.simd-level }}
131131
CLANG_TOOLS: ${{ matrix.clang-tools }}
132132
LLVM: ${{ matrix.llvm }}
@@ -189,7 +189,7 @@ jobs:
189189
- name: Run minimal example
190190
run: |
191191
cd cpp/examples/minimal_build
192-
docker-compose run --rm minimal
192+
docker compose run --rm minimal
193193
194194
macos:
195195
name: ${{ matrix.architecture }} macOS ${{ matrix.macos-version }} C++
@@ -246,7 +246,7 @@ jobs:
246246
$(brew --prefix bash)/bin/bash \
247247
ci/scripts/install_minio.sh latest ${ARROW_HOME}
248248
- name: Set up Python
249-
uses: actions/[email protected].0
249+
uses: actions/[email protected].1
250250
with:
251251
python-version: 3.12
252252
- name: Install Google Cloud Storage Testbench
@@ -467,7 +467,7 @@ jobs:
467467
https://dl.min.io/server/minio/release/windows-amd64/archive/minio.RELEASE.2022-05-26T05-48-41Z
468468
chmod +x /usr/local/bin/minio.exe
469469
- name: Set up Python
470-
uses: actions/[email protected].0
470+
uses: actions/[email protected].1
471471
with:
472472
python-version: 3.9
473473
- name: Install Google Cloud Storage Testbench

‎.github/workflows/csharp.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
dotnet: ['8.0.x']
5050
steps:
5151
- name: Install C#
52-
uses: actions/setup-dotnet@v4
52+
uses: actions/setup-dotnet@v4.0.1
5353
with:
5454
dotnet-version: ${{ matrix.dotnet }}
5555
- name: Checkout Arrow
@@ -77,7 +77,7 @@ jobs:
7777
dotnet: ['8.0.x']
7878
steps:
7979
- name: Install C#
80-
uses: actions/setup-dotnet@v4
80+
uses: actions/setup-dotnet@v4.0.1
8181
with:
8282
dotnet-version: ${{ matrix.dotnet }}
8383
- name: Checkout Arrow
@@ -104,11 +104,11 @@ jobs:
104104
dotnet: ['8.0.x']
105105
steps:
106106
- name: Install C#
107-
uses: actions/setup-dotnet@v4
107+
uses: actions/setup-dotnet@v4.0.1
108108
with:
109109
dotnet-version: ${{ matrix.dotnet }}
110110
- name: Setup Python
111-
uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
111+
uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # v5.1.1
112112
with:
113113
python-version: 3.12
114114
- name: Checkout Arrow

‎.github/workflows/dev.yml‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ permissions:
3131

3232
env:
3333
ARCHERY_DEBUG: 1
34-
ARCHERY_USE_DOCKER_CLI: 1
3534

3635
jobs:
3736

@@ -46,7 +45,7 @@ jobs:
4645
with:
4746
fetch-depth: 0
4847
- name: Setup Python
49-
uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
48+
uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # v5.1.1
5049
with:
5150
python-version: 3.12
5251
- name: Install pre-commit
@@ -105,22 +104,22 @@ jobs:
105104
with:
106105
fetch-depth: 0
107106
- name: Install Python
108-
uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
107+
uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # v5.1.1
109108
with:
110109
python-version: '3.12'
111110
- name: Install Ruby
112111
uses: ruby/setup-ruby@v1
113112
with:
114113
ruby-version: ruby
115114
- name: Install .NET
116-
uses: actions/setup-dotnet@4d6c8fcf3c8f7a60068d26b594648e99df24cee3 # v4.0.0
115+
uses: actions/setup-dotnet@6bd8b7f7774af54e05809fcc5431931b3eb1ddee # v4.0.1
117116
with:
118117
dotnet-version: '8.0.x'
119118
- name: Install Dependencies
120119
shell: bash
121120
run: |
122121
gem install test-unit
123-
pip install "cython>=0.29.31" setuptools six pytest jira setuptools-scm
122+
pip install "cython>=0.29.31" setuptools pytest jira setuptools-scm
124123
- name: Run Release Test
125124
env:
126125
ARROW_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/docs.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ permissions:
2525

2626
env:
2727
ARCHERY_DEBUG: 1
28-
ARCHERY_USE_DOCKER_CLI: 1
2928
ARROW_ENABLE_TIMING_TESTS: OFF
3029
DOCKER_VOLUME_PREFIX: ".docker/"
3130

@@ -53,7 +52,7 @@ jobs:
5352
key: debian-docs-${{ hashFiles('cpp/**') }}
5453
restore-keys: debian-docs-
5554
- name: Setup Python
56-
uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
55+
uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # v5.1.1
5756
with:
5857
python-version: 3.12
5958
- name: Setup Archery

0 commit comments

Comments
 (0)