Skip to content

Commit f0e4f20

Browse files
raydouglassraydouglass
authored
Merge pull request #211 from rapidsai/branch-0.12
Release v0.12.0
2 parents f481e0c + 4efba69 commit f0e4f20

File tree

19 files changed

+98
-43
lines changed

19 files changed

+98
-43
lines changed

‎.github/workflows/build.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ concurrency:
2929
jobs:
3030
conda-python-build:
3131
secrets: inherit
32-
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-24.02
32+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-24.10
3333
with:
3434
build_type: ${{ inputs.build_type || 'branch' }}
3535
branch: ${{ inputs.branch }}
@@ -40,15 +40,15 @@ jobs:
4040
upload-conda:
4141
needs: conda-python-build
4242
secrets: inherit
43-
uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@branch-24.02
43+
uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@branch-24.10
4444
with:
4545
build_type: ${{ inputs.build_type || 'branch' }}
4646
branch: ${{ inputs.branch }}
4747
date: ${{ inputs.date }}
4848
sha: ${{ inputs.sha }}
4949
wheel-build:
5050
secrets: inherit
51-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.02
51+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.10
5252
with:
5353
build_type: ${{ inputs.build_type || 'branch' }}
5454
branch: ${{ inputs.branch }}
@@ -60,7 +60,7 @@ jobs:
6060
wheel-publish:
6161
needs: wheel-build
6262
secrets: inherit
63-
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@branch-24.02
63+
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@branch-24.10
6464
with:
6565
build_type: ${{ inputs.build_type || 'branch' }}
6666
branch: ${{ inputs.branch }}

‎.github/workflows/pr.yaml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,41 +18,41 @@ jobs:
1818
- wheel-build
1919
- wheel-tests
2020
secrets: inherit
21-
uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@branch-24.02
21+
uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@branch-24.10
2222
checks:
2323
secrets: inherit
24-
uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@branch-24.02
24+
uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@branch-24.10
2525
conda-python-build:
2626
needs: checks
2727
secrets: inherit
28-
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-24.02
28+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-24.10
2929
with:
3030
build_type: pull-request
31-
# Package is pure Python and only ever requires one build.
32-
matrix_filter: 'map(select(.ARCH == "amd64" and (.LINUX_VER | test("centos")|not))) | sort_by(.PY_VER | split(".") | map(tonumber)) | [.[-1]]'
31+
# This selects "ARCH=amd64 + the latest supported Python + CUDA".
32+
matrix_filter: map(select(.ARCH == "amd64")) | max_by([(.PY_VER|split(".")|map(tonumber)), (.CUDA_VER|split(".")|map(tonumber))]) | [.]
3333
conda-python-tests:
3434
needs: conda-python-build
3535
secrets: inherit
36-
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-24.02
36+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-24.10
3737
with:
3838
build_type: pull-request
39-
# Package is pure Python and only ever requires one build.
40-
matrix_filter: 'map(select(.ARCH == "amd64" and (.LINUX_VER | test("centos")|not))) | sort_by(.PY_VER | split(".") | map(tonumber)) | [.[-1]]'
39+
# This selects "ARCH=amd64 + the latest supported Python + CUDA".
40+
matrix_filter: map(select(.ARCH == "amd64")) | max_by([(.PY_VER|split(".")|map(tonumber)), (.CUDA_VER|split(".")|map(tonumber))]) | [.]
4141
wheel-build:
4242
needs: checks
4343
secrets: inherit
44-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.02
44+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.10
4545
with:
4646
build_type: pull-request
47-
# Package is pure Python and only ever requires one build.
48-
matrix_filter: 'map(select((.LINUX_VER | test("centos")|not))) | sort_by((.PY_VER | split(".") | map(tonumber))) | [.[-1] + {ARCH: "amd64"}]'
47+
# This selects the latest supported Python + CUDA
48+
matrix_filter: max_by([(.PY_VER|split(".")|map(tonumber)), (.CUDA_VER|split(".")|map(tonumber))]) | [.]
4949
script: "ci/build_wheel.sh"
5050
wheel-tests:
5151
needs: wheel-build
5252
secrets: inherit
53-
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.02
53+
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.10
5454
with:
5555
build_type: pull-request
56-
# Package is pure Python and only ever requires one build.
57-
matrix_filter: 'map(select(.ARCH == "amd64" and (.LINUX_VER | test("centos")|not))) | sort_by(.PY_VER | split(".") | map(tonumber)) | [.[-1]]'
58-
script: "ci/test_wheel.sh"
56+
# This selects the latest supported Python + CUDA
57+
matrix_filter: max_by([(.PY_VER|split(".")|map(tonumber)), (.CUDA_VER|split(".")|map(tonumber))]) | [.]
58+
script: "ci/test_wheel.sh"

