Skip to content

Commit cd96bf0

Browse files
dalthvizjniCzaki
authored
Use get_app_model instead of get_app for napari>=0.5.4 (#103)
Co-authored-by: Juan Nunez-Iglesias <[email protected]> Co-authored-by: Grzegorz Bokota <[email protected]>
1 parent 9627d14 commit cd96bf0

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

midi_app_controller/actions/_tests/test_napari_actions.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
from napari.layers import Image
55
from napari.layers.labels import Labels
66
from napari.layers.labels._labels_constants import Mode
7-
from napari.viewer import Viewer
87

98
from ..napari_actions import (
109
activate_labels_mode,
@@ -121,8 +120,8 @@ def test_selected_label():
121120
assert other_layer.selected_label == 5
122121

123122

124-
def test_zoom_and_dimensions():
125-
viewer = Viewer()
123+
def test_zoom_and_dimensions(make_napari_viewer):
124+
viewer = make_napari_viewer()
126125
zoom = viewer.camera.zoom
127126

128127
zoom_out(viewer)

midi_app_controller/state/state_manager.py

+8-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,18 @@
1+
from importlib.metadata import version
12
from pathlib import Path
23
from typing import NamedTuple, Optional
34

45
import rtmidi
56
from app_model import Application
67
from app_model.registries import MenusRegistry
78
from app_model.types import CommandRule, MenuItem
9+
from packaging.version import parse as parse_version
810

911
# TODO: This will be made public in some future napari version
10-
from napari._app_model import get_app
12+
if parse_version(version("napari")) >= parse_version("0.5.4"):
13+
from napari._app_model import get_app_model
14+
else:
15+
from napari._app_model import get_app as get_app_model
1116

1217
from midi_app_controller.actions.actions_handler import ActionsHandler
1318
from midi_app_controller.actions.bound_controller import BoundController
@@ -364,7 +369,7 @@ def get_state_manager() -> StateManager:
364369
"""Returns the `StateManager` singleton."""
365370
global _STATE_MANAGER
366371
if _STATE_MANAGER is None:
367-
register_custom_napari_actions(get_app())
368-
_STATE_MANAGER = StateManager(get_app())
372+
register_custom_napari_actions(get_app_model())
373+
_STATE_MANAGER = StateManager(get_app_model())
369374
_STATE_MANAGER.load_state()
370375
return _STATE_MANAGER

0 commit comments

Comments
 (0)