Skip to content

Commit 91eec0d

Browse files
authored
Merge pull request #472 from bioimage-io/dev
add careamics dev dep and quiet conda output in CI
2 parents 310bf70 + 440f0b0 commit 91eec0d

File tree

2 files changed

+16
-4
lines changed

2 files changed

+16
-4
lines changed

pyproject.toml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,15 @@ onnx = ["onnxruntime"]
4444
pytorch = ["torch>=1.6,<3", "torchvision>=0.21", "keras>=3.0,<4"]
4545
tensorflow = ["tensorflow", "keras>=2.15,<4"]
4646
dev = [
47-
"cellpose", # for model testing
47+
# "biapy", # pins core exactly
48+
"careamics",
49+
"cellpose", # for model testing
4850
"crick",
4951
"httpx",
5052
"jupyter",
5153
"keras>=3.0,<4",
5254
"matplotlib",
53-
"monai", # for model testing
55+
"monai", # for model testing
5456
"numpy",
5557
"onnx",
5658
"onnxruntime",
@@ -61,7 +63,8 @@ dev = [
6163
"pytest-cov",
6264
"pytest",
6365
"python-dotenv",
64-
"segment-anything", # for model testing
66+
"segment-anything", # for model testing
67+
# "stardist", # for model testing and stardist postprocessing # TODO: add updated stardist to dev env
6568
"tensorflow",
6669
"timm", # for model testing
6770
"torch>=1.6,<3",

src/bioimageio/core/_resource_tests.py

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@
6969
from bioimageio.core.io import save_tensor
7070

7171
from ._prediction_pipeline import create_prediction_pipeline
72+
from ._settings import settings
7273
from .axis import AxisId, BatchSize
7374
from .common import MemberId, SupportedWeightsFormat
7475
from .digest_spec import get_test_input_sample, get_test_output_sample
@@ -394,7 +395,15 @@ def _test_in_env(
394395
_ = path.write_bytes(encoded_env)
395396
logger.debug("written conda env to {}", path)
396397
run_command(
397-
[CONDA_CMD, "env", "create", f"--file={path}", f"--name={env_name}"]
398+
[
399+
CONDA_CMD,
400+
"env",
401+
"create",
402+
"--yes",
403+
f"--file={path}",
404+
f"--name={env_name}",
405+
]
406+
+ (["--quiet"] if settings.CI else [])
398407
)
399408
run_command([CONDA_CMD, "activate", env_name])
400409
except Exception as e:

0 commit comments

Comments
 (0)