Fenicsx ecosystem: various updates (#24940)

* Updates for dependencies in main branch

* Add more depends

* Make CMake available at runtime for fenics-dolfinx

* Add maintainer

Co-authored-by: Garth N. Wells <gnw20@cam.ac.uk>

6 files changed, 29 insertions, 24 deletions

diff --git a/var/spack/repos/builtin/packages/fenics-basix/package.py b/var/spack/repos/builtin/packages/fenics-basix/package.py
index dc7f01367c..47fced6e74 100644
--- a/var/spack/repos/builtin/packages/fenics-basix/package.py
+++ b/var/spack/repos/builtin/packages/fenics-basix/package.py
@@ -12,7 +12,7 @@ class FenicsBasix(CMakePackage):
     homepage = "https://github.com/FEniCS/basix"
     url = "https://github.com/FEniCS/basix/archive/0.1.0.tar.gz"
     git = "https://github.com/FEniCS/basix.git"
-    maintainers = ["mscroggs", "chrisrichardson"]
+    maintainers = ["mscroggs", "chrisrichardson", "garth-wells"]
 
     version("main", branch="main")
     version("0.1.0", sha256="2ab41fe6ad4f6c42f01b17a6e7c39debb4e0ae61c334d1caebee78b741bca4e7")
diff --git a/var/spack/repos/builtin/packages/fenics-dolfinx/package.py b/var/spack/repos/builtin/packages/fenics-dolfinx/package.py
index 7c1b52a4b6..a8c0acec74 100644
--- a/var/spack/repos/builtin/packages/fenics-dolfinx/package.py
+++ b/var/spack/repos/builtin/packages/fenics-dolfinx/package.py
@@ -12,7 +12,7 @@ class FenicsDolfinx(CMakePackage):
     homepage = "https://github.com/FEniCS/dolfinx"
     git = "https://github.com/FEniCS/dolfinx.git"
     url = "https://github.com/FEniCS/dolfinx/archive/0.1.0.tar.gz"
-    maintainers = ["js947", "chrisrichardson"]
+    maintainers = ["js947", "chrisrichardson", "garth-wells"]
 
     version("main", branch="main")
     version("0.1.0", sha256="0269379769b5b6d4d1864ded64402ecaea08054c2a5793c8685ea15a59af5e33")
@@ -21,25 +21,29 @@ class FenicsDolfinx(CMakePackage):
     variant("parmetis", default=False, description="parmetis support")
     variant("slepc", default=False, description="slepc support")
 
-    depends_on("cmake@3.9:", type="build")
+    depends_on("cmake@3.12:")
     depends_on("pkgconfig", type="build")
     depends_on("mpi")
     depends_on("hdf5")
     depends_on("boost@1.7.0:+filesystem+program_options+timer")
-    depends_on("petsc+mpi+shared", when="@main")
-    depends_on("petsc+mpi+shared@3.15.0", when="@0.1.0")
+    depends_on("petsc+mpi+shared")
+    depends_on("petsc+mpi+shared@3.15.0:", when="@0.1.0")
     depends_on("scotch+mpi")
 
     depends_on("kahip", when="+kahip")
     depends_on("parmetis", when="+parmetis")
     depends_on("slepc", when="+slepc")
 
-    depends_on("py-fenics-ffcx", type=("build", "run"), when="@main")
+    depends_on("py-fenics-ffcx", type=("build", "run"))
+    depends_on("py-fenics-ffcx@main", type=("build", "run"), when="@main")
     depends_on("py-fenics-ffcx@0.1.0", type=("build", "run"), when="@0.1.0")
 
-    depends_on("fenics-basix", type=("build", "run"), when="@main")
+    depends_on("fenics-basix", type=("build", "run"))
+    depends_on("fenics-basix@main", type=("build", "run"), when="@main")
     depends_on("fenics-basix@0.1.0", type=("build", "run"), when="@0.1.0")
-    depends_on("py-fenics-basix", type=("build", "run"), when="@main")
+
+    depends_on("py-fenics-basix", type=("build", "run"))
+    depends_on("py-fenics-basix@main", type=("build", "run"), when="@main")
     depends_on("py-fenics-basix@0.1.0", type=("build", "run"), when="@0.1.0")
 
     conflicts('%gcc@:8', msg='Improved C++17 support required')
diff --git a/var/spack/repos/builtin/packages/py-fenics-basix/package.py b/var/spack/repos/builtin/packages/py-fenics-basix/package.py
index 75dca03d9d..0cfca370c3 100644
--- a/var/spack/repos/builtin/packages/py-fenics-basix/package.py
+++ b/var/spack/repos/builtin/packages/py-fenics-basix/package.py
@@ -13,7 +13,7 @@ class PyFenicsBasix(PythonPackage):
     homepage = "https://github.com/FEniCS/basix"
     url = "https://github.com/FEniCS/basix/archive/0.1.0.tar.gz"
     git = "https://github.com/FEniCS/basix.git"
-    maintainers = ["chrisrichardson", "mscroggs"]
+    maintainers = ["chrisrichardson", "mscroggs", "garth-wells"]
 
     version("main", branch="main")
     version("0.1.0", sha256="2ab41fe6ad4f6c42f01b17a6e7c39debb4e0ae61c334d1caebee78b741bca4e7")
@@ -21,10 +21,10 @@ class PyFenicsBasix(PythonPackage):
     depends_on("fenics-basix@main", type=("build", "run"), when="@main")
     depends_on("fenics-basix@0.1.0", type=("build", "run"), when="@0.1.0")
 
-    depends_on("python@3.6:", type=('build', 'run'))
+    depends_on("python@3.7:", type=('build', 'run'))
     depends_on("py-setuptools", type="build")
     depends_on("cmake@3.18:", type="build")
-    depends_on("py-pybind11@2.6.1:2.6.99", type="build")
+    depends_on("py-pybind11@2.6.2:", type="build")
 
     phases = ['build_ext', 'build', 'install']
 
diff --git a/var/spack/repos/builtin/packages/py-fenics-dolfinx/package.py b/var/spack/repos/builtin/packages/py-fenics-dolfinx/package.py
index ec4f268a4d..56b0608a93 100644
--- a/var/spack/repos/builtin/packages/py-fenics-dolfinx/package.py
+++ b/var/spack/repos/builtin/packages/py-fenics-dolfinx/package.py
@@ -13,28 +13,29 @@ class PyFenicsDolfinx(PythonPackage):
     homepage = "https://github.com/FEniCS/dolfinx"
     url = "https://github.com/FEniCS/dolfinx/archive/0.1.0.tar.gz"
     git = "https://github.com/FEniCS/dolfinx.git"
-    maintainers = ["js947", "chrisrichardson"]
+    maintainers = ["js947", "chrisrichardson", "garth-wells"]
 
     version("main", branch="main")
     version("0.1.0", sha256="0269379769b5b6d4d1864ded64402ecaea08054c2a5793c8685ea15a59af5e33")
 
-    depends_on("cmake@3.9:", type="build")
+    depends_on("cmake@3.12:", type="build")
+    depends_on("hdf5", type="build")
     depends_on("pkgconfig", type=("build", "run"))
-    depends_on('python@3.5:', type=('build', 'run'))
+    depends_on('python@3.7:', type=('build', 'run'))
     depends_on("py-setuptools", type="build")
-    depends_on("fenics-dolfinx", when="@main")
+    depends_on("fenics-dolfinx@main", when="@main")
     depends_on("fenics-dolfinx@0.1.0", when="@0.1.0")
-    depends_on("fenics-basix", type=("build", "run"), when="@main")
+    depends_on("fenics-basix@main", type=("build", "run"), when="@main")
     depends_on("fenics-basix@0.1.0", type=("build", "run"), when="@0.1.0")
     depends_on("py-mpi4py", type=("build", "run"))
     depends_on("py-petsc4py", type=("build", "run"))
-    depends_on("py-pybind11@2.6.1:2.6.99", type=("build", "run"))
+    depends_on("py-pybind11@2.6.2:", type=("build", "run"))
 
-    depends_on("py-fenics-ffcx", type=("run"))
+    depends_on("py-fenics-ffcx@main", type=("run"), when="@main")
     depends_on("py-fenics-ffcx@0.1.0", type=("run"), when="@0.1.0")
-    depends_on("py-fenics-basix", type=("run"))
+    depends_on("py-fenics-basix", type=("run"), when="@main")
     depends_on("py-fenics-basix@0.1.0", type=("run"), when="@0.1.0")
-    depends_on("py-fenics-ufl", type=("run"))
+    depends_on("py-fenics-ufl@main", type=("run"), when="@main")
     depends_on("py-fenics-ufl@2021.1.0", type=("run"), when="@0.1.0")
 
     depends_on("py-cffi", type=("run"))
diff --git a/var/spack/repos/builtin/packages/py-fenics-ffcx/package.py b/var/spack/repos/builtin/packages/py-fenics-ffcx/package.py
index 8272b7efe6..e9b2d989b9 100644
--- a/var/spack/repos/builtin/packages/py-fenics-ffcx/package.py
+++ b/var/spack/repos/builtin/packages/py-fenics-ffcx/package.py
@@ -12,7 +12,7 @@ class PyFenicsFfcx(PythonPackage):
     homepage = "https://github.com/FEniCS/ffcx"
     url = "https://github.com/FEniCS/ffcx/archive/0.1.0.tar.gz"
     git = "https://github.com/FEniCS/ffcx.git"
-    maintainers = ["js947", "chrisrichardson"]
+    maintainers = ["js947", "chrisrichardson", "garth-wells"]
 
     version('main', branch='main')
     version('0.1.0', sha256='98a47906146ac892fb4a358e04cbfd04066f12d0a4cdb505a6b08ff0b1a17e89')
@@ -21,10 +21,10 @@ class PyFenicsFfcx(PythonPackage):
     depends_on('py-setuptools', type=('build', 'run'))
     depends_on('py-cffi', type=('build', 'run'))
 
-    depends_on('py-fenics-ufl', type=('build', 'run'), when='@main')
+    depends_on('py-fenics-ufl@main', type=('build', 'run'), when='@main')
     depends_on('py-fenics-ufl@2021.1.0', type=('build', 'run'), when='@0.1.0')
 
-    depends_on('py-fenics-basix', type=('build', 'run'), when='@main')
+    depends_on('py-fenics-basix@main', type=('build', 'run'), when='@main')
     depends_on('py-fenics-basix@0.1.0', type=('build', 'run'), when='@0.1.0')
 
     depends_on('py-numpy', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/py-fenics-ufl/package.py b/var/spack/repos/builtin/packages/py-fenics-ufl/package.py
index 6b60848a30..757937beff 100644
--- a/var/spack/repos/builtin/packages/py-fenics-ufl/package.py
+++ b/var/spack/repos/builtin/packages/py-fenics-ufl/package.py
@@ -16,7 +16,7 @@ class PyFenicsUfl(PythonPackage):
     homepage = "https://fenicsproject.org/"
     url = "https://github.com/FEniCS/ufl/archive/2019.1.0.tar.gz"
     git = "https://github.com/FEniCS/ufl.git"
-    maintainers = ["js947", "chrisrichardson"]
+    maintainers = ["js947", "chrisrichardson", "garth-wells"]
 
     version("main", branch="main")
     version('2021.1.0',       sha256='130fdc09bb7fcd39dcd2618426912b8a25a03431d94575711068b38c666b4337')