Merge pull request #211 from rapidsai/branch-0.12

Release v0.12.0

.github/workflows/build.yaml

@@ -29,7 +29,7 @@ concurrency:
 jobs:
   conda-python-build:
     secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-24.02
+    uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-24.10
     with:
       build_type: ${{ inputs.build_type || 'branch' }}
       branch: ${{ inputs.branch }}
@@ -40,15 +40,15 @@ jobs:
   upload-conda:
     needs: conda-python-build
     secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@branch-24.02
+    uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@branch-24.10
     with:
       build_type: ${{ inputs.build_type || 'branch' }}
       branch: ${{ inputs.branch }}
       date: ${{ inputs.date }}
       sha: ${{ inputs.sha }}
   wheel-build:
     secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.02
+    uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.10
     with:
       build_type: ${{ inputs.build_type || 'branch' }}
       branch: ${{ inputs.branch }}
@@ -60,7 +60,7 @@ jobs:
   wheel-publish:
     needs: wheel-build
     secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@branch-24.02
+    uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@branch-24.10
     with:
       build_type: ${{ inputs.build_type || 'branch' }}
       branch: ${{ inputs.branch }}

.github/workflows/pr.yaml

@@ -18,41 +18,41 @@ jobs:
       - wheel-build
       - wheel-tests
     secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@branch-24.02
+    uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@branch-24.10
   checks:
     secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@branch-24.02
+    uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@branch-24.10
   conda-python-build:
     needs: checks
     secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-24.02
+    uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-24.10
     with:
       build_type: pull-request
-      # Package is pure Python and only ever requires one build.
-      matrix_filter: 'map(select(.ARCH == "amd64" and (.LINUX_VER | test("centos")|not))) | sort_by(.PY_VER | split(".") | map(tonumber)) | [.[-1]]'
+      # This selects "ARCH=amd64 + the latest supported Python + CUDA".
+      matrix_filter: map(select(.ARCH == "amd64")) | max_by([(.PY_VER|split(".")|map(tonumber)), (.CUDA_VER|split(".")|map(tonumber))]) | [.]
   conda-python-tests:
     needs: conda-python-build
     secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-24.02
+    uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-24.10
     with:
       build_type: pull-request
-      # Package is pure Python and only ever requires one build.
-      matrix_filter: 'map(select(.ARCH == "amd64" and (.LINUX_VER | test("centos")|not))) | sort_by(.PY_VER | split(".") | map(tonumber)) | [.[-1]]'
+      # This selects "ARCH=amd64 + the latest supported Python + CUDA".
+      matrix_filter: map(select(.ARCH == "amd64")) | max_by([(.PY_VER|split(".")|map(tonumber)), (.CUDA_VER|split(".")|map(tonumber))]) | [.]
   wheel-build:
     needs: checks
     secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.02
+    uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.10
     with:
       build_type: pull-request
-      # Package is pure Python and only ever requires one build.
-      matrix_filter: 'map(select((.LINUX_VER | test("centos")|not))) | sort_by((.PY_VER | split(".") | map(tonumber))) | [.[-1] + {ARCH: "amd64"}]'
+      # This selects the latest supported Python + CUDA
+      matrix_filter: max_by([(.PY_VER|split(".")|map(tonumber)), (.CUDA_VER|split(".")|map(tonumber))]) | [.]
       script: "ci/build_wheel.sh"
   wheel-tests:
     needs: wheel-build
     secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.02
+    uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.10
     with:
       build_type: pull-request
-      # Package is pure Python and only ever requires one build.
-      matrix_filter: 'map(select(.ARCH == "amd64" and (.LINUX_VER | test("centos")|not))) | sort_by(.PY_VER | split(".") | map(tonumber)) | [.[-1]]'
-      script: "ci/test_wheel.sh"
+      # This selects the latest supported Python + CUDA
+      matrix_filter: max_by([(.PY_VER|split(".")|map(tonumber)), (.CUDA_VER|split(".")|map(tonumber))]) | [.]
+      script: "ci/test_wheel.sh"

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

