Remove old async octree

.github/workflows/test_comprehensive.yml

@@ -54,10 +54,6 @@ jobs:
             platform: ubuntu-20.04
             backend: pyqt5
             MIN_REQ: 1
-          # test with --async_only
-          - python: 3.8
-            platform: ubuntu-20.04
-            toxenv: async-py38-linux-pyqt5
           # test without any Qt backends
           - python: 3.8
             platform: ubuntu-20.04

.github/workflows/test_pull_requests.yml

@@ -79,10 +79,6 @@ jobs:
             platform: ubuntu-20.04
             backend: pyqt5
             MIN_REQ: 1
-          # test with --async_only
-          - python: 3.8
-            platform: ubuntu-20.04
-            toxenv: async-pyqt5-py38-linux
           # test without any Qt backends
           - python: 3.8
             platform: ubuntu-20.04

napari/_qt/_qapp_model/qactions/_view.py

@@ -17,8 +17,6 @@
 
 from napari._app_model.constants import CommandId, MenuGroup, MenuId
 from napari._qt.qt_main_window import Window
-from napari._qt.qt_viewer import QtViewer
-from napari.settings import get_settings
 from napari.utils.translations import trans
 
 
@@ -79,22 +77,6 @@ def _get_current_activity_dock(window: Window):
         callback=Window._toggle_play,
         keybindings=[{'primary': KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.KeyP}],
     ),
-    Action(
-        id=CommandId.TOGGLE_OCTREE_CHUNK_OUTLINES,
-        title=CommandId.TOGGLE_OCTREE_CHUNK_OUTLINES.title,
-        menus=[
-            {
-                'id': MenuId.MENUBAR_VIEW,
-                'group': MenuGroup.RENDER,
-                'order': 1,
-                'when': get_settings().experimental.octree,
-            }
-        ],
-        callback=QtViewer._toggle_chunk_outlines,
-        enablement=get_settings().experimental.octree,
-        # this used to have a keybinding of Ctrl+Alt+O, but that conflicts with
-        # Open files as stack
-    ),
     Action(
         id=CommandId.TOGGLE_ACTIVITY_DOCK,
         title=CommandId.TOGGLE_ACTIVITY_DOCK.title,

napari/_qt/_tests/test_async_slicing.py

@@ -10,16 +10,13 @@
 
 # The tests in this module for the new style of async slicing in napari:
 # https://napari.org/dev/naps/4-async-slicing.html
-# They are marked with sync_only because that denotes that the old experimental
-# async should not run as we don't explicitly wait for its threads to finish.
 
 
 @pytest.fixture()
 def rng() -> np.random.Generator:
     return np.random.default_rng(0)
 
 
-@pytest.mark.sync_only
 def test_async_slice_image_on_current_step_change(
     make_napari_viewer, qtbot, rng
 ):
@@ -33,7 +30,6 @@ def test_async_slice_image_on_current_step_change(
     wait_until_vispy_image_data_equal(qtbot, vispy_image, data[2, :, :])
 
 
-@pytest.mark.sync_only
 def test_async_slice_image_on_order_change(make_napari_viewer, qtbot, rng):
     viewer = make_napari_viewer()
     data = rng.random((3, 4, 5))
@@ -45,7 +41,6 @@ def test_async_slice_image_on_order_change(make_napari_viewer, qtbot, rng):
     wait_until_vispy_image_data_equal(qtbot, vispy_image, data[:, 2, :])
 
 
-@pytest.mark.sync_only
 def test_async_slice_image_on_ndisplay_change(make_napari_viewer, qtbot, rng):
     viewer = make_napari_viewer()
     data = rng.random((3, 4, 5))
@@ -57,7 +52,6 @@ def test_async_slice_image_on_ndisplay_change(make_napari_viewer, qtbot, rng):
     wait_until_vispy_image_data_equal(qtbot, vispy_image, data)
 
 
-@pytest.mark.sync_only
 def test_async_slice_multiscale_image_on_pan(make_napari_viewer, qtbot, rng):
     viewer = make_napari_viewer()
     data = [rng.random((4, 8, 10)), rng.random((2, 4, 5))]
@@ -79,7 +73,6 @@ def test_async_slice_multiscale_image_on_pan(make_napari_viewer, qtbot, rng):
     wait_until_vispy_image_data_equal(qtbot, vispy_image, data[1][1, 0:4, 0:3])
 
 
-@pytest.mark.sync_only
 def test_async_slice_multiscale_image_on_zoom(qtbot, make_napari_viewer, rng):
     viewer = make_napari_viewer()
     data = [rng.random((4, 8, 10)), rng.random((2, 4, 5))]

napari/_qt/_tests/test_qt_notifications.py

@@ -267,7 +267,6 @@ def test_notification_error(count_show, monkeypatch):
 
 
 @skip_on_win_ci
-@pytest.mark.sync_only
 def test_notifications_error_with_threading(
     make_napari_viewer, clean_current, monkeypatch
 ):

napari/_qt/dialogs/preferences_dialog.py

@@ -127,25 +127,6 @@ def _add_page(self, field: 'ModelField'):
             lambda d: getattr(self._settings, name.lower()).update(d)
         )
 
-        # need to disable async if octree is enabled.
-        # TODO: this shouldn't live here... if there is a coupling/dependency
-        # between these settings, it should be declared in the settings schema
-        if (
-            name.lower() == 'experimental'
-            and values['octree']
-            and self._settings.env_settings()
-            .get('experimental', {})
-            .get('async_')
-            not in (None, '0')
-        ):
-            form_layout = form.widget.layout()
-            for i in range(form_layout.count()):
-                wdg = form_layout.itemAt(i, form_layout.FieldRole).widget()
-                if wdg._name == 'async_':
-                    wdg.opacity.setOpacity(0.3)
-                    wdg.setDisabled(True)
-                    break
-
         self._list.addItem(field.field_info.title or field.name)
         self._stack.addWidget(form)
 

napari/_qt/layer_controls/qt_layer_controls_container.py

@@ -16,7 +16,6 @@
     Tracks,
     Vectors,
 )
