[FIX] vtk compatibility with py3.7+

MICA-MNI · Nov 28, 2022 · 1bbb89a · 1bbb89a
1 parent 50f86d1
commit 1bbb89a
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 3 deletions.
diff --git a/enigmatoolbox/__pycache__/_version.cpython-37.pyc b/enigmatoolbox/__pycache__/_version.cpython-37.pyc
diff --git a/enigmatoolbox/__pycache__/_version.cpython-38.pyc b/enigmatoolbox/__pycache__/_version.cpython-38.pyc
diff --git a/enigmatoolbox/datasets/__pycache__/__init__.cpython-37.pyc b/enigmatoolbox/datasets/__pycache__/__init__.cpython-37.pyc
diff --git a/enigmatoolbox/datasets/__pycache__/__init__.cpython-38.pyc b/enigmatoolbox/datasets/__pycache__/__init__.cpython-38.pyc
diff --git a/enigmatoolbox/datasets/__pycache__/base.cpython-37.pyc b/enigmatoolbox/datasets/__pycache__/base.cpython-37.pyc
diff --git a/enigmatoolbox/datasets/__pycache__/base.cpython-38.pyc b/enigmatoolbox/datasets/__pycache__/base.cpython-38.pyc
diff --git a/enigmatoolbox/permutation_testing/__pycache__/permutation_testing.cpython-37.pyc b/enigmatoolbox/permutation_testing/__pycache__/permutation_testing.cpython-37.pyc
diff --git a/enigmatoolbox/permutation_testing/__pycache__/permutation_testing.cpython-38.pyc b/enigmatoolbox/permutation_testing/__pycache__/permutation_testing.cpython-38.pyc
diff --git a/enigmatoolbox/vtk_interface/wrappers/utils.py b/enigmatoolbox/vtk_interface/wrappers/utils.py
@@ -12,7 +12,14 @@
 
 import numpy as np
 
-from vtk.util.vtkConstants import VTK_STRING, VTK_UNICODE_STRING
+from vtk.util.vtkConstants import VTK_BIT, VTK_STRING
+
+# VTK_UNICODE_STRING has been removed since VTK 9.2.
+# See: https://gitlab.kitware.com/vtk/vtk/-/blob/master/Documentation/release/9.2.md
+try:
+ from vtk.util.vtkConstants import VTK_UNICODE_STRING
+except ImportError:
+ VTK_UNICODE_STRING = VTK_STRING
 
 
 re_state = 'Set(?P<state>(?P<root>[A-Z0-9].*)To(?P<value>[A-Z0-9].*))'

diff --git a/requirements.txt b/requirements.txt
@@ -1,9 +1,9 @@
 numpy>=1.11.0
 matplotlib>=2.0.0
-vtk==9.0.1
+vtk>=8.1.0
 nibabel
 pillow
 pandas
 scipy>=0.17.0
 scikit-learn>=0.22.0
-nilearn
+nilearn