From 7bb212f31183e0408604e09b0885747de1c8bdeb Mon Sep 17 00:00:00 2001
From: James Lamb <jlamb@nvidia.com>
Date: Fri, 30 Aug 2024 13:30:27 -0700
Subject: [PATCH] rearrange dependencies.yaml, fix development instructions

---
 .../all_cuda-118_arch-x86_64.yaml             |  2 -
 .../all_cuda-125_arch-x86_64.yaml             |  2 -
 dependencies.yaml                             | 52 ++++++++++++++-----
 3 files changed, 39 insertions(+), 17 deletions(-)

diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml
index 0cbe9a1f7..211d27b68 100644
--- a/conda/environments/all_cuda-118_arch-x86_64.yaml
+++ b/conda/environments/all_cuda-118_arch-x86_64.yaml
@@ -24,8 +24,6 @@ dependencies:
 - ipython
 - ipywidgets
 - libcudf==24.10.*,>=0.0.0a0
-- libcuspatial-tests==24.10.*,>=0.0.0a0
-- libcuspatial==24.10.*,>=0.0.0a0
 - librmm==24.10.*,>=0.0.0a0
 - myst-parser
 - nbsphinx
diff --git a/conda/environments/all_cuda-125_arch-x86_64.yaml b/conda/environments/all_cuda-125_arch-x86_64.yaml
index 1001169e5..fc782ccfc 100644
--- a/conda/environments/all_cuda-125_arch-x86_64.yaml
+++ b/conda/environments/all_cuda-125_arch-x86_64.yaml
@@ -27,8 +27,6 @@ dependencies:
 - ipython
 - ipywidgets
 - libcudf==24.10.*,>=0.0.0a0
-- libcuspatial-tests==24.10.*,>=0.0.0a0
-- libcuspatial==24.10.*,>=0.0.0a0
 - librmm==24.10.*,>=0.0.0a0
 - myst-parser
 - nbsphinx
diff --git a/dependencies.yaml b/dependencies.yaml
index 859009683..7eb64147d 100644
--- a/dependencies.yaml
+++ b/dependencies.yaml
@@ -21,7 +21,6 @@ files:
       - depends_on_librmm
       - rapids_build_skbuild
       - run_python_cuspatial
-      - test_libcuspatial
       - test_notebooks
       - test_python_cuspatial
       - test_python_cuproj
@@ -30,24 +29,27 @@ files:
     output: none
     includes:
       - cuda_version
+      - depends_on_libcuspatial
       - test_libcuspatial
   test_python:
     output: none
     includes:
       - cuda_version
+      - depends_on_cuproj
+      - depends_on_cuspatial
       - py_version
       - test_python_cuspatial
       - test_python_cuproj
-      - test_cuspatial
   test_notebooks:
     output: none
     includes:
       - cuda_version
       - depends_on_cuml
+      - depends_on_cuproj
+      - depends_on_cuspatial
       - test_notebooks
       - notebooks
       - py_version
-      - test_cuspatial
   checks:
     output: none
     includes:
@@ -57,9 +59,11 @@ files:
     output: none
     includes:
       - cuda_version
+      - depends_on_libcuspatial
+      - depends_on_cuspatial
+      - depends_on_cuproj
       - docs
       - py_version
-      - test_cuspatial
   py_build_cuspatial:
     output: [pyproject]
     pyproject_dir: python/cuspatial
@@ -133,7 +137,6 @@ files:
     includes:
       - test_python_cuproj
       - depends_on_cuspatial
-      - test_cuspatial
 
 channels:
   - rapidsai
@@ -391,6 +394,12 @@ dependencies:
         packages:
           - pyproj>=3.6.0,<3.7a0
 
+  depends_on_libcuspatial:
+    common:
+      - output_types: conda
+        packages:
+          - &libcuspatial_unsuffixed libcuspatial==24.10.*,>=0.0.0a0
+
   depends_on_rmm:
     common:
       - output_types: conda
@@ -519,6 +528,31 @@ dependencies:
               - cuspatial-cu11==24.10.*,>=0.0.0a0
           - {matrix: null, packages: [*cuspatial_unsuffixed]}
 
+  depends_on_cuproj:
+    common:
+      - output_types: conda
+        packages:
+          - &cuproj_unsuffixed cuproj==24.10.*,>=0.0.0a0
+      - output_types: requirements
+        packages:
+          # pip recognizes the index as a global option for the requirements.txt file
+          - --extra-index-url=https://pypi.nvidia.com
+          - --extra-index-url=https://pypi.anaconda.org/rapidsai-wheels-nightly/simple
+    specific:
+      - output_types: [requirements, pyproject]
+        matrices:
+          - matrix:
+              cuda: "12.*"
+              cuda_suffixed: "true"
+            packages:
+              - cuproj-cu12==24.10.*,>=0.0.0a0
+          - matrix:
+              cuda: "11.*"
+              cuda_suffixed: "true"
+            packages:
+              - cuproj-cu11==24.10.*,>=0.0.0a0
+          - {matrix: null, packages: [*cuproj_unsuffixed]}
+
   depends_on_cupy:
     common:
       - output_types: conda
@@ -540,15 +574,7 @@ dependencies:
     common:
       - output_types: conda
         packages:
-          - libcuspatial==24.10.*,>=0.0.0a0
           - libcuspatial-tests==24.10.*,>=0.0.0a0
-  test_cuspatial:
-    common:
-      - output_types: conda
-        packages:
-          - libcuspatial==24.10.*,>=0.0.0a0
-          - cuspatial==24.10.*,>=0.0.0a0
-          - cuproj==24.10.*,>=0.0.0a0
 
   depends_on_librmm:
     common: