Skip to content

Commit a6cbf75

Browse files
committed
split off partner deps into own extra
avoids dep conflicts to run tests during local conda build, because then dev extras do not depend on core themselves
1 parent d07aa1d commit a6cbf75

File tree

3 files changed

+11
-9
lines changed

3 files changed

+11
-9
lines changed

.github/workflows/build.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ jobs:
8282
- name: Install dependencies
8383
run: |
8484
pip install --upgrade pip
85-
pip install -e .[dev] numpy==${{matrix.numpy-version}}.*
85+
pip install -e .[dev,partners] numpy==${{matrix.numpy-version}}.*
8686
- name: Pyright
8787
if: matrix.run-expensive-tests # pyright is not expensive, but we only want to run it once due to otherwise inconsistent typing
8888
run: |
@@ -165,7 +165,7 @@ jobs:
165165
with:
166166
python-version: '3.12'
167167
cache: 'pip'
168-
- run: pip install -e .[dev]
168+
- run: pip install -e .[dev,partners]
169169
- name: Generate developer docs
170170
run: ./scripts/pdoc/run.sh
171171
- run: cp README.md ./dist/README.md

pyproject.toml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,16 +43,19 @@ Source = "https://github.com/bioimage-io/core-bioimage-io-python"
4343
onnx = ["onnxruntime"]
4444
pytorch = ["torch>=1.6,<3", "torchvision>=0.21", "keras>=3.0,<4"]
4545
tensorflow = ["tensorflow", "keras>=2.15,<4"]
46-
dev = [
46+
partners = [
4747
# "biapy", # pins core exactly
4848
"careamics",
49-
"cellpose", # for model testing
49+
# "stardist", # for model testing and stardist postprocessing # TODO: add updated stardist to partners env
50+
]
51+
dev = [
52+
"cellpose", # for model testing
5053
"crick",
5154
"httpx",
5255
"jupyter",
5356
"keras>=3.0,<4",
5457
"matplotlib",
55-
"monai", # for model testing
58+
"monai", # for model testing
5659
"numpy",
5760
"onnx",
5861
"onnxruntime",
@@ -63,8 +66,7 @@ dev = [
6366
"pytest-cov",
6467
"pytest",
6568
"python-dotenv",
66-
"segment-anything", # for model testing
67-
# "stardist", # for model testing and stardist postprocessing # TODO: add updated stardist to dev env
69+
"segment-anything", # for model testing
6870
"tensorflow",
6971
"timm", # for model testing
7072
"torch>=1.6,<3",

tests/test_bioimageio_collection.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,8 @@ def depends_on(dep: str) -> bool:
101101

102102
for skip_if_depends_on in (
103103
"biapy",
104-
"git+https://github.com/CAREamics/careamics.git",
105-
"careamics",
104+
"git+https://github.com/CAREamics/careamics.git", # TODO: include tests depending on careamics
105+
"careamics", # TODO: include tests depending on careamics
106106
"inferno",
107107
"plantseg",
108108
):

0 commit comments

Comments
 (0)