Skip to content

Commit

Permalink
Remove vtk from dependencies (#1167)
Browse files Browse the repository at this point in the history
  • Loading branch information
asnyv authored Nov 18, 2022
1 parent 168c55a commit 46a9ad9
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 7 deletions.
6 changes: 5 additions & 1 deletion .github/workflows/subsurface.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
6 changes: 1 addition & 5 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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,
Expand Down
3 changes: 2 additions & 1 deletion webviz_subsurface/plugins/_grid_viewer_fmu/_plugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down

0 comments on commit 46a9ad9

Please sign in to comment.