diff --git a/src/ert/gui/tools/plot/plot_api.py b/src/ert/gui/plot_api.py similarity index 100% rename from src/ert/gui/tools/plot/plot_api.py rename to src/ert/gui/plot_api.py diff --git a/src/ert/gui/plottery/plot_config_factory.py b/src/ert/gui/plottery/plot_config_factory.py index 34d988646c6..e64220c067a 100644 --- a/src/ert/gui/plottery/plot_config_factory.py +++ b/src/ert/gui/plottery/plot_config_factory.py @@ -5,7 +5,7 @@ from ert.gui.plottery import PlotConfig if TYPE_CHECKING: - from ert.gui.tools.plot.plot_api import PlotApiKeyDefinition + from ert.gui.plot_api import PlotApiKeyDefinition class PlotConfigFactory: diff --git a/src/ert/gui/plottery/plot_context.py b/src/ert/gui/plottery/plot_context.py index e92a2f47918..fa746b89ebe 100644 --- a/src/ert/gui/plottery/plot_context.py +++ b/src/ert/gui/plottery/plot_context.py @@ -5,8 +5,8 @@ if TYPE_CHECKING: from pandas import DataFrame + from ert.gui.plot_api import EnsembleObject from ert.gui.plottery import PlotConfig - from ert.gui.tools.plot.plot_api import EnsembleObject class PlotContext: diff --git a/src/ert/gui/plottery/plots/cesp.py b/src/ert/gui/plottery/plots/cesp.py index bc673ea890d..708b6ff6112 100644 --- a/src/ert/gui/plottery/plots/cesp.py +++ b/src/ert/gui/plottery/plots/cesp.py @@ -7,7 +7,7 @@ from matplotlib.lines import Line2D from matplotlib.patches import Rectangle -from ert.gui.tools.plot.plot_api import EnsembleObject +from ert.gui.plot_api import EnsembleObject from .plot_tools import PlotTools diff --git a/src/ert/gui/plottery/plots/distribution.py b/src/ert/gui/plottery/plots/distribution.py index 7eb46758f29..70dbcaf000c 100644 --- a/src/ert/gui/plottery/plots/distribution.py +++ b/src/ert/gui/plottery/plots/distribution.py @@ -5,7 +5,7 @@ import numpy as np import pandas as pd -from ert.gui.tools.plot.plot_api import EnsembleObject +from ert.gui.plot_api import EnsembleObject from .plot_tools import PlotTools diff --git a/src/ert/gui/plottery/plots/ensemble.py b/src/ert/gui/plottery/plots/ensemble.py index d14786b9d8c..1de2a579af7 100644 --- a/src/ert/gui/plottery/plots/ensemble.py +++ b/src/ert/gui/plottery/plots/ensemble.py @@ -16,8 +16,8 @@ from matplotlib.axes import Axes from matplotlib.figure import Figure + from ert.gui.plot_api import EnsembleObject from ert.gui.plottery import PlotConfig, PlotContext - from ert.gui.tools.plot.plot_api import EnsembleObject class EnsemblePlot: diff --git a/src/ert/gui/plottery/plots/gaussian_kde.py b/src/ert/gui/plottery/plots/gaussian_kde.py index 79e701771c2..60e2e985712 100644 --- a/src/ert/gui/plottery/plots/gaussian_kde.py +++ b/src/ert/gui/plottery/plots/gaussian_kde.py @@ -6,7 +6,7 @@ import pandas as pd from scipy.stats import gaussian_kde -from ert.gui.tools.plot.plot_api import EnsembleObject +from ert.gui.plot_api import EnsembleObject from .plot_tools import PlotTools diff --git a/src/ert/gui/plottery/plots/histogram.py b/src/ert/gui/plottery/plots/histogram.py index 4a6797c535a..186b460a08f 100644 --- a/src/ert/gui/plottery/plots/histogram.py +++ b/src/ert/gui/plottery/plots/histogram.py @@ -7,7 +7,7 @@ import pandas as pd from matplotlib.patches import Rectangle -from ert.gui.tools.plot.plot_api import EnsembleObject +from ert.gui.plot_api import EnsembleObject from .plot_tools import PlotTools diff --git a/src/ert/gui/plottery/plots/statistics.py b/src/ert/gui/plottery/plots/statistics.py index 4117ef5c70a..8eb328b79bf 100644 --- a/src/ert/gui/plottery/plots/statistics.py +++ b/src/ert/gui/plottery/plots/statistics.py @@ -18,7 +18,7 @@ from matplotlib.axes import Axes from matplotlib.figure import Figure - from ert.gui.tools.plot.plot_api import EnsembleObject + from ert.gui.plot_api import EnsembleObject class StatisticsPlot: diff --git a/src/ert/gui/plottery/plots/std_dev.py b/src/ert/gui/plottery/plots/std_dev.py index 4c6d55aa6f1..eac056ae8c2 100644 --- a/src/ert/gui/plottery/plots/std_dev.py +++ b/src/ert/gui/plottery/plots/std_dev.py @@ -7,8 +7,8 @@ from matplotlib.figure import Figure from mpl_toolkits.axes_grid1 import make_axes_locatable +from ert.gui.plot_api import EnsembleObject from ert.gui.plottery import PlotContext -from ert.gui.tools.plot.plot_api import EnsembleObject class StdDevPlot: diff --git a/src/ert/gui/tools/plot/customize/customize_plot_dialog.py b/src/ert/gui/tools/plot/customize/customize_plot_dialog.py index 4435548ec02..16de065236e 100644 --- a/src/ert/gui/tools/plot/customize/customize_plot_dialog.py +++ b/src/ert/gui/tools/plot/customize/customize_plot_dialog.py @@ -19,8 +19,8 @@ QWidgetAction, ) +from ert.gui.plot_api import PlotApiKeyDefinition from ert.gui.plottery import PlotConfig, PlotConfigFactory, PlotConfigHistory -from ert.gui.tools.plot.plot_api import PlotApiKeyDefinition from ert.gui.tools.plot.widgets import CopyStyleToDialog from .default_customization_view import DefaultCustomizationView diff --git a/src/ert/gui/tools/plot/data_type_keys_list_model.py b/src/ert/gui/tools/plot/data_type_keys_list_model.py index c626dc05134..065dbb88960 100644 --- a/src/ert/gui/tools/plot/data_type_keys_list_model.py +++ b/src/ert/gui/tools/plot/data_type_keys_list_model.py @@ -4,7 +4,7 @@ from qtpy.QtGui import QColor, QIcon from typing_extensions import override -from ert.gui.tools.plot.plot_api import PlotApiKeyDefinition +from ert.gui.plot_api import PlotApiKeyDefinition class DataTypeKeysListModel(QAbstractItemModel): diff --git a/src/ert/gui/tools/plot/data_type_keys_widget.py b/src/ert/gui/tools/plot/data_type_keys_widget.py index d7040d30b84..d967d372681 100644 --- a/src/ert/gui/tools/plot/data_type_keys_widget.py +++ b/src/ert/gui/tools/plot/data_type_keys_widget.py @@ -12,7 +12,7 @@ ) from ert.gui.ertwidgets import SearchBox -from ert.gui.tools.plot.plot_api import PlotApiKeyDefinition +from ert.gui.plot_api import PlotApiKeyDefinition from .data_type_keys_list_model import DataTypeKeysListModel from .data_type_proxy_model import DataTypeProxyModel diff --git a/src/ert/gui/tools/plot/filter_popup.py b/src/ert/gui/tools/plot/filter_popup.py index dc0f4f2cbe3..42dfdb29017 100644 --- a/src/ert/gui/tools/plot/filter_popup.py +++ b/src/ert/gui/tools/plot/filter_popup.py @@ -12,7 +12,7 @@ QWidget, ) -from ert.gui.tools.plot.plot_api import PlotApiKeyDefinition +from ert.gui.plot_api import PlotApiKeyDefinition class FilterPopup(QDialog): diff --git a/src/ert/gui/tools/plot/filterable_kw_list_model.py b/src/ert/gui/tools/plot/filterable_kw_list_model.py index 665fe18ca5f..27ea07c07ca 100644 --- a/src/ert/gui/tools/plot/filterable_kw_list_model.py +++ b/src/ert/gui/tools/plot/filterable_kw_list_model.py @@ -1,7 +1,7 @@ from typing import Dict, List from ert.gui.ertwidgets.models.selectable_list_model import SelectableListModel -from ert.gui.tools.plot.plot_api import PlotApiKeyDefinition +from ert.gui.plot_api import PlotApiKeyDefinition class FilterableKwListModel(SelectableListModel): diff --git a/src/ert/gui/tools/plot/plot_ensemble_selection_widget.py b/src/ert/gui/tools/plot/plot_ensemble_selection_widget.py index ee06dffd1b4..6a0efb0a5f3 100644 --- a/src/ert/gui/tools/plot/plot_ensemble_selection_widget.py +++ b/src/ert/gui/tools/plot/plot_ensemble_selection_widget.py @@ -21,7 +21,7 @@ QWidget, ) -from ert.gui.tools.plot.plot_api import EnsembleObject +from ert.gui.plot_api import EnsembleObject class EnsembleSelectionWidget(QWidget): diff --git a/src/ert/gui/tools/plot/plot_widget.py b/src/ert/gui/tools/plot/plot_widget.py index 09e271e7a31..a2536ca32f2 100644 --- a/src/ert/gui/tools/plot/plot_widget.py +++ b/src/ert/gui/tools/plot/plot_widget.py @@ -20,7 +20,7 @@ QWidgetAction, ) -from ert.gui.tools.plot.plot_api import EnsembleObject +from ert.gui.plot_api import EnsembleObject if TYPE_CHECKING: from ert.gui.plottery import PlotContext diff --git a/src/ert/gui/tools/plot/plot_window.py b/src/ert/gui/tools/plot/plot_window.py index 777129ad5a5..aff8156e6fc 100644 --- a/src/ert/gui/tools/plot/plot_window.py +++ b/src/ert/gui/tools/plot/plot_window.py @@ -10,6 +10,7 @@ from qtpy.QtWidgets import QDockWidget, QMainWindow, QTabWidget, QWidget from ert.gui.ertwidgets import showWaitCursorWhileWaiting +from ert.gui.plot_api import EnsembleObject, PlotApi, PlotApiKeyDefinition from ert.gui.plottery import PlotConfig, PlotContext from ert.gui.plottery.plots.cesp import CrossEnsembleStatisticsPlot from ert.gui.plottery.plots.distribution import DistributionPlot @@ -18,11 +19,9 @@ from ert.gui.plottery.plots.histogram import HistogramPlot from ert.gui.plottery.plots.statistics import StatisticsPlot from ert.gui.plottery.plots.std_dev import StdDevPlot -from ert.gui.tools.plot.plot_api import EnsembleObject, PlotApiKeyDefinition from .customize import PlotCustomizer from .data_type_keys_widget import DataTypeKeysWidget -from .plot_api import PlotApi from .plot_ensemble_selection_widget import EnsembleSelectionWidget from .plot_widget import PlotWidget diff --git a/src/ert/gui/tools/plot/widgets/copy_style_to_dialog.py b/src/ert/gui/tools/plot/widgets/copy_style_to_dialog.py index c1b4708071e..f7b95f3f7e4 100644 --- a/src/ert/gui/tools/plot/widgets/copy_style_to_dialog.py +++ b/src/ert/gui/tools/plot/widgets/copy_style_to_dialog.py @@ -11,8 +11,8 @@ ) from ert.gui.ertwidgets import CheckList +from ert.gui.plot_api import PlotApiKeyDefinition from ert.gui.tools.plot import FilterableKwListModel, FilterPopup -from ert.gui.tools.plot.plot_api import PlotApiKeyDefinition class CopyStyleToDialog(QDialog): diff --git a/tests/ert/unit_tests/gui/ertwidgets/test_plot_case_selection_widget.py b/tests/ert/unit_tests/gui/ertwidgets/test_plot_case_selection_widget.py index 938741ac4cc..270e6bee6b6 100644 --- a/tests/ert/unit_tests/gui/ertwidgets/test_plot_case_selection_widget.py +++ b/tests/ert/unit_tests/gui/ertwidgets/test_plot_case_selection_widget.py @@ -1,7 +1,7 @@ from pytestqt.qtbot import QtBot from qtpy.QtCore import Qt -from ert.gui.tools.plot.plot_api import EnsembleObject +from ert.gui.plot_api import EnsembleObject from ert.gui.tools.plot.plot_ensemble_selection_widget import ( EnsembleSelectionWidget, EnsembleSelectListWidget, diff --git a/tests/ert/unit_tests/gui/plottery/test_ensemble_plot.py b/tests/ert/unit_tests/gui/plottery/test_ensemble_plot.py index 758fb79234a..9aa778485d8 100644 --- a/tests/ert/unit_tests/gui/plottery/test_ensemble_plot.py +++ b/tests/ert/unit_tests/gui/plottery/test_ensemble_plot.py @@ -4,9 +4,9 @@ import pytest from matplotlib.figure import Figure +from ert.gui.plot_api import EnsembleObject from ert.gui.plottery import PlotConfig, PlotContext from ert.gui.plottery.plots.ensemble import EnsemblePlot -from ert.gui.tools.plot.plot_api import EnsembleObject from ert.summary_key_type import is_rate diff --git a/tests/ert/unit_tests/gui/plottery/test_histogram.py b/tests/ert/unit_tests/gui/plottery/test_histogram.py index 4a62717b070..020e4b6df08 100644 --- a/tests/ert/unit_tests/gui/plottery/test_histogram.py +++ b/tests/ert/unit_tests/gui/plottery/test_histogram.py @@ -4,9 +4,9 @@ import pytest from matplotlib.figure import Figure +from ert.gui.plot_api import EnsembleObject from ert.gui.plottery import PlotConfig, PlotContext from ert.gui.plottery.plots.histogram import HistogramPlot -from ert.gui.tools.plot.plot_api import EnsembleObject @pytest.fixture( diff --git a/tests/ert/unit_tests/gui/plottery/test_stddev_plot.py b/tests/ert/unit_tests/gui/plottery/test_stddev_plot.py index 27d09441208..321bd6fb5a7 100644 --- a/tests/ert/unit_tests/gui/plottery/test_stddev_plot.py +++ b/tests/ert/unit_tests/gui/plottery/test_stddev_plot.py @@ -5,9 +5,9 @@ import pytest from matplotlib.figure import Figure +from ert.gui.plot_api import EnsembleObject from ert.gui.plottery import PlotConfig, PlotContext from ert.gui.plottery.plots.std_dev import StdDevPlot -from ert.gui.tools.plot.plot_api import EnsembleObject @pytest.fixture() diff --git a/tests/ert/unit_tests/gui/tools/plot/conftest.py b/tests/ert/unit_tests/gui/tools/plot/conftest.py index c5eba03ab5a..c82c94148b3 100644 --- a/tests/ert/unit_tests/gui/tools/plot/conftest.py +++ b/tests/ert/unit_tests/gui/tools/plot/conftest.py @@ -7,7 +7,7 @@ import pandas as pd import pytest -from ert.gui.tools.plot.plot_api import PlotApi +from ert.gui.plot_api import PlotApi from ert.services import StorageService diff --git a/tests/ert/unit_tests/gui/tools/plot/test_plot_api.py b/tests/ert/unit_tests/gui/tools/plot/test_plot_api.py index 75c031b1a1a..8f453703273 100644 --- a/tests/ert/unit_tests/gui/tools/plot/test_plot_api.py +++ b/tests/ert/unit_tests/gui/tools/plot/test_plot_api.py @@ -3,7 +3,7 @@ import pytest from pandas.testing import assert_frame_equal -from ert.gui.tools.plot.plot_api import PlotApiKeyDefinition +from ert.gui.plot_api import PlotApiKeyDefinition from tests.ert.unit_tests.gui.tools.plot.conftest import MockResponse