Skip to content

Commit 7efddfc

Browse files
adamltysonpre-commit-ci[bot]willGraham01
authored
Fix tests (#170)
* Remove unnecessary pytest options * Update dependency imports * Add test for get_available_atlases * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Update tests/tests/test_unit/test_plugin/test_register.py Co-authored-by: Will Graham <[email protected]> * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Will Graham <[email protected]>
1 parent 6391f81 commit 7efddfc

File tree

4 files changed

+36
-17
lines changed

4 files changed

+36
-17
lines changed

brainreg/napari/register.py

+16-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,10 @@
99
import napari
1010
import numpy as np
1111
from bg_atlasapi import BrainGlobeAtlas
12-
from brainglobe_napari_io.cellfinder.reader_dir import load_registration
13-
from brainglobe_segmentation.atlas.utils import get_available_atlases
12+
from bg_atlasapi.list_atlases import descriptors, utils
13+
from brainglobe_napari_io.workflows.wholebrain_cell_reader_dir import (
14+
load_registration,
15+
)
1416
from fancylog import fancylog
1517
from magicgui import magicgui
1618
from napari._qt.qthreading import thread_worker
@@ -32,6 +34,18 @@
3234
PRE_PROCESSING_ARGS = None
3335

3436

37+
def get_available_atlases():
38+
"""
39+
Get the available brainglobe atlases
40+
:return: Dict of available atlases (["name":version])
41+
"""
42+
available_atlases = utils.conf_from_url(
43+
descriptors.remote_url_base.format("last_versions.conf")
44+
)
45+
available_atlases = dict(available_atlases["atlases"])
46+
return available_atlases
47+
48+
3549
def add_registered_image_layers(
3650
viewer: napari.Viewer, *, registration_directory: pathlib.Path
3751
) -> Tuple[napari.layers.Image, napari.layers.Labels]:

pyproject.toml

-15
Original file line numberDiff line numberDiff line change
@@ -85,21 +85,6 @@ include = ["brainreg*"]
8585

8686
[tool.pytest.ini_options]
8787
addopts = "--cov=brainreg"
88-
filterwarnings = [
89-
"error",
90-
# Emitted by scikit-image on import, see https://github.com/scikit-image/scikit-image/issues/6663
91-
# This filter should be removed when scikit-image 0.20 is released
92-
"ignore:`np.bool8` is a deprecated alias for `np.bool_`",
93-
# Emitted by nptyping, see https://github.com/ramonhagenaars/nptyping/issues/102
94-
# for upstream issue
95-
"ignore:`np.object0` is a deprecated alias for ``np.object0`",
96-
"ignore:`np.int0` is a deprecated alias for `np.intp`",
97-
"ignore:`np.uint0` is a deprecated alias for `np.uintp`",
98-
"ignore:`np.void0` is a deprecated alias for `np.void`",
99-
"ignore:`np.bytes0` is a deprecated alias for `np.bytes_`",
100-
"ignore:`np.str0` is a deprecated alias for `np.str_`",
101-
]
102-
markers = ["slow: marks tests as slow (deselect with '-m \"not slow\"')"]
10388

10489
[tool.black]
10590
line-length = 79

tests/tests/test_unit/test_plugin/__init__.py

Whitespace-only changes.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
from brainreg.napari.register import get_available_atlases
2+
3+
atlas_name = "allen_mouse_50um"
4+
5+
6+
def test_get_available_atlases():
7+
atlases = get_available_atlases()
8+
9+
# arbitrary selection of atlases
10+
expected_atlases = [
11+
"allen_mouse_10um",
12+
"allen_mouse_25um",
13+
"allen_mouse_50um",
14+
"mpin_zfish_1um",
15+
]
16+
17+
for a in expected_atlases:
18+
assert (
19+
a in atlases.keys()
20+
), f"{a} is not in the list of expected atlases"

0 commit comments

Comments
 (0)