Skip to content

Commit

Permalink
remove fibsem dependency (#363)
Browse files Browse the repository at this point in the history
I think this is holding us back. Perhaps we can add
MissingAnnotationsMaskConfig again in the future
  • Loading branch information
mzouink authored Feb 18, 2025
2 parents 8c5ae81 + f5b4206 commit 2e149b2
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 10 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

from typing import List, Tuple
from funlib.persistence import Array
from fibsem_tools.metadata.groundtruth import LabelList
from cellmap_schemas.annotation import LabelList

import dask.array as da

Expand Down
10 changes: 5 additions & 5 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ dependencies = [
"lazy-property",
"neuroglancer",
"torch",
"fibsem_tools >= 6.0, <=6.3",
"attrs",
"bokeh",
"numpy-indexed>=0.3.7",
Expand All @@ -56,9 +55,11 @@ dependencies = [
"pyyaml",
"scipy",
"upath",
"boto3",
"boto3==1.35.81",
"matplotlib",
"funlib.persistence @ git+https://github.com/funkelab/funlib.persistence.git@ome-ngff"
"cellmap-schemas",
"funlib.persistence @ git+https://github.com/funkelab/funlib.persistence.git@ome-ngff",
"xarray-multiscale",
]

# extras
Expand Down Expand Up @@ -182,7 +183,6 @@ module = [
"daisy.*",
"lazy_property.*",
"skimage.*",
"fibsem_tools.*",
"neuroglancer.*",
"tqdm.*",
"zarr.*",
Expand All @@ -201,7 +201,7 @@ module = [
"napari.*",
"empanada.*",
"IPython.*",
"xarray_multiscale.*"
"cellmap_schemas.*",
]
ignore_missing_imports = true

Expand Down
19 changes: 15 additions & 4 deletions tests/operations/test_array.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,21 @@
def test_array(array_config):
array = array_config.array()

assert array.offset == (12, 12, 12), f"offset is not correct, expected (12, 12, 12), got {array.offset}"
assert array.voxel_size == (1, 2, 4), f"resolution is not correct, expected (1, 2, 4), got {array.voxel_size}"
assert array.axis_names == ["z", "y", "x"], f"axis names are not correct, expected ['z', 'y', 'x'], got {array.axis_names}"
assert array.offset == (
12,
12,
12,
), f"offset is not correct, expected (12, 12, 12), got {array.offset}"
assert array.voxel_size == (
1,
2,
4,
), f"resolution is not correct, expected (1, 2, 4), got {array.voxel_size}"
assert array.axis_names == [
"z",
"y",
"x",
], f"axis names are not correct, expected ['z', 'y', 'x'], got {array.axis_names}"

# offset = array.attrs["offset"]
# resolution = array.attrs["resolution"]

0 comments on commit 2e149b2

Please sign in to comment.