JDBetteridge/python3.13

docs/source/download.rst

@@ -107,7 +107,7 @@ packages can be installed into an existing Firedrake installation using
 System requirements
 -------------------
 
-Firedrake requires Python 3.9 to 3.12. The installation script is
+Firedrake requires Python 3.9 to 3.13. The installation script is
 tested by CI on Ubuntu 24.04 LTS. On Ubuntu 22.04 or later, the system
 installed Python 3 is supported. On MacOS, the homebrew_ installed
 Python 3 is supported::
@@ -126,7 +126,7 @@ they have the system dependencies:
 * A Fortran compiler (for PETSc)
 * Blas and Lapack
 * Git, Mercurial
-* Python version 3.9-3.12
+* Python version 3.9-3.13
 * The Python headers
 * autoconf, automake, libtool
 * CMake

docs/source/install-debug.dot

@@ -16,7 +16,7 @@ digraph triage {
 
     activate_venv [label="Activate the\nvenv first."];
     uninstall_anaconda [label="Deactivate\nAnaconda."];
-    update_python [label="Get Python 3.9-3.12"];
+    update_python [label="Get Python 3.9-3.13"];
     update_install_script [label="Fetch new\ninstall script"];
     get_homebrew [label="Use Homebrew."];
     brew_doctor [label="brew doctor"];

requirements-ext.txt

@@ -1,6 +1,5 @@
 cached_property
 cachetools
-ipython
 nbval
 packaging
 pkgconfig

scripts/firedrake-install

@@ -132,10 +132,10 @@ log = logging.getLogger()
 
 log.info("Running %s" % " ".join(sys.argv))
 
-if sys.version_info >= (3, 13):
-    print("""\nCan not install Firedrake with Python 3.13 at the moment:
-Some wheels are not yet available for Python 3.13 for some required package(s).
-Please install with Python 3.12 (or an earlier version >= 3.9).""")
+if sys.version_info >= (3, 14):
+    print("""\nCan not install Firedrake with Python 3.14 at the moment:
+Some wheels are not yet available for Python 3.14 for some required package(s).
+Please install with Python 3.13 (or an earlier version >= 3.9).""")
     sys.exit(1)
 elif sys.version_info < (3, 9):
     if mode == "install":
@@ -306,6 +306,7 @@ honoured.""",
     parser.add_argument("--mpiexec", type=str,
                         action="store", default=None,
                         help="MPI launcher. If not set, MPICH will be downloaded and used.")
+    parser.add_argument("--mpi4py-version", help="Specify an exact version of mpi4py to install")
     parser.add_argument("--show-petsc-configure-options", action="store_true",
                         help="Print out the configure options passed to PETSc and exit")
     parser.add_argument("--show-dependencies", action="store_true",
@@ -442,6 +443,7 @@ else:
                         help="Specify path to system BLAS directory. Use '--with-blas=download' to download openblas")
     parser.add_argument("--netgen", action="store_true", dest="netgen", default=config["options"].get("netgen", False),
                         help="Install Netgen.")
+    parser.add_argument("--mpi4py-version", help="Specify an exact version of mpi4py to install")
 
     args = parser.parse_args()
 
@@ -1703,6 +1705,7 @@ if mode == "install":
 
 # Ensure pip, setuptools, hatchling and wheel are at the latest version.
 run_pip(["install", "-U", "setuptools"])
+run_pip(["install", "cffi"])
 run_pip(["install", "-U", "hatch"])
 run_pip(["install", "-U", "editables"])
 run_pip(["install", "-U", "pip"])
@@ -1856,7 +1859,10 @@ if mode == "install":
 
     # Install mpi4py
     with environment(**compiler_env, **link_env):
-        run_pip_install(["--no-cache-dir", "mpi4py==3.1.6"])
+        if args.mpi4py_version:
+            run_pip_install(["--no-cache-dir", "mpi4py==" + args.mpi4py_version])
+        else:
+            run_pip_install(["--no-cache-dir", "mpi4py"])
 
     for p in packages:
         pip_requirements(p, compiler_env)
@@ -2001,7 +2007,10 @@ else:
 
     # Install mpi4py
     with environment(**compiler_env, **link_env):
-        run_pip_install(["--no-cache-dir", "mpi4py==3.1.6"])
+        if args.mpi4py_version:
+            run_pip_install(["--no-cache-dir", "mpi4py==" + args.mpi4py_version])
+        else:
+            run_pip_install(["--no-cache-dir", "mpi4py"])
 
     # update dependencies.
     for p in packages:

tests/output/test_pvd_output.py

@@ -6,6 +6,7 @@
 from firedrake import *
 
 try:
+    import vtkmodules.vtkCommonDataModel  # noqa: F401
     from firedrake.output import VTKFile
 except ImportError:
     # VTK is not installed