Merge pull request #2311 from firedrakeproject/JDBetteridge/python3.10

Update for Python3.10

Author: dham

firedrake/paraview_reordering.py

@@ -1,41 +1,11 @@
-import os
-import importlib
-
 from tsfc.finatinterface import create_base_element
 import numpy as np
 from pyop2.utils import as_tuple
 
-"""
-This requires some explanation:
-VTK has some .so deps that might not be present (e.g. libsm.so (X11 Sessions))
-However, we only need vtkCommonDataModel (previously vtkCommonKitPython),
-which, according to ldd, only cares about things that we should expect:
-libc, libdl.so, libstdc++, libm, libgcc_s,
-as well as "vtkCommon" libs and "vtkPython" libs.
-Thus, we hackily import the module that lives in vtkCommonDataModel.so
-However, since VTK9 this library name is now polluted with the Python version
-and othe system information hence we fish out the exact name by trawling
-through the VTK library directory.
-"""
-vtkSoLoc = importlib.util.find_spec("vtkmodules").submodule_search_locations[0]
-findStr = "vtkCommonDataModel"
-# Find the module name as this is system dependent in VTK9
-contents = os.listdir(vtkSoLoc)
-for item in contents:
-    if (findStr in item) and ("lib" not in item):
-        vtkSoName = "/" + item
-        break
-
-moduleName = "vtkCommonDataModel"
-loader = importlib.machinery.ExtensionFileLoader(moduleName,
-                                                 vtkSoLoc+vtkSoName)
-mod = loader.load_module(moduleName)
-
-vtkLagrangeTetra = mod.vtkLagrangeTetra
-vtkLagrangeHexahedron = mod.vtkLagrangeHexahedron
-vtkLagrangeTriangle = mod.vtkLagrangeTriangle
-vtkLagrangeQuadrilateral = mod.vtkLagrangeQuadrilateral
-vtkLagrangeWedge = mod.vtkLagrangeWedge
+from vtkmodules.vtkCommonDataModel import (
+    vtkLagrangeTriangle, vtkLagrangeTetra,
+    vtkLagrangeQuadrilateral, vtkLagrangeHexahedron, vtkLagrangeWedge
+)
 
 paraviewUsesVTK8 = True
 

requirements-ext.txt

@@ -5,7 +5,7 @@ pytest-xdist
 ipython
 matplotlib
 pylint
-vtk==9.0.1
+vtk>=9.0.1
 pkgconfig
 cached_property
 requests

scripts/firedrake-install

@@ -121,10 +121,10 @@ log = logging.getLogger()
 
 log.info("Running %s" % " ".join(sys.argv))
 
-if sys.version_info >= (3, 10):
-    print("""\nCan not install Firedrake with Python 3.10 at the moment:
-Some wheels are not yet available for Python 3.10 for some required package(s).
-Please install with Python 3.9 (or an earlier version >= 3.6).""")
+if sys.version_info >= (3, 11):
+    print("""\nCan not install Firedrake with Python 3.11 at the moment:
+Some wheels are not yet available for Python 3.11 for some required package(s).
+Please install with Python 3.10 (or an earlier version >= 3.6).""")
     sys.exit(1)
 elif sys.version_info < (3, 6):
     if mode == "install":
@@ -1616,20 +1616,25 @@ if mode == "install":
             log.info("Pip installing %s to venv" % package)
             run_pip_install(package.split())
 
-    # Temporary workaround for missing VTK wheel on Python 3.9
-    if sys.version_info[:2] == (3, 9):
-        source = "https://github.com/firedrakeproject/VTKPythonPackage/releases/download/firedrake_20210113/"
+    # "Temporary" workaround for missing VTK wheel on Python 3.10
+    if sys.version_info[:2] == (3, 10):
+        source = "https://github.com/firedrakeproject/VTKPythonPackage/releases/download/firedrake_20220106/"
         if osname == "Darwin":
             if arch == "arm64":
-                source += "vtk-9.0.1-cp39-cp39-macosx_11_0_arm64.whl"
+                source += "vtk-9.1.0.dev0-cp310-cp310-macosx_11_0_arm64.whl"
             elif arch == "x86_64":
-                source += "vtk-9.0.1-cp39-cp39-macosx_10_14_x86_64.whl"
+                source += "vtk-9.1.0.dev0-cp310-cp310-macosx_10_15_x86_64.whl"
             else:
-                log.error("unknown Darwin architecture {0}.".format(arch))
+                log.error("Cannot install VTK for Python 3.10: unknown Darwin architecture {0}.".format(arch))
+                raise InstallError("Cannot install VTK for Python 3.10: unknown Darwin architecture {0}.".format(arch))
         elif osname == "Linux":
-            source += "vtk-9.0.1-cp39-cp39-linux_x86_64.whl"
-        log.info("Pip installing VTK for Python 3.9 to venv")
+            source += "vtk-9.1.0.dev0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"
+        else:
+            log.error("Cannot install VTK for Python 3.10: unknown operating system  {0}.".format(osname))
+            raise InstallError("Cannot install VTK for Python 3.10: unknown operating system {0}.".format(osname))
+        log.info("Pip installing VTK for Python 3.10 to venv")
         run_pip_install([source])
+    if sys.version_info[:2] >= (3, 9):
         # Also lazy-object-proxy
         run_pip(["install", "lazy-object-proxy==1.4.*"])