-from napari.utils import config
 from napari.utils.translations import trans
 
 layer_to_controls = {
@@ -29,13 +28,6 @@
     Tracks: QtTracksControls,
 }
 
-if config.async_loading:
-    from napari.layers.image.experimental.octree_image import _OctreeImageBase
-
-    # The user visible layer controls for OctreeImage layers are identical
-    # to the regular image layer controls, for now.
-    layer_to_controls[_OctreeImageBase] = QtImageControls
-
 
 def create_qt_layer_controls(layer):
     """

napari/_qt/qt_event_loop.py

@@ -251,12 +251,6 @@ def quit_app():
 
         monitor.stop()
 
-    if config.async_loading:
-        # Shutdown the chunkloader
-        from napari.components.experimental.chunk import chunk_loader
-
-        chunk_loader.shutdown()
-
 
 @contextmanager
 def gui_qt(*, startup_logo=False, gui_exceptions=False, force=False):

napari/_qt/qt_viewer.py

@@ -278,18 +278,7 @@ def __init__(
             self.viewer.layers, self._qt_poll
         )
 
-        # moved from the old layerlist... still feels misplaced.
-        # can you help me move this elsewhere?
-        if config.async_loading:
-            from napari._qt.experimental.qt_chunk_receiver import (
-                QtChunkReceiver,
-            )
-
-            # The QtChunkReceiver object allows the ChunkLoader to pass newly
-            # loaded chunks to the layers that requested them.
-            self.chunk_receiver = QtChunkReceiver(self.layers)
-        else:
-            self.chunk_receiver = None
+        self.chunk_receiver = None
 
         # bind shortcuts stored in settings last.
         self._bind_shortcuts()
@@ -306,6 +295,16 @@ def __init__(
         for overlay in self.viewer._overlays.values():
             self._add_overlay(overlay)
 
+    def chunk_receiver(self) -> None:
+        warnings.warn(
+            trans._(
+                'QtViewer.chunk_receiver is deprecated from napari version 0.5 and will be removed in a later version.'
+            ),
+            DeprecationWarning,
+            stacklevel=1,
+        )
+        return
+
     @staticmethod
     def _update_dask_cache_settings(
         dask_setting: Union[DaskSettings, Event] = None
@@ -527,13 +526,17 @@ def console(self, console):
 
     @ensure_main_thread
     def _on_slice_ready(self, event):
+        """Callback connected to `viewer._layer_slicer.events.ready`. Provides
+        updates after slicing using the slice response data.
+        This only gets triggered on async path."""
         responses = event.value
         for layer, response in responses.items():
             # Update the layer slice state to temporarily support behavior
             # that depends on it.
             layer._update_slice_response(response)
-            # The rest of `Layer.refresh` after `set_view_slice`, where `set_data`
-            # notifies the corresponding vispy layer of the new slice.
+            # The rest of `Layer.refresh` after `set_view_slice`, where
+            # `set_data` notifies the corresponding vispy layer of the new
+            # slice.
             layer.events.set_data()
             layer._update_thumbnail()
             layer._set_highlight(force=True)
@@ -1269,11 +1272,7 @@ def closeEvent(self, event):
 def _create_qt_poll(parent: QObject, camera: Camera) -> Optional[QtPoll]:
     """Create and return a QtPoll instance, if needed.
 
-    Create a QtPoll instance for octree or monitor.
-
-    Octree needs QtPoll so VispyTiledImageLayer can finish in-progress
-    loads even if the camera is not moving. Once loading is finish it will
-    tell QtPoll it no longer needs to be polled.
+    Create a QtPoll instance for monitor.
 
     Monitor needs QtPoll to poll for incoming messages. This might be
     temporary until we can process incoming messages with a dedicated
@@ -1291,7 +1290,7 @@ def _create_qt_poll(parent: QObject, camera: Camera) -> Optional[QtPoll]:
     Optional[QtPoll]
         The new QtPoll instance, if we need one.
     """
-    if not config.async_octree and not config.monitor:
+    if not config.monitor:
         return None
 
     from napari._qt.experimental.qt_poll import QtPoll

napari/_tests/test_magicgui.py

@@ -119,7 +119,6 @@ def _assert_stuff():
     _assert_stuff()
 
 
-@pytest.mark.sync_only
 def test_magicgui_add_threadworker(qtbot, make_napari_viewer):
     """Test that annotating with FunctionWorker works."""
     from napari.qt.threading import FunctionWorker, thread_worker

napari/_tests/test_viewer.py

@@ -214,9 +214,6 @@ def test_changing_theme(make_napari_viewer):
         viewer.theme = 'nonexistent_theme'
 
 
-# TODO: revisit the need for sync_only here.
-# An async failure was observed here on CI, but was not reproduced locally
-@pytest.mark.sync_only
 @pytest.mark.parametrize('layer_class, data, ndim', layer_test_data)
 def test_roll_transpose_update(make_napari_viewer, layer_class, data, ndim):
     """Check that transpose and roll preserve correct transform sequence."""