Move plottery into gui/tools/plot

src/ert/gui/simulation/run_dialog.py

@@ -53,7 +53,7 @@
     SnapshotModel,
 )
 from ert.gui.tools.file import FileDialog
-from ert.gui.tools.plot.plot_tool import PlotTool
+from ert.gui.tools.plot import PlotTool
 from ert.run_models import (
     BaseRunModel,
     RunModelStatusEvent,

src/ert/gui/tools/plot/customize/customization_view.py

@@ -11,12 +11,12 @@
     QWidget,
 )
 
-from ert.gui.tools.plot.widgets.clearable_line_edit import ClearableLineEdit
+from ert.gui.tools.plot.widgets import ClearableLineEdit
 
 from .. import style_chooser as sc
 
 if TYPE_CHECKING:
-    from ert.gui.plottery import PlotConfig
+    from ert.gui.tools.plot.plottery import PlotConfig
 
 
 class CustomizationView(QWidget):

src/ert/gui/tools/plot/customize/customize_plot_dialog.py

@@ -19,8 +19,8 @@
     QWidgetAction,
 )
 
-from ert.gui.plottery import PlotConfig, PlotConfigFactory, PlotConfigHistory
 from ert.gui.tools.plot.plot_api import PlotApiKeyDefinition
+from ert.gui.tools.plot.plottery import PlotConfig, PlotConfigFactory, PlotConfigHistory
 from ert.gui.tools.plot.widgets import CopyStyleToDialog
 
 from .default_customization_view import DefaultCustomizationView
@@ -29,7 +29,7 @@
 from .style_customization_view import StyleCustomizationView
 
 if TYPE_CHECKING:
-    from ert.gui.tools.plot.customize import CustomizationView
+    from .customization_view import CustomizationView
 
 
 class PlotCustomizer(QObject):

src/ert/gui/tools/plot/customize/default_customization_view.py

@@ -3,7 +3,7 @@
 from .customization_view import CustomizationView, WidgetProperty
 
 if TYPE_CHECKING:
-    from ert.gui.plottery import PlotConfig
+    from ert.gui.tools.plot.plottery import PlotConfig
 
 
 def _label_msg(label: str) -> str:

src/ert/gui/tools/plot/customize/limits_customization_view.py

@@ -7,15 +7,13 @@
 from qtpy.QtGui import QDoubleValidator, QIntValidator
 from qtpy.QtWidgets import QLabel, QStackedWidget, QWidget
 
-from ert.gui.plottery import PlotContext
-from ert.gui.plottery.plot_limits import PlotLimits
-from ert.gui.tools.plot.widgets.clearable_line_edit import ClearableLineEdit
-from ert.gui.tools.plot.widgets.custom_date_edit import CustomDateEdit
+from ert.gui.tools.plot.plottery import PlotContext, PlotLimits
+from ert.gui.tools.plot.widgets import ClearableLineEdit, CustomDateEdit
 
 from .customization_view import CustomizationView
 
 if TYPE_CHECKING:
-    from ert.gui.plottery import PlotConfig
+    from ert.gui.tools.plot.plottery import PlotConfig
 
 
 class StackedInput(QStackedWidget):

src/ert/gui/tools/plot/customize/statistics_customization_view.py

@@ -9,7 +9,7 @@
 from .customization_view import CustomizationView, WidgetProperty
 
 if TYPE_CHECKING:
-    from ert.gui.plottery import PlotConfig
+    from ert.gui.tools.plot.plottery import PlotConfig
 
 
 class StatisticsCustomizationView(CustomizationView):

src/ert/gui/tools/plot/customize/style_customization_view.py

@@ -8,7 +8,7 @@
 from .customization_view import CustomizationView, WidgetProperty
 
 if TYPE_CHECKING:
-    from ert.gui.plottery import PlotConfig
+    from ert.gui.tools.plot.plottery import PlotConfig
 
 
 class StyleCustomizationView(CustomizationView):

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 .plot_api import PlotApiKeyDefinition
 
 
 class DataTypeKeysListModel(QAbstractItemModel):

src/ert/gui/tools/plot/data_type_keys_widget.py

@@ -12,11 +12,11 @@
 )
 
 from ert.gui.ertwidgets import SearchBox
-from ert.gui.tools.plot.plot_api import PlotApiKeyDefinition
 
 from .data_type_keys_list_model import DataTypeKeysListModel
 from .data_type_proxy_model import DataTypeProxyModel
 from .filter_popup import FilterPopup
+from .plot_api import PlotApiKeyDefinition
 
 
 class _LegendMarker(QWidget):

src/ert/gui/tools/plot/filter_popup.py

@@ -12,7 +12,7 @@
     QWidget,
 )
 
-from ert.gui.tools.plot.plot_api import PlotApiKeyDefinition
+from .plot_api import PlotApiKeyDefinition
 
 
 class FilterPopup(QDialog):

src/ert/gui/tools/plot/filterable_kw_list_model.py

@@ -1,7 +1,8 @@
 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 .plot_api import PlotApiKeyDefinition
 
 
 class FilterableKwListModel(SelectableListModel):

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 .plot_api import EnsembleObject
 
 
 class EnsembleSelectionWidget(QWidget):

