Skip to content

Commit

Permalink
Merge branch 'branch-24.08' of github.com:rapidsai/cudf into pylibcud…
Browse files Browse the repository at this point in the history
…f-lists-combine

Signed-off-by: Matthew Murray <[email protected]>
  • Loading branch information
Matt711 committed Jun 11, 2024
2 parents 4b9d91a + dfa79d4 commit f6d12e4
Show file tree
Hide file tree
Showing 200 changed files with 6,229 additions and 3,653 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/cuda11.8-conda/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"runArgs": [
"--rm",
"--name",
"${localEnv:USER}-rapids-${localWorkspaceFolderBasename}-24.08-cuda11.8-conda"
"${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-24.08-cuda11.8-conda"
],
"hostRequirements": {"gpu": "optional"},
"features": {
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/cuda11.8-pip/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"runArgs": [
"--rm",
"--name",
"${localEnv:USER}-rapids-${localWorkspaceFolderBasename}-24.08-cuda11.8-pip"
"${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-24.08-cuda11.8-pip"
],
"hostRequirements": {"gpu": "optional"},
"features": {
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/cuda12.2-conda/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"runArgs": [
"--rm",
"--name",
"${localEnv:USER}-rapids-${localWorkspaceFolderBasename}-24.08-cuda12.2-conda"
"${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-24.08-cuda12.2-conda"
],
"hostRequirements": {"gpu": "optional"},
"features": {
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/cuda12.2-pip/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"runArgs": [
"--rm",
"--name",
"${localEnv:USER}-rapids-${localWorkspaceFolderBasename}-24.08-cuda12.2-pip"
"${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-24.08-cuda12.2-pip"
],
"hostRequirements": {"gpu": "optional"},
"features": {
Expand Down
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ java/ @rapidsai/cudf-java-codeowners
/.pre-commit-config.yaml @rapidsai/ci-codeowners

#packaging code owners
/.devcontainers/ @rapidsai/packaging-codeowners
/.devcontainer/ @rapidsai/packaging-codeowners
/conda/ @rapidsai/packaging-codeowners
/dependencies.yaml @rapidsai/packaging-codeowners
/build.sh @rapidsai/packaging-codeowners
Expand Down
20 changes: 12 additions & 8 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,19 @@
# Documentation for config - https://github.com/actions/labeler#common-examples

cuDF (Python):
Python:
- 'python/**'
- 'notebooks/**'

cudf.pandas:
- 'python/cudf/cudf/pandas/**'
- 'python/cudf/cudf_pandas_tests/**'

cudf.polars:
- 'python/cudf_polars/**'

pylibcudf:
- 'python/cudf/cudf/_lib/pylibcudf/**'

libcudf:
- 'cpp/**'

Expand All @@ -12,11 +22,5 @@ CMake:
- '**/cmake/**'
- '**/*.cmake'

cuDF (Java):
Java:
- 'java/**'

ci:
- 'ci/**'

conda:
- 'conda/**'
60 changes: 60 additions & 0 deletions .github/workflows/external_issue_labeler.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
# SPDX-FileCopyrightText: Copyright (c) 2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
# SPDX-License-Identifier: Apache-2.0
#
# Licensed 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.

name: Label external issues and PRs

on:
issues:
types:
- opened

pull_request_target:
types:
- opened

env:
GITHUB_TOKEN: ${{ github.token }}

jobs:
Label-Issue:
runs-on: ubuntu-latest
permissions:
issues: write
if: github.event_name == 'issues'
steps:
- name: add-external-labels
# Only run if the issue author is not part of RAPIDS
if: ${{ ! contains(fromJSON('["OWNER", "MEMBER", "COLLABORATOR"]'), github.event.issue.author_association)}}
run: |
echo ${{ github.event.issue.author_association }}
issue_url=${{ github.event.issue.html_url }}
gh issue edit ${issue_url} --add-label "External"
continue-on-error: true

Label-PR:
runs-on: ubuntu-latest
permissions:
pull-requests: write
issues: write
if: github.event_name == 'pull_request_target'
steps:
- name: add-external-labels
# Only run if the issue author is not part of RAPIDS
if: ${{ ! contains(fromJSON('["OWNER", "MEMBER", "COLLABORATOR"]'), github.event.pull_request.author_association)}}
run: |
echo ${{ github.event.pull_request.author_association }}
pr_url=${{ github.event.pull_request.html_url }}
gh issue edit ${pr_url} --add-label "External"
continue-on-error: true
64 changes: 64 additions & 0 deletions .github/workflows/pr_issue_status_automation.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
# SPDX-FileCopyrightText: Copyright (c) 2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
# SPDX-License-Identifier: Apache-2.0
#
# Licensed 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.

name: Set PR and Issue Project Fields

on:
pull_request_target:
# This job runs when a PR is first opened, or it is updated
# Only runs if the PR is open (we don't want to update the status of a closed PR)
types: [opened, edited, synchronize]

jobs:
get-project-id:
uses: rapidsai/shared-workflows/.github/workflows/[email protected]
if: github.event.pull_request.state == 'open'
secrets: inherit
permissions:
contents: read
with:
PROJECT_ID: "PVT_kwDOAp2shc4AiNzl"
ITEM_NODE_ID: "${{ github.event.pull_request.node_id }}"

update-status:
# This job sets the PR and its linked issues to "In Progress" status
uses: rapidsai/shared-workflows/.github/workflows/[email protected]
if: github.event.pull_request.state == 'open'
needs: get-project-id
with:
PROJECT_ID: "PVT_kwDOAp2shc4AiNzl"
SINGLE_SELECT_FIELD_ID: "PVTSSF_lADOAp2shc4AiNzlzgaxNac"
SINGLE_SELECT_FIELD_NAME: "Status"
SINGLE_SELECT_OPTION_VALUE: "In Progress"
ITEM_PROJECT_ID: "${{ needs.get-project-id.outputs.ITEM_PROJECT_ID }}"
ITEM_NODE_ID: "${{ github.event.pull_request.node_id }}"
UPDATE_ITEM: true
UPDATE_LINKED_ISSUES: true
secrets: inherit

update-sprint:
# This job sets the PR and its linked issues to the current "Weekly Sprint"
uses: rapidsai/shared-workflows/.github/workflows/[email protected]
if: github.event.pull_request.state == 'open'
needs: get-project-id
with:
PROJECT_ID: "PVT_kwDOAp2shc4AiNzl"
ITERATION_FIELD_ID: "PVTIF_lADOAp2shc4AiNzlzgbU_po"
ITERATION_FIELD_NAME: "Weekly Sprint"
ITEM_PROJECT_ID: "${{ needs.get-project-id.outputs.ITEM_PROJECT_ID }}"
ITEM_NODE_ID: "${{ github.event.pull_request.node_id }}"
UPDATE_ITEM: true
UPDATE_LINKED_ISSUES: true
secrets: inherit
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ repos:
- id: rapids-dependency-file-generator
args: ["--clean"]
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.4.3
rev: v0.4.8
hooks:
- id: ruff
files: python/.*$
Expand Down
Loading

0 comments on commit f6d12e4

Please sign in to comment.