Merge branch 'branch-0.40' into branch-0.41-merge-branch-0.40

rapidsai · Sep 25, 2024 · 74073bb · 74073bb
2 parents 5c74510 + 4933e92
commit 74073bb
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/ci/release/update-version.sh b/ci/release/update-version.sh
@@ -20,8 +20,8 @@ NEXT_SHORT_TAG=${NEXT_MAJOR}.${NEXT_MINOR}
 NEXT_RAPIDS_SHORT_TAG="$(curl -sL https://version.gpuci.io/ucx-py/${NEXT_SHORT_TAG})"
 
 # Need to distutils-normalize the versions for some use cases
-NEXT_SHORT_TAG_PEP440=$(python -c "from setuptools.extern import packaging; print(packaging.version.Version('${NEXT_SHORT_TAG}'))")
-NEXT_RAPIDS_SHORT_TAG_PEP440=$(python -c "from setuptools.extern import packaging; print(packaging.version.Version('${NEXT_RAPIDS_SHORT_TAG}'))")
+NEXT_SHORT_TAG_PEP440=$(python -c "from packaging.version import Version; print(Version('${NEXT_SHORT_TAG}'))")
+NEXT_RAPIDS_SHORT_TAG_PEP440=$(python -c "from packaging.version import Version; print(Version('${NEXT_RAPIDS_SHORT_TAG}'))")
 echo "Next tag is ${NEXT_RAPIDS_SHORT_TAG_PEP440}"
 
 echo "Preparing release: $NEXT_FULL_TAG"

diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml
@@ -21,7 +21,7 @@ dependencies:
 - dask-cuda==24.12.*,>=0.0.0a0
 - dask-cudf==24.12.*,>=0.0.0a0
 - doxygen=1.9.1
-- fmt>=10.1.1,<11
+- fmt>=11.0.2,<12
 - librmm==24.12.*,>=0.0.0a0
 - libtool
 - ninja
@@ -40,6 +40,6 @@ dependencies:
 - rmm==24.12.*,>=0.0.0a0
 - scikit-build-core>=0.10.0
 - setuptools>=64.0.0
-- spdlog>=1.12.0,<1.13
+- spdlog>=1.14.1,<1.15
 - ucx>=1.15.0,<1.18
 name: all_cuda-118_arch-x86_64
diff --git a/conda/environments/all_cuda-125_arch-x86_64.yaml b/conda/environments/all_cuda-125_arch-x86_64.yaml
@@ -21,7 +21,7 @@ dependencies:
 - dask-cuda==24.12.*,>=0.0.0a0
 - dask-cudf==24.12.*,>=0.0.0a0
 - doxygen=1.9.1
-- fmt>=10.1.1,<11
+- fmt>=11.0.2,<12
 - librmm==24.12.*,>=0.0.0a0
 - libtool
 - ninja
@@ -40,6 +40,6 @@ dependencies:
 - rmm==24.12.*,>=0.0.0a0
 - scikit-build-core>=0.10.0
 - setuptools>=64.0.0
-- spdlog>=1.12.0,<1.13
+- spdlog>=1.14.1,<1.15
 - ucx>=1.15.0,<1.18
 name: all_cuda-125_arch-x86_64
diff --git a/dependencies.yaml b/dependencies.yaml
@@ -156,10 +156,10 @@ dependencies:
           - c-compiler
           - cxx-compiler
           - &cmake_ver cmake>=3.26.4,!=3.30.0
-          - fmt>=10.1.1,<11
+          - fmt>=11.0.2,<12
           - librmm==24.12.*,>=0.0.0a0
           - ninja
-          - spdlog>=1.12.0,<1.13
+          - spdlog>=1.14.1,<1.15
       - output_types: [requirements, pyproject]
         packages:
           - *cmake_ver