Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ concurrency:
jobs:
cpp-build:
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@main
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@python-3.14
with:
build_type: ${{ inputs.build_type || 'branch' }}
branch: ${{ inputs.branch }}
Expand All @@ -46,7 +46,7 @@ jobs:
if: github.ref_type == 'branch'
needs: [python-build]
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@main
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@python-3.14
with:
arch: "amd64"
branch: ${{ inputs.branch }}
Expand All @@ -59,7 +59,7 @@ jobs:
python-build:
needs: [cpp-build]
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@main
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@python-3.14
with:
build_type: ${{ inputs.build_type || 'branch' }}
branch: ${{ inputs.branch }}
Expand All @@ -69,15 +69,15 @@ jobs:
upload-conda:
needs: [cpp-build, python-build]
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@main
uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@python-3.14
with:
build_type: ${{ inputs.build_type || 'branch' }}
branch: ${{ inputs.branch }}
date: ${{ inputs.date }}
sha: ${{ inputs.sha }}
wheel-build:
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@main
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@python-3.14
with:
build_type: ${{ inputs.build_type || 'branch' }}
branch: ${{ inputs.branch }}
Expand All @@ -89,7 +89,7 @@ jobs:
wheel-publish:
needs: wheel-build
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@main
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@python-3.14
with:
build_type: ${{ inputs.build_type || 'branch' }}
branch: ${{ inputs.branch }}
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- wheel-tests
- telemetry-setup
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@main
uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@python-3.14
telemetry-setup:
runs-on: ubuntu-latest
continue-on-error: true
Expand All @@ -34,7 +34,7 @@ jobs:
checks:
secrets: inherit
needs: telemetry-setup
uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@main
uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@python-3.14
with:
ignored_pr_jobs: telemetry-summarize
check-nightly-ci:
Expand All @@ -56,28 +56,28 @@ jobs:
conda-cpp-build:
needs: checks
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@main
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@python-3.14
with:
build_type: pull-request
script: ci/build_cpp.sh
conda-python-build:
needs: conda-cpp-build
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@main
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@python-3.14
with:
build_type: pull-request
script: ci/build_python.sh
conda-python-tests:
needs: conda-python-build
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@main
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@python-3.14
with:
build_type: pull-request
script: ci/test_python.sh
docs-build:
needs: conda-python-build
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@main
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@python-3.14
with:
build_type: pull-request
node_type: "gpu-l4-latest-1"
Expand All @@ -87,7 +87,7 @@ jobs:
wheel-build:
needs: checks
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@main
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@python-3.14
with:
build_type: pull-request
script: ci/build_wheel.sh
Expand All @@ -96,7 +96,7 @@ jobs:
wheel-tests:
needs: wheel-build
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@main
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@python-3.14
with:
build_type: pull-request
script: ci/test_wheel.sh
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ on:
jobs:
conda-python-tests:
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@main
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@python-3.14
with:
build_type: ${{ inputs.build_type }}
branch: ${{ inputs.branch }}
Expand All @@ -34,7 +34,7 @@ jobs:
sha: ${{ inputs.sha }}
wheel-tests:
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@main
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@python-3.14
with:
build_type: ${{ inputs.build_type }}
branch: ${{ inputs.branch }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/trigger-breaking-change-alert.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
trigger-notifier:
if: contains(github.event.pull_request.labels.*.name, 'breaking')
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/breaking-change-alert.yaml@main
uses: rapidsai/shared-workflows/.github/workflows/breaking-change-alert.yaml@python-3.14
with:
sender_login: ${{ github.event.sender.login }}
sender_avatar: ${{ github.event.sender.avatar_url }}
Expand Down
2 changes: 2 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,7 @@ repos:
^python/cucim/src/cucim/skimage/restoration/tests/test_restoration[.]py$|
^python/cucim/src/cucim/skimage/restoration/uft[.]py$|
^python/cucim/src/cucim/skimage/segmentation/__init__[.]py$|
^python/cucim/src/cucim/skimage/segmentation/__init__[.]pyi$|
^python/cucim/src/cucim/skimage/segmentation/_chan_vese[.]py$|
^python/cucim/src/cucim/skimage/segmentation/_clear_border[.]py$|
^python/cucim/src/cucim/skimage/segmentation/_join[.]py$|
Expand Down Expand Up @@ -509,6 +510,7 @@ repos:
python/cucim/src/cucim/skimage/restoration/tests/test_restoration[.]py$|
python/cucim/src/cucim/skimage/restoration/uft[.]py$|
python/cucim/src/cucim/skimage/segmentation/__init__[.]py$|
python/cucim/src/cucim/skimage/segmentation/__init__[.]pyi$|
python/cucim/src/cucim/skimage/segmentation/_chan_vese[.]py$|
python/cucim/src/cucim/skimage/segmentation/_clear_border[.]py$|
python/cucim/src/cucim/skimage/segmentation/_join[.]py$|
Expand Down
4 changes: 2 additions & 2 deletions conda/environments/all_cuda-129_arch-aarch64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@ dependencies:
- pytest-lazy-fixtures>=1.0.0
- pytest-xdist
- pytest>=7.0.0,<9.0.0
- python>=3.11,<3.14
- python>=3.11
- pywavelets>=1.6
- recommonmark
- scikit-image>=0.19.0,<0.26.0
- scikit-image>=0.23.2,<0.27.0
- scipy>=1.11.2
- sphinx>=8.0.0,<8.2.0
- sysroot_linux-aarch64==2.28
Expand Down
4 changes: 2 additions & 2 deletions conda/environments/all_cuda-129_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@ dependencies:
- pytest-lazy-fixtures>=1.0.0
- pytest-xdist
- pytest>=7.0.0,<9.0.0
- python>=3.11,<3.14
- python>=3.11
- pywavelets>=1.6
- recommonmark
- scikit-image>=0.19.0,<0.26.0
- scikit-image>=0.23.2,<0.27.0
- scipy>=1.11.2
- sphinx>=8.0.0,<8.2.0
- sysroot_linux-64==2.28
Expand Down
4 changes: 2 additions & 2 deletions conda/environments/all_cuda-131_arch-aarch64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@ dependencies:
- pytest-lazy-fixtures>=1.0.0
- pytest-xdist
- pytest>=7.0.0,<9.0.0
- python>=3.11,<3.14
- python>=3.11
- pywavelets>=1.6
- recommonmark
- scikit-image>=0.19.0,<0.26.0
- scikit-image>=0.23.2,<0.27.0
- scipy>=1.11.2
- sphinx>=8.0.0,<8.2.0
- sysroot_linux-aarch64==2.28
Expand Down
4 changes: 2 additions & 2 deletions conda/environments/all_cuda-131_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@ dependencies:
- pytest-lazy-fixtures>=1.0.0
- pytest-xdist
- pytest>=7.0.0,<9.0.0
- python>=3.11,<3.14
- python>=3.11
- pywavelets>=1.6
- recommonmark
- scikit-image>=0.19.0,<0.26.0
- scikit-image>=0.23.2,<0.27.0
- scipy>=1.11.2
- sphinx>=8.0.0,<8.2.0
- sysroot_linux-64==2.28
Expand Down
4 changes: 2 additions & 2 deletions conda/recipes/cucim/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ requirements:
- python
- pip
- rapids-build-backend >=0.4.0,<0.5.0
- scikit-image >=0.19.0,<0.25.0
- scikit-image >=0.23.2,<0.27.0
- scipy >=1.6
- setuptools >=80.9.0
run:
Expand All @@ -69,7 +69,7 @@ requirements:
- lazy_loader >=0.1
- libcucim ={{ version }}
- python
- scikit-image >=0.19.0,<0.25.0
- scikit-image >=0.23.2,<0.27.0
- scipy >=1.6
run_constrained:
- openslide-python >=1.3.0
Expand Down
8 changes: 6 additions & 2 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -222,8 +222,12 @@ dependencies:
packages:
- python=3.13
- matrix:
py: "3.14"
packages:
- python>=3.11,<3.14
- python=3.14
- matrix:
packages:
- python>=3.11
rapids_build_setuptools:
common:
- output_types: [conda, requirements, pyproject]
Expand All @@ -237,7 +241,7 @@ dependencies:
- click
- lazy-loader>=0.4
- numpy>=1.23.4,<3.0
- scikit-image>=0.19.0,<0.26.0
- scikit-image>=0.23.2,<0.27.0
- scipy>=1.11.2
- output_types: conda
packages:
Expand Down
2 changes: 1 addition & 1 deletion python/cucim/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ dependencies = [
"lazy-loader>=0.4",
"numpy>=1.23.4,<3.0",
"nvidia-nvimgcodec-cu13>=0.7.0,<0.8.0",
"scikit-image>=0.19.0,<0.26.0",
"scikit-image>=0.23.2,<0.27.0",
"scipy>=1.11.2",
] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.
classifiers = [
Expand Down
3 changes: 2 additions & 1 deletion python/cucim/src/cucim/skimage/_shared/compat.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# SPDX-FileCopyrightText: 2009-2022 the scikit-image team
# SPDX-FileCopyrightText: Copyright (c) 2024-2025, NVIDIA CORPORATION. All rights reserved.
# SPDX-FileCopyrightText: Copyright (c) 2024-2026, NVIDIA CORPORATION. All rights reserved.
# SPDX-License-Identifier: Apache-2.0 AND BSD-3-Clause

"""Compatibility helpers for dependencies."""
Expand Down Expand Up @@ -28,6 +28,7 @@
# check CuPy instead of SciPy
CUPY_LT_14 = parse(cp.__version__) < parse("14.0.0a1")


# Starting in SciPy v1.12, 'scipy.sparse.linalg.cg' keyword argument `tol` is
# deprecated in favor of `rtol`. The corresponding change in cupyx.scipy.sparse
# was made in v14.0
Expand Down
4 changes: 2 additions & 2 deletions python/cucim/src/cucim/skimage/_shared/coord.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# SPDX-FileCopyrightText: 2009-2022 the scikit-image team
# SPDX-FileCopyrightText: Copyright (c) 2021-2025, NVIDIA CORPORATION. All rights reserved.
# SPDX-FileCopyrightText: Copyright (c) 2021-2026, NVIDIA CORPORATION. All rights reserved.
# SPDX-License-Identifier: Apache-2.0 AND BSD-3-Clause

import cupy as cp
Expand All @@ -22,7 +22,7 @@ def _ensure_spacing(coord, spacing, p_norm, max_out):
A finite large p may cause a ValueError if overflow can occur.
``inf`` corresponds to the Chebyshev distance and 2 to the
Euclidean distance.
max_out: int
max_out : int
If not None, at most the first ``max_out`` candidates are
returned.

Expand Down
Loading
Loading