From 419cc411b7a7ae15a1f028b095e6a05214e3b1c0 Mon Sep 17 00:00:00 2001 From: Joel Collins Date: Sat, 28 Dec 2019 18:53:10 +0000 Subject: [PATCH] Move new default plugins to API submodule --- .../{plugins/v2 => api/default_plugins}/__init__.py | 0 .../{plugins/v2 => api/default_plugins}/autofocus.py | 0 .../{plugins/v2 => api/default_plugins}/scan.py | 0 openflexure_microscope/api/utilities.py | 8 +++++--- 4 files changed, 5 insertions(+), 3 deletions(-) rename openflexure_microscope/{plugins/v2 => api/default_plugins}/__init__.py (100%) rename openflexure_microscope/{plugins/v2 => api/default_plugins}/autofocus.py (100%) rename openflexure_microscope/{plugins/v2 => api/default_plugins}/scan.py (100%) diff --git a/openflexure_microscope/plugins/v2/__init__.py b/openflexure_microscope/api/default_plugins/__init__.py similarity index 100% rename from openflexure_microscope/plugins/v2/__init__.py rename to openflexure_microscope/api/default_plugins/__init__.py diff --git a/openflexure_microscope/plugins/v2/autofocus.py b/openflexure_microscope/api/default_plugins/autofocus.py similarity index 100% rename from openflexure_microscope/plugins/v2/autofocus.py rename to openflexure_microscope/api/default_plugins/autofocus.py diff --git a/openflexure_microscope/plugins/v2/scan.py b/openflexure_microscope/api/default_plugins/scan.py similarity index 100% rename from openflexure_microscope/plugins/v2/scan.py rename to openflexure_microscope/api/default_plugins/scan.py diff --git a/openflexure_microscope/api/utilities.py b/openflexure_microscope/api/utilities.py index 2045ba0f..d70b5130 100644 --- a/openflexure_microscope/api/utilities.py +++ b/openflexure_microscope/api/utilities.py @@ -121,7 +121,9 @@ def init_default_plugins(plugin_path): outfile.write(_DEFAULT_PLUGIN_INIT) -_DEFAULT_PLUGIN_INIT = """from openflexure_microscope.plugins.v2.autofocus import autofocus_plugin_v2 -from openflexure_microscope.plugins.v2.scan import scan_plugin_v2 +_DEFAULT_PLUGIN_INIT = """ +from openflexure_microscope.api.default_plugins.autofocus import autofocus_plugin_v2 +from openflexure_microscope.api.default_plugins.scan import scan_plugin_v2 -__plugins__ = [autofocus_plugin_v2, scan_plugin_v2]""" +__plugins__ = [autofocus_plugin_v2, scan_plugin_v2] +"""