Skip to content

Commit

Permalink
merge latest
Browse files Browse the repository at this point in the history
  • Loading branch information
David Coe committed Dec 11, 2024
2 parents f874821 + 46f7a84 commit 65b2cdf
Show file tree
Hide file tree
Showing 634 changed files with 45,481 additions and 11,098 deletions.
3 changes: 2 additions & 1 deletion .clang-tidy
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,9 @@
---
# Only defaults for now, slowly enable more as desired
# Disable clang-analyzer-core, it fires on nanoarrow (I think it doesn't see that ArrowBufferReserve won't leave buffer->data NULL)
# Disable NewDeleteLeaks, it seems to trigger a lot on Googletest
# Disable the warning about memset, etc. since it suggests C11 functions
# Disable valist, it's buggy: https://github.com/llvm/llvm-project/issues/40656
Checks: '-clang-analyzer-core.*,-clang-analyzer-security.insecureAPI.DeprecatedOrUnsafeBufferHandling,-clang-analyzer-valist.Uninitialized'
Checks: '-clang-analyzer-core.*,-clang-analyzer-cplusplus.NewDeleteLeaks,-clang-analyzer-security.insecureAPI.DeprecatedOrUnsafeBufferHandling,-clang-analyzer-valist.Uninitialized'
FormatStyle: google
UseColor: true
9 changes: 5 additions & 4 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -28,19 +28,20 @@ ARCH_SHORT=amd64
ARCH_CONDA_FORGE=linux_64_

# Default versions for various dependencies
JDK=8
JDK=11
MANYLINUX=2014
MAVEN=3.6.3
PYTHON=3.8
GO=1.21.8
PLATFORM=linux/amd64
PYTHON=3.9
GO=1.22.9
ARROW_MAJOR_VERSION=14
DOTNET=8.0

# Used through docker-compose.yml and serves as the default version for the
# ci/scripts/install_vcpkg.sh script. Keep in sync with apache/arrow .env.
# When updating, also update the docs, which list the version of libpq/SQLite
# that vcpkg (and hence our wheels) ship
VCPKG="a42af01b72c28a8e1d7b48107b33e4f286a55ef6"
VCPKG="943c5ef1c8f6b5e6ced092b242c8299caae2ff01"

# These are used to tell tests where to find services for integration testing.
# They are valid if the services are started with the docker-compose config.
Expand Down
7 changes: 7 additions & 0 deletions .github/ISSUE_TEMPLATE/bug.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,13 @@ body:
description: What did you expect to happen?
validations:
required: true
- type: textarea
id: stack-trace
attributes:
label: Stack Trace
description: Please provide a stack trace if possible.
validations:
required: false
- type: textarea
id: repro
attributes:
Expand Down
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/feature.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
# specific language governing permissions and limitations
# under the License.

name: Feature Request
description: Ask for a feature or improvement.
name: Enhancement/Feature Request
description: Suggest something that could be improved, or a new feature.
labels: ["Type: enhancement"]
body:
- type: textarea
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ jobs:
go-version-file: 'go/adbc/go.mod'
check-latest: true
- uses: actions/setup-python@v5
with:
python-version: '3.x'
- name: install golangci-lint
run: |
go install github.com/golangci/golangci-lint/cmd/[email protected]
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/dev_pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ on:
- opened
- edited
- synchronize
- ready_for_review
- review_requested

permissions:
contents: read
Expand Down Expand Up @@ -64,4 +66,4 @@ jobs:
env:
PR_BODY: ${{ github.event.pull_request.body }}
run: |
[[ "${PR_BODY}" =~ @[a-zA-Z0-9]+ ]] && exit 1 || true
python .github/workflows/dev_pr/body_check.py "$PR_BODY"
63 changes: 63 additions & 0 deletions .github/workflows/dev_pr/body_check.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
#!/usr/bin/env python

# 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.

import argparse
import re
import sys
import typing

PING_RE = re.compile(r"@([a-zA-Z0-9\-]+)")
IGNORED_USERNAMES = {"dependabot"}


def check_pr_body(body: str) -> typing.List[str]:
"""Check a PR body and return a list of reasons why it's invalid."""

reasons = []
matches = PING_RE.findall(body)
for username in matches:
if username in IGNORED_USERNAMES:
continue
reasons.append(f"Please don't ping {username} in the PR description")

return reasons


def main():
parser = argparse.ArgumentParser()
parser.add_argument("body", help="The PR body to check")

args = parser.parse_args()

print(f'PR body: "{args.body}"')
print("=" * 60)

reasons = check_pr_body(args.body)
if not reasons:
print("PR body is valid")
return 0

print("PR body is invalid:")
for reason in reasons:
print("-", reason)
return 1


if __name__ == "__main__":
sys.exit(main())
6 changes: 0 additions & 6 deletions .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,13 @@ on:
branches:
- main
paths:
- "adbc.h"
- "c/**"
- "ci/**"
- "go/**"
- "python/**"
- ".github/workflows/integration.yml"
push:
paths:
- "adbc.h"
- "c/**"
- "ci/**"
- "go/**"
Expand Down Expand Up @@ -69,7 +67,6 @@ jobs:
key: conda-${{ runner.os }}-${{ steps.get-date.outputs.today }}-${{ env.CACHE_NUMBER }}-${{ hashFiles('ci/**') }}
- uses: conda-incubator/setup-miniconda@v3
with:
miniforge-variant: Mambaforge
miniforge-version: latest
use-only-tar-bz2: false
use-mamba: true
Expand Down Expand Up @@ -125,7 +122,6 @@ jobs:
key: conda-${{ runner.os }}-${{ steps.get-date.outputs.today }}-${{ env.CACHE_NUMBER }}-${{ hashFiles('ci/**') }}
- uses: conda-incubator/setup-miniconda@v3
with:
miniforge-variant: Mambaforge
miniforge-version: latest
use-only-tar-bz2: false
use-mamba: true
Expand Down Expand Up @@ -203,7 +199,6 @@ jobs:
key: conda-${{ runner.os }}-${{ steps.get-date.outputs.today }}-${{ env.CACHE_NUMBER }}-${{ hashFiles('ci/**') }}
- uses: conda-incubator/setup-miniconda@v3
with:
miniforge-variant: Mambaforge
miniforge-version: latest
use-only-tar-bz2: false
use-mamba: true
Expand Down Expand Up @@ -325,7 +320,6 @@ jobs:
key: conda-${{ runner.os }}-${{ steps.get-date.outputs.today }}-${{ env.CACHE_NUMBER }}-${{ hashFiles('ci/**') }}
- uses: conda-incubator/setup-miniconda@v3
with:
miniforge-variant: Mambaforge
miniforge-version: latest
use-only-tar-bz2: false
use-mamba: true
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/java.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
java: ['8', '11', '17', '21']
java: ['11', '17', '21', '22']
steps:
- uses: actions/checkout@v4
with:
Expand All @@ -69,7 +69,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
java: ['11', '17', '21']
java: ['17', '21']
steps:
- uses: actions/checkout@v4
with:
Expand Down
Loading

0 comments on commit 65b2cdf

Please sign in to comment.