From 5aae7cd587f7ad0d01310d0cb5128d44af5e9db9 Mon Sep 17 00:00:00 2001 From: Ray Douglass <3107146+raydouglass@users.noreply.github.com> Date: Mon, 22 Jan 2024 11:35:08 -0500 Subject: [PATCH 1/2] Remove update to symlink (#674) Since `python/cucim/README.md` is a symlink to `README.md`, it should not be modified by the `update-version` script. Authors: - Ray Douglass (https://github.com/raydouglass) Approvers: - AJ Schmidt (https://github.com/ajschmidt8) - https://github.com/jakirkham --- ci/release/update-version.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/ci/release/update-version.sh b/ci/release/update-version.sh index e70df365d..3ccc1b71d 100755 --- a/ci/release/update-version.sh +++ b/ci/release/update-version.sh @@ -42,7 +42,6 @@ sed_runner "s/v${CURRENT_LONG_TAG}/v${NEXT_FULL_TAG}/g" python/cucim/docs/gettin sed_runner "s#cucim.kit.cuslide@${CURRENT_LONG_TAG}.so#cucim.kit.cuslide@${NEXT_FULL_TAG}.so#g" python/cucim/docs/getting_started/index.md sed_runner "s#cucim.kit.cuslide@${CURRENT_LONG_TAG}.so#cucim.kit.cuslide@${NEXT_FULL_TAG}.so#g" cucim.code-workspace sed_runner "s#branch-${CURRENT_MAJOR}.${CURRENT_MINOR}#branch-${NEXT_MAJOR}.${NEXT_MINOR}#g" README.md -sed_runner "s#branch-${CURRENT_MAJOR}.${CURRENT_MINOR}#branch-${NEXT_MAJOR}.${NEXT_MINOR}#g" python/cucim/README.md sed_runner "s#branch-${CURRENT_MAJOR}.${CURRENT_MINOR}#branch-${NEXT_MAJOR}.${NEXT_MINOR}#g" python/cucim/pyproject.toml for FILE in .github/workflows/*.yaml; do From b4827f78b1f955cc4580c621e24a59d19f32590a Mon Sep 17 00:00:00 2001 From: jakirkham Date: Mon, 22 Jan 2024 10:49:52 -0800 Subject: [PATCH 2/2] Fix CI issues (#676) This definition causes problems with newer CCCL versions. As we don't actually use it ourselves, go ahead and drop it to fix CI Authors: - https://github.com/jakirkham Approvers: - Gregory Lee (https://github.com/grlee77) URL: https://github.com/rapidsai/cucim/pull/676 --- .../cucim/src/cucim/skimage/_vendored/_ndimage_filters_core.py | 1 - 1 file changed, 1 deletion(-) diff --git a/python/cucim/src/cucim/skimage/_vendored/_ndimage_filters_core.py b/python/cucim/src/cucim/skimage/_vendored/_ndimage_filters_core.py index e1c8ade57..13cccd6b7 100644 --- a/python/cucim/src/cucim/skimage/_vendored/_ndimage_filters_core.py +++ b/python/cucim/src/cucim/skimage/_vendored/_ndimage_filters_core.py @@ -190,7 +190,6 @@ def _call_kernel( template<> struct std::is_floating_point : std::true_type {}; template<> struct std::is_signed : std::true_type {}; -template struct std::is_signed> : std::is_signed {}; """