‎.github/workflows/trigger-breaking-change-alert.yaml‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
name: Trigger Breaking Change Notifications
2+
3+
on:
4+
pull_request_target:
5+
types:
6+
- closed
7+
- reopened
8+
- labeled
9+
- unlabeled
10+
11+
jobs:
12+
trigger-notifier:
13+
if: contains(github.event.pull_request.labels.*.name, 'breaking')
14+
secrets: inherit
15+
uses: rapidsai/shared-workflows/.github/workflows/[email protected]
16+
with:
17+
sender_login: ${{ github.event.sender.login }}
18+
sender_avatar: ${{ github.event.sender.avatar_url }}
19+
repo: ${{ github.repository }}
20+
pr_number: ${{ github.event.pull_request.number }}
21+
pr_title: "${{ github.event.pull_request.title }}"
22+
pr_body: "${{ github.event.pull_request.body || '_Empty PR description_' }}"
23+
pr_base_ref: ${{ github.event.pull_request.base.ref }}
24+
pr_author: ${{ github.event.pull_request.user.login }}
25+
event_action: ${{ github.event.action }}
26+
pr_merged: ${{ github.event.pull_request.merged }}

‎.pre-commit-config.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,20 @@
22

33
repos:
44
- repo: https://github.com/psf/black
5-
rev: 23.11.0
5+
rev: 24.8.0
66
hooks:
77
- id: black
88
files: jupyterlab_nvdashboard/.*
99
# Explicitly specify the pyproject.toml at the repo root, not per-project.
1010
args: ['--config', 'pyproject.toml']
1111
- repo: https://github.com/PyCQA/flake8
12-
rev: 6.1.0
12+
rev: 7.1.1
1313
hooks:
1414
- id: flake8
1515
args: ['--config=.flake8']
1616
files: jupyterlab_nvdashboard/.*$
1717
- repo: https://github.com/rapidsai/dependency-file-generator
18-
rev: v1.7.1
18+
rev: v1.14.0
1919
hooks:
2020
- id: rapids-dependency-file-generator
2121
args: ['--clean']

‎ci/build_wheel.sh‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ python -m pip install build
3838
# Build the Python package
3939
python -m build -s -w
4040

41+
ci/validate_wheel.sh dist
42+
4143
rapids-logger "Uploading JupyterLab NVDashboard wheels to S3"
4244
# Upload Python wheels to S3
43-
RAPIDS_PY_WHEEL_NAME="${package_name}" rapids-upload-wheels-to-s3 dist
45+
RAPIDS_PY_WHEEL_NAME="${package_name}" RAPIDS_PY_WHEEL_PURE="1" rapids-upload-wheels-to-s3 dist

‎ci/check_style.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ rapids-logger "Create checks conda environment"
88

99
rapids-dependency-file-generator \
1010
--output conda \
11-
--file_key checks \
11+
--file-key checks \
1212
--matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch);py=${RAPIDS_PY_VERSION}" | tee env.yaml
1313

1414
rapids-mamba-retry env create --yes -f env.yaml -n checks

‎ci/test_python.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ set -euo pipefail
88
rapids-logger "Generate Python testing dependencies"
99
rapids-dependency-file-generator \
1010
--output conda \
11-
--file_key test_python \
11+
--file-key test_python \
1212
--matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch);py=${RAPIDS_PY_VERSION}" | tee env.yaml
1313

1414
rapids-mamba-retry env create --yes -f env.yaml -n test

‎ci/test_wheel.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ set -eou pipefail
77
package_name="jupyterlab-nvdashboard"
88

99
rapids-logger "Downloading artifacts from previous jobs"
10-
RAPIDS_PY_WHEEL_NAME="${package_name}" rapids-download-wheels-from-s3 ./dist
10+
RAPIDS_PY_WHEEL_NAME="${package_name}" RAPIDS_PY_WHEEL_PURE="1" rapids-download-wheels-from-s3 ./dist
1111

1212
# echo to expand wildcard before adding `[extra]` required for pip
1313
python -m pip install $(echo ./dist/jupyterlab_nvdashboard*.whl)[test]

‎ci/validate_wheel.sh‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
#!/bin/bash
2+
# Copyright (c) 2024, NVIDIA CORPORATION.
3+
4+
set -euo pipefail
5+
6+
wheel_dir_relative_path=$1
7+
8+
rapids-logger "validate packages with 'pydistcheck'"
9+
10+
pydistcheck \
11+
--inspect \
12+
"$(echo ${wheel_dir_relative_path}/*.whl)"
13+
14+
rapids-logger "validate packages with 'twine'"
15+
16+
twine check \
17+
--strict \
18+
"$(echo ${wheel_dir_relative_path}/*.whl)"

‎conda/environments/all_arch-any.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ dependencies:
1010
- nodejs=18
1111
- pre-commit
1212
- psutil
13-
- pynvml
13+
- pynvml>=11.0.0,<12.0.0a0
1414
- pytest
1515
- pytest-asyncio
1616
- pytest-jupyter[server]>=0.6.0

0 commit comments

Comments
 (0)