From cd5abc365cc5567328e0543b17006a865411b88e Mon Sep 17 00:00:00 2001
From: James Lamb <jaylamb20@gmail.com>
Date: Thu, 11 Jan 2024 14:05:02 -0600
Subject: [PATCH] refactor CUDA versions in dependencies.yaml (#562)

Contributes to https://github.com/rapidsai/build-planning/issues/7.

Proposes splitting the `cuda-version` dependency in `dependencies.yaml` out to its own thing, separate from the bits of the CUDA Toolkit this project needs.

### Benefits of this change

* prevents accidental inclusion of multiple `cuda-version` version in environments
* reduces update effort (via enabling more use of globs like `"12.*"`)
* improves the chance that errors like "`conda` recipe is missing a dependency" are caught in CI

Authors:
  - James Lamb (https://github.com/jameslamb)
  - Ajay Thorve (https://github.com/AjayThorve)

Approvers:
  - Ray Douglass (https://github.com/raydouglass)
  - Ajay Thorve (https://github.com/AjayThorve)

URL: https://github.com/rapidsai/cuxfilter/pull/562
---
 .pre-commit-config.yaml                       |  2 +-
 .../all_cuda-118_arch-x86_64.yaml             |  1 +
 .../all_cuda-120_arch-x86_64.yaml             |  1 +
 dependencies.yaml                             | 44 ++++++++++++-------
 4 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 985843b5..fa889125 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -15,7 +15,7 @@ repos:
                 args: ["--config=.flake8"]
                 files: python/.*$
       - repo: https://github.com/rapidsai/dependency-file-generator
-        rev: v1.7.1
+        rev: v1.8.0
         hooks:
             - id: rapids-dependency-file-generator
               args: ["--clean"]
diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml
index 211437eb..4e2cc92b 100644
--- a/conda/environments/all_cuda-118_arch-x86_64.yaml
+++ b/conda/environments/all_cuda-118_arch-x86_64.yaml
@@ -32,6 +32,7 @@ dependencies:
 - packaging
 - pandoc<=2.0.0
 - panel>=1.0
+- panel>=1.0,<=1.3.4
 - pre-commit
 - pydata-sphinx-theme
 - pytest
diff --git a/conda/environments/all_cuda-120_arch-x86_64.yaml b/conda/environments/all_cuda-120_arch-x86_64.yaml
index dafb0eaa..c78cc8c8 100644
--- a/conda/environments/all_cuda-120_arch-x86_64.yaml
+++ b/conda/environments/all_cuda-120_arch-x86_64.yaml
@@ -31,6 +31,7 @@ dependencies:
 - packaging
 - pandoc<=2.0.0
 - panel>=1.0
+- panel>=1.0,<=1.3.4
 - pre-commit
 - pydata-sphinx-theme
 - pytest
diff --git a/dependencies.yaml b/dependencies.yaml
index 0ff1a431..ed759b6f 100644
--- a/dependencies.yaml
+++ b/dependencies.yaml
@@ -7,7 +7,8 @@ files:
       arch: [x86_64]
     includes:
       - build_wheels
-      - cudatoolkit
+      - cuda
+      - cuda_version
       - checks
       - docs
       - notebook
@@ -17,13 +18,14 @@ files:
   test_python:
     output: none
     includes:
-      - cudatoolkit
+      - cuda
+      - cuda_version
       - py_version
       - test_python
   test_notebooks:
     output: none
     includes:
-      - cudatoolkit
+      - cuda_version
       - notebook
       - py_version
   checks:
@@ -34,7 +36,7 @@ files:
   docs:
     output: none
     includes:
-      - cudatoolkit
+      - cuda_version
       - docs
       - py_version
   py_build:
@@ -71,34 +73,41 @@ dependencies:
         packages:
           - wheel
           - setuptools
-  cudatoolkit:
+  cuda_version:
     specific:
       - output_types: conda
         matrices:
           - matrix:
-              cuda: "12.0"
+              cuda: "11.2"
             packages:
-              - cuda-version=12.0
+              - cuda-version=11.2
           - matrix:
-              cuda: "11.8"
+              cuda: "11.4"
             packages:
-              - cuda-version=11.8
-              - cudatoolkit
+              - cuda-version=11.4
           - matrix:
               cuda: "11.5"
             packages:
               - cuda-version=11.5
-              - cudatoolkit
           - matrix:
-              cuda: "11.4"
+              cuda: "11.8"
             packages:
-              - cuda-version=11.4
-              - cudatoolkit
+              - cuda-version=11.8
           - matrix:
-              cuda: "11.2"
+              cuda: "12.0"
+            packages:
+              - cuda-version=12.0
+  cuda:
+    specific:
+      - output_types: conda
+        matrices:
+          - matrix:
+              cuda: "11.*"
             packages:
-              - cuda-version=11.2
               - cudatoolkit
+          - matrix:
+              cuda: "12.*"
+            packages:
   checks:
     common:
       - output_types: [conda, requirements]
@@ -177,3 +186,6 @@ dependencies:
           - pytest
           - pytest-cov
           - pytest-xdist
+      - output_types: conda
+        packages:
+          - panel>=1.0,<=1.3.4