From 4bfbb0e8901b58648679d60ad0166a6ba10180e0 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Tue, 2 Apr 2024 14:44:49 -0700 Subject: [PATCH] Require `click` as a wheel dependency Trying to `import cucim` results in `import click`, which fails if `click` is not installed. This was encountered recently by a user that tested out the cuCIM wheel packages. The Conda packages already solve this by adding `click` to `requirements/run`. So this makes an equivalent change to the wheel packages. Should fix user install issues. --- dependencies.yaml | 3 +-- python/cucim/pyproject.toml | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index 28a7854db..703cb70a3 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -244,6 +244,7 @@ dependencies: common: - output_types: [conda, requirements, pyproject] packages: + - click - lazy_loader>=0.1 - numpy>=1.23.4,<2.0a0 - scikit-image>=0.19.0,<0.23.0a0 @@ -257,7 +258,6 @@ dependencies: # possible to run `pip install .` from the python/cucim folder # without having build the C++ library at all. This allows, usage of # usage of `cucim.skimage` on Windows, for example. - - click - jbig - libwebp-base - xz @@ -297,7 +297,6 @@ dependencies: - openslide-python>=1.3.0; platform_machine=='x86_64' - matplotlib - opencv-python-headless>=4.6 - - click - output_types: [pyproject] packages: # Already added to requirements via docs. This is for tests. diff --git a/python/cucim/pyproject.toml b/python/cucim/pyproject.toml index 66e3a2d48..433afc0a5 100644 --- a/python/cucim/pyproject.toml +++ b/python/cucim/pyproject.toml @@ -24,6 +24,7 @@ authors = [ license = { text = "Apache 2.0" } requires-python = ">=3.9" dependencies = [ + "click", "cupy-cuda11x>=12.0.0", "lazy_loader>=0.1", "numpy>=1.23.4,<2.0a0", @@ -57,7 +58,6 @@ Tracker = "https://github.com/rapidsai/cucim/issues" [project.optional-dependencies] test = [ "GPUtil>=1.4.0", - "click", "imagecodecs>=2021.6.8; platform_machine=='x86_64'", "matplotlib", "numpydoc>=1.5",