From d41f4c5100a7ecb736c065a388a39382e386b80c Mon Sep 17 00:00:00 2001 From: Talon Chandler Date: Tue, 7 Jan 2025 15:13:28 -0800 Subject: [PATCH 1/4] try skipping napari launch --- recOrder/tests/widget_tests/test_dock_widget.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/recOrder/tests/widget_tests/test_dock_widget.py b/recOrder/tests/widget_tests/test_dock_widget.py index 5dacda10..df78b3c0 100644 --- a/recOrder/tests/widget_tests/test_dock_widget.py +++ b/recOrder/tests/widget_tests/test_dock_widget.py @@ -3,7 +3,7 @@ from recOrder.plugin.main_widget import MainWidget -def test_dock_widget(make_napari_viewer): - viewer: ViewerModel = make_napari_viewer() - viewer.window.add_dock_widget(MainWidget(viewer)) - assert "recOrder" in list(viewer._window._dock_widgets.keys())[0] +# def test_dock_widget(make_napari_viewer): +# viewer: ViewerModel = make_napari_viewer() +# viewer.window.add_dock_widget(MainWidget(viewer)) +# assert "recOrder" in list(viewer._window._dock_widgets.keys())[0] From 358d51442bd376be662e825b8bc986992eb231b2 Mon Sep 17 00:00:00 2001 From: Talon Chandler Date: Tue, 7 Jan 2025 15:26:34 -0800 Subject: [PATCH 2/4] try removal of cli/main.py as script --- recOrder/cli/main.py | 3 --- recOrder/tests/widget_tests/test_dock_widget.py | 8 ++++---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/recOrder/cli/main.py b/recOrder/cli/main.py index b1b7a32b..4ab56973 100644 --- a/recOrder/cli/main.py +++ b/recOrder/cli/main.py @@ -24,6 +24,3 @@ def cli(): cli.add_command(compute_tf) cli.add_command(apply_inv_tf) cli.add_command(gui) - -if __name__ == '__main__': - cli() \ No newline at end of file diff --git a/recOrder/tests/widget_tests/test_dock_widget.py b/recOrder/tests/widget_tests/test_dock_widget.py index df78b3c0..5dacda10 100644 --- a/recOrder/tests/widget_tests/test_dock_widget.py +++ b/recOrder/tests/widget_tests/test_dock_widget.py @@ -3,7 +3,7 @@ from recOrder.plugin.main_widget import MainWidget -# def test_dock_widget(make_napari_viewer): -# viewer: ViewerModel = make_napari_viewer() -# viewer.window.add_dock_widget(MainWidget(viewer)) -# assert "recOrder" in list(viewer._window._dock_widgets.keys())[0] +def test_dock_widget(make_napari_viewer): + viewer: ViewerModel = make_napari_viewer() + viewer.window.add_dock_widget(MainWidget(viewer)) + assert "recOrder" in list(viewer._window._dock_widgets.keys())[0] From e0e271537c1739900043eef832cec04968986b06 Mon Sep 17 00:00:00 2001 From: Talon Chandler Date: Tue, 7 Jan 2025 15:33:58 -0800 Subject: [PATCH 3/4] try removal of tab_recon.py as script --- recOrder/cli/main.py | 3 +++ recOrder/plugin/tab_recon.py | 8 -------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/recOrder/cli/main.py b/recOrder/cli/main.py index 4ab56973..4758606a 100644 --- a/recOrder/cli/main.py +++ b/recOrder/cli/main.py @@ -24,3 +24,6 @@ def cli(): cli.add_command(compute_tf) cli.add_command(apply_inv_tf) cli.add_command(gui) + +if __name__ == "__main__": + cli() diff --git a/recOrder/plugin/tab_recon.py b/recOrder/plugin/tab_recon.py index b254fd3e..3b737575 100644 --- a/recOrder/plugin/tab_recon.py +++ b/recOrder/plugin/tab_recon.py @@ -3103,11 +3103,3 @@ def setContentLayout(self, layout): content_animation.setDuration(500) content_animation.setStartValue(0) content_animation.setEndValue(content_height) - - -# VScode debugging -if __name__ == "__main__": - import napari - - napari.Viewer() - napari.run() \ No newline at end of file From 9b71e1958d6f833494a6ea8712e0bb405b06486d Mon Sep 17 00:00:00 2001 From: Talon Chandler Date: Tue, 7 Jan 2025 15:41:32 -0800 Subject: [PATCH 4/4] revert tab_recon test, confirm that HEAD fails --- recOrder/plugin/tab_recon.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/recOrder/plugin/tab_recon.py b/recOrder/plugin/tab_recon.py index 3b737575..b254fd3e 100644 --- a/recOrder/plugin/tab_recon.py +++ b/recOrder/plugin/tab_recon.py @@ -3103,3 +3103,11 @@ def setContentLayout(self, layout): content_animation.setDuration(500) content_animation.setStartValue(0) content_animation.setEndValue(content_height) + + +# VScode debugging +if __name__ == "__main__": + import napari + + napari.Viewer() + napari.run() \ No newline at end of file