src/ert/gui/tools/plot/plot_widget.py

@@ -20,17 +20,17 @@
     QWidgetAction,
 )
 
-from ert.gui.tools.plot.plot_api import EnsembleObject
+from .plot_api import EnsembleObject
 
 if TYPE_CHECKING:
-    from ert.gui.plottery import PlotContext
-    from ert.gui.plottery.plots.cesp import CrossEnsembleStatisticsPlot
-    from ert.gui.plottery.plots.distribution import DistributionPlot
-    from ert.gui.plottery.plots.ensemble import EnsemblePlot
-    from ert.gui.plottery.plots.gaussian_kde import GaussianKDEPlot
-    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 .plottery import PlotContext
+    from .plottery.plots.cesp import CrossEnsembleStatisticsPlot
+    from .plottery.plots.distribution import DistributionPlot
+    from .plottery.plots.ensemble import EnsemblePlot
+    from .plottery.plots.gaussian_kde import GaussianKDEPlot
+    from .plottery.plots.histogram import HistogramPlot
+    from .plottery.plots.statistics import StatisticsPlot
+    from .plottery.plots.std_dev import StdDevPlot
 
 
 class CustomNavigationToolbar(NavigationToolbar2QT):

src/ert/gui/tools/plot/plot_window.py

@@ -10,21 +10,22 @@
 from qtpy.QtWidgets import QDockWidget, QMainWindow, QTabWidget, QWidget
 
 from ert.gui.ertwidgets import showWaitCursorWhileWaiting
-from ert.gui.plottery import PlotConfig, PlotContext
-from ert.gui.plottery.plots.cesp import CrossEnsembleStatisticsPlot
-from ert.gui.plottery.plots.distribution import DistributionPlot
-from ert.gui.plottery.plots.ensemble import EnsemblePlot
-from ert.gui.plottery.plots.gaussian_kde import GaussianKDEPlot
-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_api import EnsembleObject, PlotApi, PlotApiKeyDefinition
 from .plot_ensemble_selection_widget import EnsembleSelectionWidget
 from .plot_widget import PlotWidget
+from .plottery import PlotConfig, PlotContext
+from .plottery.plots import (
+    CrossEnsembleStatisticsPlot,
+    DistributionPlot,
+    EnsemblePlot,
+    GaussianKDEPlot,
+    HistogramPlot,
+    StatisticsPlot,
+    StdDevPlot,
+)
 
 CROSS_ENSEMBLE_STATISTICS = "Cross ensemble statistics"
 DISTRIBUTION = "Distribution"

src/ert/gui/tools/plot/plottery/__init__.py

@@ -0,0 +1,24 @@
+# isort: skip_file
+
+# At least for some combinations of pandas and matplotlib the numpy.datetime64
+# dates coming from pandas are not correctly recognized/converted by matplotlib.
+# Calling this converter.register() method seems to fix the problem.
+from pandas.plotting import register_matplotlib_converters
+
+register_matplotlib_converters()
+
+from .plot_style import PlotStyle
+from .plot_limits import PlotLimits
+from .plot_config import PlotConfig
+from .plot_context import PlotContext
+from .plot_config_history import PlotConfigHistory
+from .plot_config_factory import PlotConfigFactory
+
+__all__ = [
+    "PlotConfig",
+    "PlotConfigFactory",
+    "PlotConfigHistory",
+    "PlotContext",
+    "PlotLimits",
+    "PlotStyle",
+]

src/ert/gui/plottery/plot_config.py → src/ert/gui/tools/plot/plottery/plot_config.py

@@ -4,7 +4,8 @@
 from copy import copy
 from typing import Any, List, Optional, Tuple
 
-from ert.gui.plottery import PlotLimits, PlotStyle
+from .plot_limits import PlotLimits
+from .plot_style import PlotStyle
 
 
 class PlotConfig:

src/ert/gui/plottery/plot_config_factory.py → src/ert/gui/tools/plot/plottery/plot_config_factory.py

@@ -2,7 +2,7 @@
 
 from typing import TYPE_CHECKING
 
-from ert.gui.plottery import PlotConfig
+from .plot_config import PlotConfig
 
 if TYPE_CHECKING:
     from ert.gui.tools.plot.plot_api import PlotApiKeyDefinition

src/ert/gui/plottery/plot_config_history.py → src/ert/gui/tools/plot/plottery/plot_config_history.py

@@ -1,6 +1,6 @@
 from typing import List
 
-from ert.gui.plottery import PlotConfig
+from .plot_config import PlotConfig
 
 
 class PlotConfigHistory:

src/ert/gui/plottery/plot_context.py → src/ert/gui/tools/plot/plottery/plot_context.py

@@ -5,9 +5,10 @@
 if TYPE_CHECKING:
     from pandas import DataFrame
 
-    from ert.gui.plottery import PlotConfig
     from ert.gui.tools.plot.plot_api import EnsembleObject
 
