Various fixes

spack_repo/scientificcomputing/packages/py_dolfinx_adjoint/package.py

@@ -34,6 +34,8 @@ class PyDolfinxAdjoint(PythonPackage):
     depends_on("py-fenics-dolfinx@main", when="@main", type=("build", "run"))
     depends_on("py-pyadjoint@master", type=("build", "run"))
     depends_on("py-packaging@24.2:", type=("build", "run"))
+    # Disk checkpointing storage; built with MPI for a single shared checkpoint file
+    depends_on("py-h5py+mpi", when="@main", type=("build", "run"))
     depends_on("py-typing-extensions", when="^python@:3.10", type=("build", "run"))
     depends_on("py-setuptools@42:", type="build")
 

spack_repo/scientificcomputing/packages/py_pytetwild/package.py

@@ -21,15 +21,24 @@ class PyPytetwild(PythonPackage):
     version("main", branch="main", submodules=True)
     version("0.2.3", tag="v0.2.3", submodules=True)
     version("0.3.0", tag="v0.3.0", submodules=True)
-    version("0.4.2", sha256="76e9328d67f0359653a3472e2fe51a130e48fc77cfe540040e23946dd163da05")
+    version(
+        "0.4.2", tag="v0.4.2", commit="85c28acd6e1546b7c19b96fd6a5ee5bc2184b176", submodules=True
+    )
 
     depends_on("python@3.10:", type=("build", "run"))
+    depends_on("python@:3.14", when="@0.4:", type=("build", "run"))
     depends_on("py-nanobind@1.3.2:", when="@0.2.3:", type="build")
     depends_on("py-scikit-build-core@0.10: +pyproject", when="@0.2.3:", type="build")
+    depends_on("py-setuptools-scm@8:", when="@0.4:", type="build")
     depends_on("gmp", type="build")
 
     depends_on("py-numpy", type="run")
 
+    def setup_build_environment(self, env: EnvironmentModifications) -> None:
+        # Version is derived from git metadata via setuptools-scm
+        if self.spec.satisfies("@0.4:") and not self.spec.satisfies("@main"):
+            env.set("SETUPTOOLS_SCM_PRETEND_VERSION", str(self.spec.version))
+
     def patch(self):
         if self.spec.satisfies("@0.2.3"):
             # Get nanobind cmake path through python

spack_repo/scientificcomputing/packages/py_scifem/package.py

@@ -37,6 +37,7 @@ class PyScifem(PythonPackage):
     variant("petsc", default=False, description="PETSc support")
     variant("biomed", default=False, description="Biomedical imaging support")
     variant("hdf5", default=False, description="HDF5 support")
+    variant("gmsh", default=True, when="@0.24:", description="Gmsh support")
 
     depends_on("python@3.10:", type=("build", "run"))
 
@@ -74,3 +75,8 @@ class PyScifem(PythonPackage):
 
     with when("+hdf5"):
         depends_on("py-h5py+mpi", when="+hdf5", type=("build", "run"))
+
+    with when("+gmsh"):
+        # Use the source-built gmsh (it ships gmsh.py and puts it on PYTHONPATH) rather
+        # than py-gmsh, whose PyPI wheel links against system X11/GL libraries.
+        depends_on("gmsh+opencascade+shared~fltk", type=("build", "run"))

spack_repo/scientificcomputing/packages/py_textual_image/package.py

@@ -43,8 +43,8 @@ class PyTextualImage(PythonPackage):
     depends_on("py-setuptools", type="build", when="@:0.13")
     depends_on("py-wheel", type="build", when="@:0.13")
 
-    depends_on("py-uv", type="build", when="@0.13:")
-    depends_on("py-hatchling", type="build", when="@0.13:")
+    depends_on("py-hatchling", type="build", when="@0.13")
+    depends_on("py-uv-build@0.11", type="build", when="@0.14:")
 
     depends_on("py-pillow", type=("build", "run"))
     depends_on("py-rich", type=("build", "run"))