Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into apachegh-43683-pand…
Browse files Browse the repository at this point in the history
…as-string-dtype
  • Loading branch information
jorisvandenbossche committed Dec 6, 2024
2 parents a7e5e34 + 9907f37 commit 42ecbe8
Show file tree
Hide file tree
Showing 1,602 changed files with 5,341 additions and 261,976 deletions.
1 change: 0 additions & 1 deletion .asf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ github:
- js8544
- laurentgo
- vibhatha
- zanmato1984
- ZhangHuiGui

notifications:
Expand Down
23 changes: 0 additions & 23 deletions .dir-locals.el

This file was deleted.

88 changes: 88 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.

# This is an EditorConfig file: https://editorconfig.org/

# This is the top-most config for this project
root = true

# General settings

[*]
insert_final_newline = true
trim_trailing_whitespace = true
charset = utf-8
spelling_language = en

# Language-specific settings, in approximate alphabetical order

[*.{c,cc,cpp,h,hh,hpp}]
indent_size = 2
indent_style = space

[*.cmake]
indent_size = 2
indent_style = space

[CMakeLists.txt]
indent_size = 2
indent_style = space

[*.cs]
indent_size = 4
indent_style = space

[*.{fbs,proto,thrift}]
indent_size = 2
indent_style = space

[*.go]
indent_size = 8
indent_style = tab
tab_width = 8

[*.{js,ts}]
indent_size = 4
indent_style = space

[*.{py,pyx,pxd,pxi}]
indent_size = 4
indent_style = space

[*.r]
indent_size = 2
indent_style = space

[*.rb]
indent_size = 2
indent_style = space

[*.rst]
indent_size = 3
indent_style = space

[*.sh]
indent_size = 2
indent_style = space

[*.vala]
indent_size = 4
indent_style = space

[*.{yml,yaml}]
indent_size = 2
indent_style = space
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ VCPKG="943c5ef1c8f6b5e6ced092b242c8299caae2ff01" # 2024.04.26 Release
# use pulled built images in dev/tasks/python-wheels/github.windows.yml.
PYTHON_WHEEL_WINDOWS_IMAGE_REVISION=2024-08-06

# Use conanio/${CONAN_BASE}:{CONAN_VERSION} for "docker-compose run --rm conan".
# Use conanio/${CONAN_BASE}:{CONAN_VERSION} for "docker compose run --rm conan".
# See https://github.com/conan-io/conan-docker-tools#readme and
# https://hub.docker.com/u/conanio for available images.
CONAN_BASE=gcc10
Expand Down
19 changes: 0 additions & 19 deletions .github/.dir-locals.el

This file was deleted.

1 change: 0 additions & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@

