From 457bd318aa13ff870f0a3b0d277dfaeff6d59187 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Wed, 24 Jul 2024 13:14:07 -0500 Subject: [PATCH] consolidate cuda_suffixed=false blocks --- dependencies.yaml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index 0be1abf2..fc74f4c0 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -195,10 +195,10 @@ dependencies: - panel>=1.0 - output_types: conda packages: - - &cudf_conda cudf==24.8.*,>=0.0.0a0 + - &cudf_unsuffixed cudf==24.8.*,>=0.0.0a0 - cupy>=12.0.0 - - &cuspatial_conda cuspatial==24.8.*,>=0.0.0a0 - - &dask_cudf_conda dask-cudf==24.8.*,>=0.0.0a0 + - &cuspatial_unsuffixed cuspatial==24.8.*,>=0.0.0a0 + - &dask_cudf_unsuffixed dask-cudf==24.8.*,>=0.0.0a0 - nodejs>=18 - libwebp-base specific: @@ -216,12 +216,12 @@ dependencies: cuda: "12.*" cuda_suffixed: "false" packages: - - *cudf_conda + - *cudf_unsuffixed # NOTE: cupy still has a "-cuda12x" suffix here, because it's suffixed # in DLFW builds - *cupy_cu12 - - *cuspatial_conda - - *dask_cudf_conda + - *cuspatial_unsuffixed + - *dask_cudf_unsuffixed - matrix: cuda: "11.*" cuda_suffixed: "true" @@ -234,18 +234,18 @@ dependencies: cuda: "11.*" cuda_suffixed: "false" packages: - - *cudf_conda + - *cudf_unsuffixed # NOTE: cupy still has a "-cuda11x" suffix here, because it's suffixed # in DLFW builds - *cupy_cu11 - - *cuspatial_conda - - *dask_cudf_conda + - *cuspatial_unsuffixed + - *dask_cudf_unsuffixed - matrix: packages: - - *cudf_conda + - *cudf_unsuffixed - *cupy_cu11 - - *cuspatial_conda - - *dask_cudf_conda + - *cuspatial_unsuffixed + - *dask_cudf_unsuffixed test_python: common: - output_types: [conda, requirements, pyproject]