[deploy test]

webviz_subsurface/_providers/__init__.py

@@ -23,10 +23,10 @@
     SimulatedSurfaceAddress,
     StatisticalSurfaceAddress,
     SurfaceAddress,
+    SurfaceArrayMeta,
+    SurfaceArrayServer,
     SurfaceImageMeta,
     SurfaceImageServer,
-    SurfaceArrayServer,
-    SurfaceArrayMeta,
 )
 from .ensemble_table_provider import (
     ColumnMetadata,

webviz_subsurface/_providers/ensemble_surface_provider/__init__.py

@@ -1,3 +1,4 @@
+from ._types import QualifiedDiffSurfaceAddress, QualifiedSurfaceAddress
 from .ensemble_surface_provider import (
     EnsembleSurfaceProvider,
     ObservedSurfaceAddress,
@@ -6,9 +7,5 @@
     SurfaceAddress,
 )
 from .ensemble_surface_provider_factory import EnsembleSurfaceProviderFactory
-from .surface_image_server import (
-    SurfaceImageMeta,
-    SurfaceImageServer,
-)
 from .surface_array_server import SurfaceArrayMeta, SurfaceArrayServer
-from ._types import QualifiedSurfaceAddress, QualifiedDiffSurfaceAddress
+from .surface_image_server import SurfaceImageMeta, SurfaceImageServer

webviz_subsurface/_providers/ensemble_surface_provider/surface_array_server.py

@@ -1,5 +1,5 @@
-import io
 import hashlib
+import io
 import json
 import logging
 import math
@@ -17,13 +17,13 @@
 from webviz_subsurface._utils.perf_timer import PerfTimer
 
 from ._surface_to_float32_array import surface_to_float32_array
+from ._types import QualifiedDiffSurfaceAddress, QualifiedSurfaceAddress
 from .ensemble_surface_provider import (
     ObservedSurfaceAddress,
     SimulatedSurfaceAddress,
     StatisticalSurfaceAddress,
     SurfaceAddress,
 )
-from ._types import QualifiedSurfaceAddress, QualifiedDiffSurfaceAddress
 
 LOGGER = logging.getLogger(__name__)
 

webviz_subsurface/_providers/ensemble_surface_provider/surface_image_server.py

@@ -17,13 +17,13 @@
 from webviz_subsurface._utils.perf_timer import PerfTimer
 
 from ._surface_to_image import surface_to_png_bytes_optimized
+from ._types import QualifiedDiffSurfaceAddress, QualifiedSurfaceAddress
 from .ensemble_surface_provider import (
     ObservedSurfaceAddress,
     SimulatedSurfaceAddress,
     StatisticalSurfaceAddress,
     SurfaceAddress,
 )
-from ._types import QualifiedSurfaceAddress, QualifiedDiffSurfaceAddress
 
 LOGGER = logging.getLogger(__name__)
 

webviz_subsurface/plugins/_map_viewer_fmu/callbacks.py

@@ -7,7 +7,7 @@
 from typing import Any, Callable, Dict, List, Optional, Tuple, Union
 
 import numpy as np
-from dash import ALL, MATCH, Input, Output, State, callback, callback_context, no_update
+from dash import ALL, MATCH, Input, Output, State, callback, callback_context
 from dash.exceptions import PreventUpdate
 from webviz_config import EncodedFile
 from webviz_config.utils._dash_component_utils import calculate_slider_step
@@ -24,12 +24,11 @@
     StatisticalSurfaceAddress,
     SurfaceAddress,
     SurfaceArrayServer,
-    SurfaceArrayMeta,
 )
 
 from ._layer_model import DeckGLMapLayersModel
 from ._tmp_well_pick_provider import WellPickProvider
-from ._types import SurfaceMode, LayerTypes
+from ._types import LayerTypes, SurfaceMode
 from .layout import (
     DefaultSettings,
     LayoutElements,
@@ -366,7 +365,6 @@ def _update_map(
                 },
                 "colorMapName": data["colormap"],
                 "colorMapRange": color_range,
-
             }
             layer_idx = None
             for layer in layers:

webviz_subsurface/plugins/_map_viewer_fmu/map_viewer_fmu.py

@@ -4,7 +4,6 @@
 
 from dash import Dash, html
 from webviz_config import WebvizPluginABC, WebvizSettings
-from webviz_config.deprecation_decorators import deprecated_plugin_arguments
 
 from webviz_subsurface._providers import (
     EnsembleFaultPolygonsProviderFactory,
@@ -23,14 +22,6 @@
 from .color_tables import default_color_tables
 from .layout import main_layout
 
-def check_deprecation_argument(hillshading_enabled: bool) -> str:
-    if hillshading_enabled is None:
-        return None
-    return (
-           "The argument 'hillshading_enabled' no longer has any effect "
-           "and can be removed from the config file."
-        )
-
 
 class MapViewerFMU(WebvizPluginABC):
     """Surface visualizer for FMU ensembles.
@@ -88,7 +79,6 @@ class MapViewerFMU(WebvizPluginABC):
 """
 
     # pylint: disable=too-many-arguments, too-many-locals
-    @deprecated_plugin_arguments(check_deprecation_argument)
     def __init__(
         self,
         app: Dash,
@@ -105,7 +95,7 @@ def __init__(
     ):
 
         super().__init__()
-
+        self._hillshading = hillshading_enabled
         surface_provider_factory = EnsembleSurfaceProviderFactory.instance()
         fault_polygons_provider_factory = (
             EnsembleFaultPolygonsProviderFactory.instance()