Skip to content

Commit 42ecbe8

Browse files
Merge remote-tracking branch 'upstream/main' into apachegh-43683-pandas-string-dtype
2 parents a7e5e34 + 9907f37 commit 42ecbe8

1,602 files changed

Lines changed: 5341 additions & 261976 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: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ github:
2525
- js8544
2626
- laurentgo
2727
- vibhatha
28-
- zanmato1984
2928
- ZhangHuiGui
3029

3130
notifications:

‎.dir-locals.el‎

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎.editorconfig‎

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
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+
# This is an EditorConfig file: https://editorconfig.org/
19+
20+
# This is the top-most config for this project
21+
root = true
22+
23+
# General settings
24+
25+
[*]
26+
insert_final_newline = true
27+
trim_trailing_whitespace = true
28+
charset = utf-8
29+
spelling_language = en
30+
31+
# Language-specific settings, in approximate alphabetical order
32+
33+
[*.{c,cc,cpp,h,hh,hpp}]
34+
indent_size = 2
35+
indent_style = space
36+
37+
[*.cmake]
38+
indent_size = 2
39+
indent_style = space
40+
41+
[CMakeLists.txt]
42+
indent_size = 2
43+
indent_style = space
44+
45+
[*.cs]
46+
indent_size = 4
47+
indent_style = space
48+
49+
[*.{fbs,proto,thrift}]
50+
indent_size = 2
51+
indent_style = space
52+
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+
62+
[*.{py,pyx,pxd,pxi}]
63+
indent_size = 4
64+
indent_style = space
65+
66+
[*.r]
67+
indent_size = 2
68+
indent_style = space
69+
70+
[*.rb]
71+
indent_size = 2
72+
indent_style = space
73+
74+
[*.rst]
75+
indent_size = 3
76+
indent_style = space
77+
78+
[*.sh]
79+
indent_size = 2
80+
indent_style = space
81+
82+
[*.vala]
83+
indent_size = 4
84+
indent_style = space
85+
86+
[*.{yml,yaml}]
87+
indent_size = 2
88+
indent_style = space

‎.env‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ VCPKG="943c5ef1c8f6b5e6ced092b242c8299caae2ff01" # 2024.04.26 Release
9797
# use pulled built images in dev/tasks/python-wheels/github.windows.yml.
9898
PYTHON_WHEEL_WINDOWS_IMAGE_REVISION=2024-08-06
9999

100-
# Use conanio/${CONAN_BASE}:{CONAN_VERSION} for "docker-compose run --rm conan".
100+
# Use conanio/${CONAN_BASE}:{CONAN_VERSION} for "docker compose run --rm conan".
101101
# See https://github.com/conan-io/conan-docker-tools#readme and
102102
# https://hub.docker.com/u/conanio for available images.
103103
CONAN_BASE=gcc10

‎.github/.dir-locals.el‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎.github/CODEOWNERS‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646

4747
# Docs
4848
# /docs/
49-
# .readthedocs.yml
5049
# *.md
5150
# *.rmd
5251
# *.rst

‎.github/CONTRIBUTING.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ 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.
4747

48-
If you’d like to report a bug but don’t have time to fix it, you can still post
49-
it on JIRA, or email the mailing list
48+
If you’d like to report a bug but don’t have time to fix it, you can still create
49+
a GitHub issue, or email the mailing list
5050
[[email protected]](https://lists.apache.org/[email protected])
5151

5252
To contribute a patch:
@@ -57,8 +57,8 @@ harder to merge in a large change with a lot of disjoint features.
5757
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)
60-
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
61-
name with the JIRA issue id (ex: [ARROW-767: [C++] Filesystem abstraction](https://github.com/apache/arrow/pull/4225))
60+
and [sending a pull request](https://help.github.com/en/articles/creating-a-pull-request-from-a-fork). Prefix your pull request
61+
name with the GitHub issue id (ex: [GH-767: [C++] Filesystem abstraction](https://github.com/apache/arrow/pull/4225))
6262
4. Make sure that your code passes the unit tests. You can find instructions
6363
how to run the unit tests for each Arrow component in its respective README
6464
file.

‎.github/ISSUE_TEMPLATE/bug_report.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,15 @@ body:
3838
- C
3939
- C#
4040
- C++
41-
- C++ - Gandiva
4241
- Continuous Integration
4342
- Developer Tools
4443
- Documentation
4544
- FlightRPC
4645
- Format
4746
- GLib
48-
- Go
4947
- GPU
48+
- Gandiva
49+
- Go
5050
- Integration
5151
- Java
5252
- JavaScript

‎.github/ISSUE_TEMPLATE/feature_request.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,15 @@ body:
4141
- C
4242
- C#
4343
- C++
44-
- C++ - Gandiva
4544
- Continuous Integration
4645
- Developer Tools
4746
- Documentation
4847
- FlightRPC
4948
- Format
5049
- GLib
51-
- Go
5250
- GPU
51+
- Gandiva
52+
- Go
5353
- Integration
5454
- Java
5555
- JavaScript

‎.github/ISSUE_TEMPLATE/usage_question.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,15 +61,15 @@ body:
6161
- C
6262
- C#
6363
- C++
64-
- C++ - Gandiva
6564
- Continuous Integration
6665
- Developer Tools
6766
- Documentation
6867
- FlightRPC
6968
- Format
7069
- GLib
71-
- Go
7270
- GPU
71+
- Gandiva
72+
- Go
7373
- Integration
7474
- Java
7575
- JavaScript

0 commit comments

Comments
 (0)