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 463683232..859605b4f 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -18,11 +18,9 @@ files: - depends_on_cuml - depends_on_cupy - depends_on_libcudf - - depends_on_libcuspatial - depends_on_librmm - rapids_build_skbuild - run_python_cuspatial - - test_libcuspatial - test_notebooks - test_python_cuspatial - test_python_cuproj @@ -37,21 +35,21 @@ files: output: none includes: - cuda_version - - depends_on_libcuspatial + - 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_libcuspatial + - depends_on_cuproj + - depends_on_cuspatial - test_notebooks - notebooks - py_version - - test_cuspatial checks: output: none includes: @@ -61,10 +59,10 @@ files: output: none includes: - cuda_version - - depends_on_libcuspatial + - depends_on_cuspatial + - depends_on_cuproj - docs - py_version - - test_cuspatial py_build_libcuspatial: output: [pyproject] pyproject_dir: python/libcuspatial @@ -165,7 +163,6 @@ files: includes: - test_python_cuproj - depends_on_cuspatial - - test_cuspatial channels: - rapidsai @@ -551,6 +548,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 @@ -573,13 +595,6 @@ dependencies: - output_types: conda packages: - libcuspatial-tests==24.10.*,>=0.0.0a0 - test_cuspatial: - common: - - output_types: conda - packages: - - cuspatial==24.10.*,>=0.0.0a0 - - cuproj==24.10.*,>=0.0.0a0 - depends_on_libcuspatial: common: - output_types: conda