From 46a9ad99dd0b16de6fb9e4a9cfaee600bd7cd2b3 Mon Sep 17 00:00:00 2001 From: Asgeir Nyvoll <47146384+asnyv@users.noreply.github.com> Date: Fri, 18 Nov 2022 12:17:27 +0100 Subject: [PATCH] Remove `vtk` from dependencies (#1167) --- .github/workflows/subsurface.yml | 6 +++++- setup.py | 6 +----- webviz_subsurface/plugins/_grid_viewer_fmu/_plugin.py | 3 ++- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/subsurface.yml b/.github/workflows/subsurface.yml index 7bc11739c..73d487c78 100644 --- a/.github/workflows/subsurface.yml +++ b/.github/workflows/subsurface.yml @@ -55,11 +55,15 @@ jobs: pip install "pytest<7.2.0" pip install "pytest-xdist<3.0" pip install "xtgeo<2.20.2" - pip install .[vtk] + pip install . # Testing against our latest release (including pre-releases) pip install --pre --upgrade webviz-config webviz-core-components webviz-subsurface-components + # Install additional packages required for experimental plugin: + pip install "vtk>=9.2.2" + pip install "webviz_vtk@git+https://github.com/equinor/webviz-vtk" + - name: 📦 Install test dependencies run: | pip install .[tests] diff --git a/setup.py b/setup.py index 05c54733d..565612b07 100644 --- a/setup.py +++ b/setup.py @@ -18,10 +18,6 @@ "types-pyyaml", ] -VTK_REQUIRE = [ - "vtk>=9.2.2", - "webviz_vtk@git+https://github.com/equinor/webviz-vtk", -] # pylint: disable=line-too-long setup( name="webviz-subsurface", @@ -111,7 +107,7 @@ "webviz-core-components>=0.6", "webviz-subsurface-components>=0.4.14", ], - extras_require={"tests": TESTS_REQUIRE, "vtk": VTK_REQUIRE}, + extras_require={"tests": TESTS_REQUIRE}, setup_requires=["setuptools_scm~=3.2"], python_requires="~=3.8", use_scm_version=True, diff --git a/webviz_subsurface/plugins/_grid_viewer_fmu/_plugin.py b/webviz_subsurface/plugins/_grid_viewer_fmu/_plugin.py index 8ba575944..bad704a96 100644 --- a/webviz_subsurface/plugins/_grid_viewer_fmu/_plugin.py +++ b/webviz_subsurface/plugins/_grid_viewer_fmu/_plugin.py @@ -85,7 +85,8 @@ def __init__( if not VTK_INSTALLED: raise ImportError( "To run this experimental plugin you must install the extra vtk " - "packages with `pip install webviz-subsurface[vtk]`." + "packages with `pip install vtk>=9.2.2` and " + "`pip install webviz_vtk@git+https://github.com/equinor/webviz-vtk`." ) super().__init__(stretch=True)