@@ -0,0 +1,26 @@
+name: Trigger Breaking Change Notifications
+
+on:
+  pull_request_target:
+    types:
+      - closed
+      - reopened
+      - labeled
+      - unlabeled
+
+jobs:
+  trigger-notifier:
+    if: contains(github.event.pull_request.labels.*.name, 'breaking')
+    secrets: inherit
+    uses: rapidsai/shared-workflows/.github/workflows/[email protected]
+    with:
+      sender_login: ${{ github.event.sender.login }}
+      sender_avatar: ${{ github.event.sender.avatar_url }}
+      repo: ${{ github.repository }}
+      pr_number: ${{ github.event.pull_request.number }}
+      pr_title: "${{ github.event.pull_request.title }}"
+      pr_body: "${{ github.event.pull_request.body || '_Empty PR description_' }}"
+      pr_base_ref: ${{ github.event.pull_request.base.ref }}
+      pr_author: ${{ github.event.pull_request.user.login }}
+      event_action: ${{ github.event.action }}
+      pr_merged: ${{ github.event.pull_request.merged }}

.pre-commit-config.yaml

@@ -2,20 +2,20 @@
 
 repos:
   - repo: https://github.com/psf/black
-    rev: 23.11.0
+    rev: 24.8.0
     hooks:
       - id: black
         files: jupyterlab_nvdashboard/.*
         # Explicitly specify the pyproject.toml at the repo root, not per-project.
         args: ['--config', 'pyproject.toml']
   - repo: https://github.com/PyCQA/flake8
-    rev: 6.1.0
+    rev: 7.1.1
     hooks:
       - id: flake8
         args: ['--config=.flake8']
         files: jupyterlab_nvdashboard/.*$
   - repo: https://github.com/rapidsai/dependency-file-generator
-    rev: v1.7.1
+    rev: v1.14.0
     hooks:
       - id: rapids-dependency-file-generator
         args: ['--clean']

ci/build_wheel.sh

@@ -38,6 +38,8 @@ python -m pip install build
 # Build the Python package
 python -m build -s -w
 
+ci/validate_wheel.sh dist
+
 rapids-logger "Uploading JupyterLab NVDashboard wheels to S3"
 # Upload Python wheels to S3
-RAPIDS_PY_WHEEL_NAME="${package_name}" rapids-upload-wheels-to-s3 dist
+RAPIDS_PY_WHEEL_NAME="${package_name}" RAPIDS_PY_WHEEL_PURE="1" rapids-upload-wheels-to-s3 dist

ci/check_style.sh

@@ -8,7 +8,7 @@ rapids-logger "Create checks conda environment"
 
 rapids-dependency-file-generator \
   --output conda \
-  --file_key checks \
+  --file-key checks \
   --matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch);py=${RAPIDS_PY_VERSION}" | tee env.yaml
 
 rapids-mamba-retry env create --yes -f env.yaml -n checks

ci/test_python.sh

@@ -8,7 +8,7 @@ set -euo pipefail
 rapids-logger "Generate Python testing dependencies"
 rapids-dependency-file-generator \
   --output conda \
-  --file_key test_python \
+  --file-key test_python \
   --matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch);py=${RAPIDS_PY_VERSION}" | tee env.yaml
 
 rapids-mamba-retry env create --yes -f env.yaml -n test

ci/test_wheel.sh

@@ -7,7 +7,7 @@ set -eou pipefail
 package_name="jupyterlab-nvdashboard"
 
 rapids-logger "Downloading artifacts from previous jobs"
-RAPIDS_PY_WHEEL_NAME="${package_name}" rapids-download-wheels-from-s3 ./dist
+RAPIDS_PY_WHEEL_NAME="${package_name}" RAPIDS_PY_WHEEL_PURE="1" rapids-download-wheels-from-s3 ./dist
 
 # echo to expand wildcard before adding `[extra]` required for pip
 python -m pip install $(echo ./dist/jupyterlab_nvdashboard*.whl)[test]

ci/validate_wheel.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+# Copyright (c) 2024, NVIDIA CORPORATION.
+
+set -euo pipefail
+
+wheel_dir_relative_path=$1
+
+rapids-logger "validate packages with 'pydistcheck'"
+
+pydistcheck \
+    --inspect \
+    "$(echo ${wheel_dir_relative_path}/*.whl)"
+
+rapids-logger "validate packages with 'twine'"
+
+twine check \
+    --strict \
+    "$(echo ${wheel_dir_relative_path}/*.whl)"

