Develop master merged (#50)

* Add mean in tornado table VolumetricAnalysis (equinor#1297) * Remove surface cache file mode (equinor#1298) * OS temp path for image server (equinor#1302) * Update README.md with deprecation warning (equinor#1303) * No Active Rfts error message (equinor#1304) Co-authored-by: Øyvind Lind-Johansen <[email protected]> * Pandas 2 compatibility for RFT plotter (equinor#1305) * Pandas 2 compability for RFT plotter * black * Remove use of `wcc.ColorScales` (equinor#1306) * Fix FutureWarning - cast to dtype (equinor#1309) * Pandas 2 compability for ParameterResponseCorrelation (equinor#1310) * Add field outline and custom well picks colors to MapViewerFMU (equinor#1311) * Replaced use of `DashSubsurfaceViewer` with `SubsurfaceViewer` (equinor#1312) * Expose rft input files as arguments (equinor#1313) * exposed rft input files as arguments * black version updated * pylint fixes * pylint fixes * more fixes --------- Co-authored-by: Øyvind Lind-Johansen <[email protected]> * Disable cache for statistical surfaces (equinor#1314) * Add check for length of numpy array (equinor#1316) * Fix ensemble colors in relperm (equinor#1317) --------- Co-authored-by: Therese Natterøy <[email protected]> Co-authored-by: Anders Fredrik Kiær <[email protected]> Co-authored-by: Øyvind Lind-Johansen <[email protected]> Co-authored-by: Øyvind Lind-Johansen <[email protected]> Co-authored-by: Hans Kallekleiv <[email protected]> Co-authored-by: Ruben Thoms <[email protected]> Co-authored-by: Jørgen Herje <[email protected]>
AudunSektnanNR · Feb 10, 2025 · b9dfb32 · b9dfb32
1 parent 24a59f2
commit b9dfb32
Show file tree

Hide file tree

Showing 64 changed files with 314 additions and 1,121 deletions.
diff --git a/.github/workflows/subsurface.yml b/.github/workflows/subsurface.yml
@@ -57,7 +57,6 @@ jobs:
           # Testing against our latest release (including pre-releases)
           pip install --pre --upgrade webviz-config webviz-core-components webviz-subsurface-components
 
-
       - name: 📦 Install test dependencies
         run: |
           pip install .[tests]
@@ -101,7 +100,7 @@ jobs:
           git clone --depth 1 --branch $TESTDATA_REPO_BRANCH https://github.com/$TESTDATA_REPO_OWNER/webviz-subsurface-testdata.git
           # Copy any clientside script to the test folder before running tests
           mkdir ./tests/assets && cp ./webviz_subsurface/_assets/js/* ./tests/assets
-          pytest ./tests --headless --forked --testdata-folder ./webviz-subsurface-testdata
+          pytest ./tests --headless --forked -s --testdata-folder ./webviz-subsurface-testdata
           rm -rf ./tests/assets
 
       - name: 🐳 Build Docker example image

diff --git a/README.md b/README.md
@@ -1,3 +1,13 @@
+<h4>This package will be deprecated - we move instead all collaboration focus to the reusable React and Dash components in:
+<ul>
+  <li>https://github.com/equinor/webviz-subsurface-components</li>
+  <li>https://github.com/equinor/webviz-core-components</li>
+</ul>
+and the FMU use case to https://github.com/equinor/webviz
+</h2>
+
+<hr/>
+
 [![PyPI version](https://badge.fury.io/py/webviz-subsurface.svg)](https://badge.fury.io/py/webviz-subsurface)
 [![Build Status](https://github.com/equinor/webviz-subsurface/workflows/webviz-subsurface/badge.svg)](https://github.com/equinor/webviz-subsurface/actions?query=branch%3Amaster)
 [![Python 3.8 | 3.9 | 3.10 | 3.11 | 3.12](https://img.shields.io/badge/python-3.8%20|%203.9%20|%203.10%20|%203.11%20|%203.12-blue.svg)](https://www.python.org/)

diff --git a/setup.py b/setup.py
@@ -107,9 +107,8 @@
         "statsmodels>=0.12.1",  # indirect dependency through https://plotly.com/python/linear-fits/
         "xtgeo>=2.20.0",
         "vtk>=9.2.2",
-        "webviz-config",
-        "webviz-core-components>=0.6",
-        "webviz-subsurface-components==1.0.2",
+        "webviz-config>=0.6.5",
+        "webviz-subsurface-components>=1.0.3",
     ],
     extras_require={"tests": TESTS_REQUIRE},
     setup_requires=["setuptools_scm~=3.2"],

diff --git a/tests/integration_tests/plugin_tests/__init__.py b/tests/integration_tests/plugin_tests/__init__.py
diff --git a/tests/integration_tests/plugin_tests/test_bhp_qc.py b/tests/integration_tests/plugin_tests/test_bhp_qc.py
diff --git a/tests/integration_tests/plugin_tests/test_history_match.py b/tests/integration_tests/plugin_tests/test_history_match.py
diff --git a/tests/integration_tests/plugin_tests/test_line_plotter_fmu.py b/tests/integration_tests/plugin_tests/test_line_plotter_fmu.py
diff --git a/tests/integration_tests/plugin_tests/test_parameter_analysis.py b/tests/integration_tests/plugin_tests/test_parameter_analysis.py
diff --git a/tests/integration_tests/plugin_tests/test_parameter_correlation.py b/tests/integration_tests/plugin_tests/test_parameter_correlation.py
diff --git a/tests/integration_tests/plugin_tests/test_parameter_distribution.py b/tests/integration_tests/plugin_tests/test_parameter_distribution.py
diff --git a/tests/integration_tests/plugin_tests/test_parameter_parallel_coordinates.py b/tests/integration_tests/plugin_tests/test_parameter_parallel_coordinates.py
diff --git a/tests/integration_tests/plugin_tests/test_parameter_response_correlation.py b/tests/integration_tests/plugin_tests/test_parameter_response_correlation.py
diff --git a/tests/integration_tests/plugin_tests/test_property_statistics.py b/tests/integration_tests/plugin_tests/test_property_statistics.py
diff --git a/tests/integration_tests/plugin_tests/test_pvt_plot.py b/tests/integration_tests/plugin_tests/test_pvt_plot.py
diff --git a/tests/integration_tests/plugin_tests/test_relative_permeability.py b/tests/integration_tests/plugin_tests/test_relative_permeability.py
diff --git a/tests/integration_tests/plugin_tests/test_reservoir_simulation_timeseries.py b/tests/integration_tests/plugin_tests/test_reservoir_simulation_timeseries.py
diff --git a/tests/integration_tests/plugin_tests/test_reservoir_simulation_timeseries_onebyone.py b/tests/integration_tests/plugin_tests/test_reservoir_simulation_timeseries_onebyone.py
diff --git a/tests/integration_tests/plugin_tests/test_reservoir_simulation_timeseries_regional.py b/tests/integration_tests/plugin_tests/test_reservoir_simulation_timeseries_regional.py
diff --git a/tests/integration_tests/plugin_tests/test_rft_plotter.py b/tests/integration_tests/plugin_tests/test_rft_plotter.py
diff --git a/tests/integration_tests/plugin_tests/test_segy_viewer.py b/tests/integration_tests/plugin_tests/test_segy_viewer.py