From fbc7b050f17cf1245167186b2b0e44710aa2238d Mon Sep 17 00:00:00 2001 From: James Lamb Date: Mon, 23 Sep 2024 15:35:48 -0500 Subject: [PATCH 1/4] Update fmt (to 11.0.2) and spdlog (to 1.14.1). (#278) * Update fmt (to 11.0.2) and spdlog (to 1.14.1). * fix rapids-cmake redirect * use rmm CI artifacts * use cudf CI artifacts * fix cudf CI downloads * mirror changes [skip ci] * kick off a build * typo * fix wheel script * move unused things to comments * filepath * fix paths * run all CI * workflow branch * remove testing-only changes [skip ci] * remove CI-only scripts [skip ci] --- conda/environments/all_cuda-118_arch-x86_64.yaml | 4 ++-- conda/environments/all_cuda-125_arch-x86_64.yaml | 4 ++-- dependencies.yaml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index 135a01be..c0bbae2b 100644 --- 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.10.*,>=0.0.0a0 - dask-cudf==24.10.*,>=0.0.0a0 - doxygen=1.9.1 -- fmt>=10.1.1,<11 +- fmt>=11.0.2,<12 - librmm==24.10.*,>=0.0.0a0 - libtool - ninja @@ -40,6 +40,6 @@ dependencies: - rmm==24.10.*,>=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 index b63f81c3..e6bf60ec 100644 --- 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.10.*,>=0.0.0a0 - dask-cudf==24.10.*,>=0.0.0a0 - doxygen=1.9.1 -- fmt>=10.1.1,<11 +- fmt>=11.0.2,<12 - librmm==24.10.*,>=0.0.0a0 - libtool - ninja @@ -40,6 +40,6 @@ dependencies: - rmm==24.10.*,>=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 index 329af493..a216dce3 100644 --- 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.10.*,>=0.0.0a0 - ninja - - spdlog>=1.12.0,<1.13 + - spdlog>=1.14.1,<1.15 - output_types: [requirements, pyproject] packages: - *cmake_ver From 64185702c29731a5fccd581b64f73671f5fee1cd Mon Sep 17 00:00:00 2001 From: Jake Awe <50372925+AyodeAwe@users.noreply.github.com> Date: Tue, 24 Sep 2024 14:11:48 -0500 Subject: [PATCH 2/4] update update-version.sh to use packaging lib (#282) --- ci/release/update-version.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/release/update-version.sh b/ci/release/update-version.sh index d5ead315..942eeb1f 100755 --- 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" From 40eef0f63ca30b0d5434e67e731e2b1633d7d4da Mon Sep 17 00:00:00 2001 From: Jake Awe <50372925+AyodeAwe@users.noreply.github.com> Date: Wed, 25 Sep 2024 12:37:00 -0500 Subject: [PATCH 3/4] empty commit for test pr (#284) From 4933e923ac7f8d955b53be319a60f5bf13def1e8 Mon Sep 17 00:00:00 2001 From: Jake Awe <50372925+AyodeAwe@users.noreply.github.com> Date: Wed, 25 Sep 2024 13:45:32 -0500 Subject: [PATCH 4/4] empty commit for test pr (#285)