conda/environments/all_arch-any.yaml

@@ -10,7 +10,7 @@ dependencies:
 - nodejs=18
 - pre-commit
 - psutil
-- pynvml
+- pynvml>=11.0.0,<12.0.0a0
 - pytest
 - pytest-asyncio
 - pytest-jupyter[server]>=0.6.0

conda/recipes/jupyterlab-nvdashboard/meta.yaml

@@ -26,7 +26,7 @@ requirements:
   run:
     - python >=3.8
     - jupyterlab >=4
-    - pynvml
+    - pynvml >=11.0.0,<12.0.0a0
     - psutil
 
 

dependencies.yaml

@@ -72,7 +72,7 @@ dependencies:
       - output_types: [conda, requirements, pyproject]
         packages:
           - jupyterlab>=4
-          - pynvml
+          - pynvml>=11.0.0,<12.0.0a0
           - psutil
   test_python:
     common:

jupyterlab_nvdashboard/apps/gpu.py

@@ -26,9 +26,7 @@
 
         # Maximum bandwidth is bidirectional, divide by 2 for separate RX & TX
         max_bw = (
-            max(
-                sum(i.value.ullVal for i in bw) * 1024**2 for bw in bandwidth
-            )
+            max(sum(i.value.ullVal for i in bw) * 1024**2 for bw in bandwidth)
             / 2
         )
     except (IndexError, pynvml.nvml.NVMLError_NotSupported):

jupyterlab_nvdashboard/tests/test_cpu_handlers.py

@@ -17,9 +17,10 @@ def mock_handler(monkeypatch):
 
 @pytest.fixture
 def handler_args():
-    with patch("tornado.web.Application") as mock_application, patch(
-        "tornado.httputil.HTTPServerRequest"
-    ) as mock_request:
+    with (
+        patch("tornado.web.Application") as mock_application,
+        patch("tornado.httputil.HTTPServerRequest") as mock_request,
+    ):
         # Mock the settings to return appropriate values
         mock_settings = {
             "base_url": "/",

jupyterlab_nvdashboard/tests/test_gpu_handlers.py

@@ -23,9 +23,10 @@ def mock_handler(monkeypatch):
 
 @pytest.fixture
 def handler_args():
-    with patch("tornado.web.Application") as mock_application, patch(
-        "tornado.httputil.HTTPServerRequest"
-    ) as mock_request:
+    with (
+        patch("tornado.web.Application") as mock_application,
+        patch("tornado.httputil.HTTPServerRequest") as mock_request,
+    ):
         # Mock the settings to return appropriate values
         mock_settings = {
             "base_url": "/",

package.json

@@ -1,6 +1,6 @@
 {
     "name": "jupyterlab-nvdashboard",
-    "version": "0.11.0",
+    "version": "0.12.0",
     "description": "A JupyterLab extension for displaying GPU usage dashboards",
     "keywords": [
         "jupyter",

pyproject.toml

@@ -31,7 +31,7 @@ classifiers = [
 dependencies = [
     "jupyterlab>=4",
     "psutil",
-    "pynvml",
+    "pynvml>=11.0.0,<12.0.0a0",
 ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit dependencies.yaml and run `rapids-dependency-file-generator`.
 dynamic = ["version", "description", "authors", "urls", "keywords"]
 
@@ -114,3 +114,11 @@ force-exclude = '''
     package.json
 )/
 '''
+
+[tool.pydistcheck]
+select = [
+    "distro-too-large-compressed",
+]
+
+# PyPI limit is 100 MiB, fail CI before we get too close to that
+max_allowed_size_compressed = '75M'

schema/config.json

@@ -1,6 +1,7 @@
 {
-  "title": "jupyterlab-nvdashboard",
+  "title": "NVDashboard",
   "description": "Settings for the jupyterlab-nvdashboard extension.",
+  "jupyter.lab.setting-icon": "launcher:gpu-icon",
   "type": "object",
   "properties": {
     "updateFrequency": {