File tree 2 files changed +10
-6
lines changed
2 files changed +10
-6
lines changed Original file line number Diff line number Diff line change 4
4
from napari .layers import Image
5
5
from napari .layers .labels import Labels
6
6
from napari .layers .labels ._labels_constants import Mode
7
- from napari .viewer import Viewer
8
7
9
8
from ..napari_actions import (
10
9
activate_labels_mode ,
@@ -121,8 +120,8 @@ def test_selected_label():
121
120
assert other_layer .selected_label == 5
122
121
123
122
124
- def test_zoom_and_dimensions ():
125
- viewer = Viewer ()
123
+ def test_zoom_and_dimensions (make_napari_viewer ):
124
+ viewer = make_napari_viewer ()
126
125
zoom = viewer .camera .zoom
127
126
128
127
zoom_out (viewer )
Original file line number Diff line number Diff line change
1
+ from importlib .metadata import version
1
2
from pathlib import Path
2
3
from typing import NamedTuple , Optional
3
4
4
5
import rtmidi
5
6
from app_model import Application
6
7
from app_model .registries import MenusRegistry
7
8
from app_model .types import CommandRule , MenuItem
9
+ from packaging .version import parse as parse_version
8
10
9
11
# 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
11
16
12
17
from midi_app_controller .actions .actions_handler import ActionsHandler
13
18
from midi_app_controller .actions .bound_controller import BoundController
@@ -364,7 +369,7 @@ def get_state_manager() -> StateManager:
364
369
"""Returns the `StateManager` singleton."""
365
370
global _STATE_MANAGER
366
371
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 ())
369
374
_STATE_MANAGER .load_state ()
370
375
return _STATE_MANAGER
You can’t perform that action at this time.
0 commit comments