Merge branch 'branch-0.37' into test-cuda-12.2

rapidsai · Jan 25, 2024 · 3dbdb61 · 3dbdb61
2 parents 37fdcf8 + 470b844
commit 3dbdb61
Show file tree

Hide file tree

Showing 6 changed files with 240 additions and 463 deletions.
diff --git a/ci/checks/doxygen.sh b/ci/checks/doxygen.sh
@@ -13,11 +13,11 @@ fi
 # Utility to return version as number for comparison
 function version { echo "$@" | awk -F. '{ printf("%d%03d%03d%03d\n", $1,$2,$3,$4); }'; }
 
-# doxygen supported version 1.10.0
+# doxygen supported version 1.9.1
 DOXYGEN_VERSION=`doxygen --version`
-if [ ! $(version "$DOXYGEN_VERSION") -eq $(version "1.10.0") ] ; then
+if [ ! $(version "$DOXYGEN_VERSION") -eq $(version "1.9.1") ] ; then
   echo -e "warning: Unsupported doxygen version $DOXYGEN_VERSION"
-  echo -e "Expecting doxygen version 1.10.0"
+  echo -e "Expecting doxygen version 1.9.1"
   exit 0
 fi
 

diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml
@@ -22,7 +22,7 @@ dependencies:
 - dask-cuda==24.4.*
 - dask-cudf==24.4.*
 - distributed
-- doxygen=1.10.0
+- doxygen=1.9.1
 - fmt>=10.1.1,<11
 - gmock>=1.13.0
 - gtest>=1.13.0

diff --git a/conda/environments/all_cuda-122_arch-x86_64.yaml b/conda/environments/all_cuda-122_arch-x86_64.yaml
@@ -22,7 +22,7 @@ dependencies:
 - dask-cuda==24.4.*
 - dask-cudf==24.4.*
 - distributed
-- doxygen=1.10.0
+- doxygen=1.9.1
 - fmt>=10.1.1,<11
 - gmock>=1.13.0
 - gtest>=1.13.0