# Docs
# /docs/
# .readthedocs.yml
# *.md
# *.rmd
# *.rst
Expand Down
8 changes: 4 additions & 4 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ issues][3] for the Apache Arrow project. Comment on the issue and/or contact
[[email protected]](https://lists.apache.org/[email protected])
with your questions and ideas.

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

To contribute a patch:
Expand All @@ -57,8 +57,8 @@ harder to merge in a large change with a lot of disjoint features.
GitHub](https://github.com/apache/arrow/issues).
3. Submit the patch as a GitHub pull request against the main branch. For a
tutorial, see the GitHub guides on [forking a repo](https://help.github.com/en/articles/fork-a-repo)
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
name with the JIRA issue id (ex: [ARROW-767: [C++] Filesystem abstraction](https://github.com/apache/arrow/pull/4225))
and [sending a pull request](https://help.github.com/en/articles/creating-a-pull-request-from-a-fork). Prefix your pull request
name with the GitHub issue id (ex: [GH-767: [C++] Filesystem abstraction](https://github.com/apache/arrow/pull/4225))
4. Make sure that your code passes the unit tests. You can find instructions
how to run the unit tests for each Arrow component in its respective README
file.
Expand Down
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/bug_report.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,15 @@ body:
- C
- C#
- C++
- C++ - Gandiva
- Continuous Integration
- Developer Tools
- Documentation
- FlightRPC
- Format
- GLib
- Go
- GPU
- Gandiva
- Go
- Integration
- Java
- JavaScript
Expand Down
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/feature_request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,15 +41,15 @@ body:
- C
- C#
- C++
- C++ - Gandiva
- Continuous Integration
- Developer Tools
- Documentation
- FlightRPC
- Format
- GLib
- Go
- GPU
- Gandiva
- Go
- Integration
- Java
- JavaScript
Expand Down
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/usage_question.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -61,15 +61,15 @@ body:
- C
- C#
- C++
- C++ - Gandiva
- Continuous Integration
- Developer Tools
- Documentation
- FlightRPC
- Format
- GLib
- Go
- GPU
- Gandiva
- Go
- Integration
- Java
- JavaScript
Expand Down
7 changes: 0 additions & 7 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,6 @@ updates:
commit-message:
prefix: "MINOR: [CI] "
open-pull-requests-limit: 10
- package-ecosystem: "maven"
directory: "/java/"
schedule:
interval: "weekly"
commit-message:
prefix: "MINOR: [Java] "
open-pull-requests-limit: 10
- package-ecosystem: "npm"
directory: "/js/"
schedule:
Expand Down
4 changes: 0 additions & 4 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,6 @@ or
MINOR: [${COMPONENT}] ${SUMMARY}
In the case of PARQUET issues on JIRA the title also supports:
PARQUET-${JIRA_ISSUE_ID}: [${COMPONENT}] ${SUMMARY}
-->

### Rationale for this change
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/cpp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,11 @@ jobs:
submodules: recursive
- name: Install Dependencies
run: |
# pkg-config formula is deprecated but it's still installed
# in GitHub Actions runner now. We can remove this once
# pkg-config formula is removed from GitHub Actions runner.
brew uninstall pkg-config || :
brew uninstall [email protected] || :
brew bundle --file=cpp/Brewfile
- name: Install MinIO
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ jobs:
shell: bash
run: |
gem install test-unit
pip install "cython>=0.29.31" setuptools pytest jira setuptools-scm
pip install "cython>=0.29.31" setuptools pytest requests setuptools-scm
- name: Run Release Test
env:
ARROW_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/dev_pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
ref: main
persist-credentials: false

- name: Comment JIRA link
- name: Add Issue link
if: |
(github.event.action == 'opened' ||
github.event.action == 'edited')
Expand Down Expand Up @@ -87,7 +87,7 @@ jobs:
if: |
(github.event.action == 'opened' ||
github.event.action == 'synchronize')
uses: actions/labeler@ac9175f8a1f3625fd0d4fb234536d26811351594 # v4.3.0
uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9 # v5.0.0
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
configuration-path: .github/workflows/dev_pr/labeler.yml
Expand Down
31 changes: 2 additions & 29 deletions .github/workflows/dev_pr/helpers.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,8 @@ const https = require('https');
* @returns {Issue} or null if no issue detected.
*
* @typedef {Object} Issue
* @property {string} kind - The kind of issue: minor, jira or github
* @property {string} id - The id of the issue:
* PARQUET-XXXX for jira
* The numeric issue id for github
* @property {string} kind - The kind of issue: minor or github
* @property {string} id - The numeric issue id of the issue
*/
function detectIssue(title) {
if (!title) {
Expand All @@ -36,38 +34,13 @@ function detectIssue(title) {
if (title.startsWith("MINOR: ")) {
return {"kind": "minor"};
}
const matched_jira = /^(WIP:?\s*)?((PARQUET)-\d+)/.exec(title);
if (matched_jira) {
return {"kind": "jira", "id": matched_jira[2]};
}
const matched_gh = /^(WIP:?\s*)?GH-(\d+)/.exec(title);
if (matched_gh) {
return {"kind": "github", "id": matched_gh[2]};
}
return null;
}

/**
* Retrieves information about a JIRA issue.
* @param {String} jiraID
* @returns {Object} the information about a JIRA issue.
*/
async function getJiraInfo(jiraID) {
const jiraURL = `https://issues.apache.org/jira/rest/api/2/issue/${jiraID}`;

return new Promise((resolve) => {
https.get(jiraURL, res => {
let data = '';

res.on('data', chunk => { data += chunk })

res.on('end', () => {
resolve(JSON.parse(data));
})
})
});
}

/**
* Retrieves information about a GitHub issue.
* @param {String} issueID
Expand Down
Loading

0 comments on commit 42ecbe8

Please sign in to comment.