+    from .plot_config import PlotConfig
+
 
 class PlotContext:
     UNKNOWN_AXIS = None

src/ert/gui/tools/plot/plottery/plots/__init__.py

@@ -0,0 +1,17 @@
+from .cesp import CrossEnsembleStatisticsPlot
+from .distribution import DistributionPlot
+from .ensemble import EnsemblePlot
+from .gaussian_kde import GaussianKDEPlot
+from .histogram import HistogramPlot
+from .statistics import StatisticsPlot
+from .std_dev import StdDevPlot
+
+__all__ = [
+    "CrossEnsembleStatisticsPlot",
+    "DistributionPlot",
+    "EnsemblePlot",
+    "GaussianKDEPlot",
+    "HistogramPlot",
+    "StatisticsPlot",
+    "StdDevPlot",
+]

src/ert/gui/plottery/plots/cesp.py → src/ert/gui/tools/plot/plottery/plots/cesp.py

@@ -17,7 +17,7 @@
     from matplotlib.figure import Figure
     from pandas import DataFrame
 
-    from ert.gui.plottery import PlotConfig, PlotContext
+    from ert.gui.tools.plot.plottery import PlotConfig, PlotContext
 
 
 CcsData = TypedDict(

src/ert/gui/plottery/plots/distribution.py → src/ert/gui/tools/plot/plottery/plots/distribution.py

@@ -14,7 +14,7 @@
     from matplotlib.axes import Axes
     from matplotlib.figure import Figure
 
-    from ert.gui.plottery import PlotConfig, PlotContext
+    from ert.gui.tools.plot.plottery import PlotConfig, PlotContext
 
 
 class DistributionPlot:

src/ert/gui/plottery/plots/ensemble.py → src/ert/gui/tools/plot/plottery/plots/ensemble.py

@@ -5,9 +5,9 @@
 import numpy as np
 import pandas as pd
 
-from ert.gui.plottery.plots.history import plotHistory
 from ert.summary_key_type import is_rate
 
+from .history import plotHistory
 from .observations import plotObservations
 from .plot_tools import PlotTools
 
@@ -16,8 +16,8 @@
     from matplotlib.axes import Axes
     from matplotlib.figure import Figure
 
-    from ert.gui.plottery import PlotConfig, PlotContext
     from ert.gui.tools.plot.plot_api import EnsembleObject
+    from ert.gui.tools.plot.plottery import PlotConfig, PlotContext
 
 
 class EnsemblePlot:

src/ert/gui/plottery/plots/gaussian_kde.py → src/ert/gui/tools/plot/plottery/plots/gaussian_kde.py

@@ -15,7 +15,7 @@
     from matplotlib.axes import Axes
     from matplotlib.figure import Figure
 
-    from ert.gui.plottery import PlotConfig, PlotContext
+    from ert.gui.tools.plot.plottery import PlotConfig, PlotContext
 
 
 class GaussianKDEPlot:

src/ert/gui/plottery/plots/histogram.py → src/ert/gui/tools/plot/plottery/plots/histogram.py

@@ -16,7 +16,7 @@
     from matplotlib.axes import Axes
     from matplotlib.figure import Figure
 
-    from ert.gui.plottery import PlotContext, PlotStyle
+    from ert.gui.tools.plot.plottery import PlotContext, PlotStyle
 
 
 class HistogramPlot:

src/ert/gui/plottery/plots/history.py → src/ert/gui/tools/plot/plottery/plots/history.py

@@ -3,7 +3,7 @@
 if TYPE_CHECKING:
     from matplotlib.axes import Axes
 
-    from ert.gui.plottery import PlotContext
+    from ert.gui.tools.plot.plottery import PlotContext
 
 
 def plotHistory(plot_context: "PlotContext", axes: "Axes") -> None:

src/ert/gui/plottery/plots/observations.py → src/ert/gui/tools/plot/plottery/plots/observations.py

@@ -7,7 +7,7 @@
     from matplotlib.axes import Axes
     from pandas import DataFrame
 
-    from ert.gui.plottery import PlotConfig, PlotContext
+    from ert.gui.tools.plot.plottery import PlotConfig, PlotContext
 
 
 def plotObservations(

src/ert/gui/plottery/plots/plot_tools.py → src/ert/gui/tools/plot/plottery/plots/plot_tools.py

@@ -8,7 +8,7 @@
     from matplotlib.axes import Axes
     from matplotlib.figure import Figure
 
-    from ert.gui.plottery import PlotContext
+    from ert.gui.tools.plot.plottery import PlotContext
 
 
 class PlotTools:

src/ert/gui/plottery/plots/statistics.py → src/ert/gui/tools/plot/plottery/plots/statistics.py

@@ -7,9 +7,9 @@
 from matplotlib.patches import Rectangle
 from pandas import DataFrame
 
-from ert.gui.plottery import PlotConfig, PlotContext, PlotStyle
-from ert.gui.plottery.plots.history import plotHistory
+from ert.gui.tools.plot.plottery import PlotConfig, PlotContext, PlotStyle
 
+from .history import plotHistory
 from .observations import plotObservations
 from .plot_tools import PlotTools