FEniCSx packages: add version 0.3.0 (#25627)

5 files changed, 33 insertions, 8 deletions

diff --git a/var/spack/repos/builtin/packages/fenics-basix/package.py b/var/spack/repos/builtin/packages/fenics-basix/package.py
index da61c4be4e..e86d653a59 100644
--- a/var/spack/repos/builtin/packages/fenics-basix/package.py
+++ b/var/spack/repos/builtin/packages/fenics-basix/package.py
@@ -10,11 +10,13 @@ class FenicsBasix(CMakePackage):
     """FEniCS element and quadrature runtime"""
 
     homepage = "https://github.com/FEniCS/basix"
-    url = "https://github.com/FEniCS/basix/archive/0.1.0.tar.gz"
+    url = "https://github.com/FEniCS/basix/archive/v0.1.0.tar.gz"
     git = "https://github.com/FEniCS/basix.git"
     maintainers = ["mscroggs", "chrisrichardson", "garth-wells"]
 
     version("main", branch="main")
+    version("0.3.0", sha256="9b148fd2a5485c94011fc6ca977ebdef0e51782a62b3654fc044f35b60e2bd07")
+    version("0.2.0", sha256="e1ec537737adb283717060221635092474e3f2b5b5ba79dfac74aa496bec2fcb")
     version("0.1.0", sha256="2ab41fe6ad4f6c42f01b17a6e7c39debb4e0ae61c334d1caebee78b741bca4e7")
 
     depends_on("cmake@3.18:", type="build")
diff --git a/var/spack/repos/builtin/packages/fenics-dolfinx/package.py b/var/spack/repos/builtin/packages/fenics-dolfinx/package.py
index 0f74ef4ea5..1266b7e166 100644
--- a/var/spack/repos/builtin/packages/fenics-dolfinx/package.py
+++ b/var/spack/repos/builtin/packages/fenics-dolfinx/package.py
@@ -11,10 +11,12 @@ 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"
+    url = "https://github.com/FEniCS/dolfinx/archive/v0.1.0.tar.gz"
     maintainers = ["js947", "chrisrichardson", "garth-wells"]
 
     version("main", branch="main")
+    version("0.3.0", sha256="4857d0fcb44a4e9bf9eb298ba5377abdee17a7ad0327448bdd06cce73d109bed")
+    version("0.2.0", sha256="4c9b5a5c7ef33882c99299c9b4d98469fb7aa470a37a91bc5be3bb2fc5b863a4")
     version("0.1.0", sha256="0269379769b5b6d4d1864ded64402ecaea08054c2a5793c8685ea15a59af5e33")
 
     variant("kahip", default=False, description="kahip support")
@@ -24,7 +26,7 @@ class FenicsDolfinx(CMakePackage):
     depends_on("cmake@3.18:", type="build")
     depends_on("pkgconfig", type="build")
     depends_on("mpi")
-    depends_on("hdf5")
+    depends_on("hdf5+mpi")
     depends_on("boost@1.7.0:+filesystem+program_options+timer")
     depends_on("petsc+mpi+shared")
     depends_on("petsc+mpi+shared@3.15.0:", when="@0.1.0")
@@ -37,10 +39,14 @@ class FenicsDolfinx(CMakePackage):
 
     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.3.0", type=("build", "run"), when="@0.3.0")
+    depends_on("py-fenics-ffcx@0.2.0", type=("build", "run"), when="@0.2.0")
     depends_on("py-fenics-ffcx@0.1.0", type=("build", "run"), when="@0.1.0")
 
     depends_on("fenics-basix", type=("build", "link"))
     depends_on("fenics-basix@main", type=("build", "link"), when="@main")
+    depends_on("fenics-basix@0.3.0", type=("build", "link"), when="@0.3.0")
+    depends_on("fenics-basix@0.2.0", type=("build", "link"), when="@0.2.0")
     depends_on("fenics-basix@0.1.0", type=("build", "link"), 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 01054602da..1f5c567059 100644
--- a/var/spack/repos/builtin/packages/py-fenics-basix/package.py
+++ b/var/spack/repos/builtin/packages/py-fenics-basix/package.py
@@ -11,14 +11,18 @@ class PyFenicsBasix(PythonPackage):
     environment"""
 
     homepage = "https://github.com/FEniCS/basix"
-    url = "https://github.com/FEniCS/basix/archive/0.1.0.tar.gz"
+    url = "https://github.com/FEniCS/basix/archive/v0.1.0.tar.gz"
     git = "https://github.com/FEniCS/basix.git"
     maintainers = ["chrisrichardson", "mscroggs", "garth-wells"]
 
     version("main", branch="main")
+    version("0.3.0", sha256="9b148fd2a5485c94011fc6ca977ebdef0e51782a62b3654fc044f35b60e2bd07")
+    version("0.2.0", sha256="e1ec537737adb283717060221635092474e3f2b5b5ba79dfac74aa496bec2fcb")
     version("0.1.0", sha256="2ab41fe6ad4f6c42f01b17a6e7c39debb4e0ae61c334d1caebee78b741bca4e7")
 
     depends_on("fenics-basix@main", type=("build", "run"), when="@main")
+    depends_on("fenics-basix@0.3.0", type=("build", "run"), when="@0.3.0")
+    depends_on("fenics-basix@0.2.0", type=("build", "run"), when="@0.2.0")
     depends_on("fenics-basix@0.1.0", type=("build", "run"), when="@0.1.0")
 
     depends_on("python@3.7:", type=('build', 'run'))
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 bc5d411658..bb5d442be3 100644
--- a/var/spack/repos/builtin/packages/py-fenics-dolfinx/package.py
+++ b/var/spack/repos/builtin/packages/py-fenics-dolfinx/package.py
@@ -11,11 +11,13 @@ class PyFenicsDolfinx(PythonPackage):
     environment"""
 
     homepage = "https://github.com/FEniCS/dolfinx"
-    url = "https://github.com/FEniCS/dolfinx/archive/0.1.0.tar.gz"
+    url = "https://github.com/FEniCS/dolfinx/archive/v0.1.0.tar.gz"
     git = "https://github.com/FEniCS/dolfinx.git"
     maintainers = ["js947", "chrisrichardson", "garth-wells"]
 
     version("main", branch="main")
+    version("0.3.0", sha256="4857d0fcb44a4e9bf9eb298ba5377abdee17a7ad0327448bdd06cce73d109bed")
+    version("0.2.0", sha256="4c9b5a5c7ef33882c99299c9b4d98469fb7aa470a37a91bc5be3bb2fc5b863a4")
     version("0.1.0", sha256="0269379769b5b6d4d1864ded64402ecaea08054c2a5793c8685ea15a59af5e33")
 
     depends_on("cmake@3.18:", type="build")
@@ -24,18 +26,25 @@ class PyFenicsDolfinx(PythonPackage):
     depends_on('python@3.7:', type=('build', 'run'))
     depends_on("py-setuptools", type="build")
     depends_on("fenics-dolfinx@main", when="@main")
+    depends_on("fenics-dolfinx@0.3.0", when="@0.3.0")
+    depends_on("fenics-dolfinx@0.2.0", when="@0.2.0")
     depends_on("fenics-dolfinx@0.1.0", when="@0.1.0")
     depends_on("fenics-basix@main", type=("build", "link"), when="@main")
+    depends_on("fenics-basix@0.3.0", type=("build", "link"), when="@0.3.0")
+    depends_on("fenics-basix@0.2.0", type=("build", "link"), when="@0.2.0")
     depends_on("fenics-basix@0.1.0", type=("build", "link"), when="@0.1.0")
+    depends_on("py-numpy@:1.20.3", type=("build", "run"))
     depends_on("py-mpi4py", type=("build", "run"))
     depends_on("py-petsc4py", type=("build", "run"))
     depends_on("py-pybind11@2.6.2:2.7.99", type=("build", "run"))
     depends_on("xtensor@0.23.10:", type="build")
 
     depends_on("py-fenics-ffcx@main", type="run", when="@main")
+    depends_on("py-fenics-ffcx@0.3.0", type="run", when="@0.3.0")
+    depends_on("py-fenics-ffcx@0.2.0", type="run", when="@0.2.0")
     depends_on("py-fenics-ffcx@0.1.0", type="run", when="@0.1.0")
     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-fenics-ufl@2021.1.0", type="run", when="@0.1:")
 
     depends_on("py-cffi", type="run")
     depends_on("py-numpy", 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 a5d4ceeb73..8220ce2c53 100644
--- a/var/spack/repos/builtin/packages/py-fenics-ffcx/package.py
+++ b/var/spack/repos/builtin/packages/py-fenics-ffcx/package.py
@@ -10,11 +10,13 @@ class PyFenicsFfcx(PythonPackage):
     """Next generation FEniCS Form Compiler"""
 
     homepage = "https://github.com/FEniCS/ffcx"
-    url = "https://github.com/FEniCS/ffcx/archive/0.1.0.tar.gz"
+    url = "https://github.com/FEniCS/ffcx/archive/v0.1.0.tar.gz"
     git = "https://github.com/FEniCS/ffcx.git"
     maintainers = ["js947", "chrisrichardson", "garth-wells"]
 
     version('main', branch='main')
+    version('0.3.0', sha256='33fa1a0cc5762f360033c25a99ec9462be933f8ba413279e35cd2c3b5c3e6096')
+    version('0.2.0', sha256='562a704163a6427e0341d267e69b8bf55d8f53d673829170b443191577e8d9b6')
     version('0.1.0', sha256='98a47906146ac892fb4a358e04cbfd04066f12d0a4cdb505a6b08ff0b1a17e89')
 
     depends_on('python@3.7:', type=('build', 'run'))
@@ -22,9 +24,11 @@ class PyFenicsFfcx(PythonPackage):
     depends_on('py-cffi', 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-fenics-ufl@2021.1.0', type='run', when='@0.1:')
 
     depends_on('py-fenics-basix@main', type='run', when='@main')
+    depends_on('py-fenics-basix@0.3.0', type='run', when='@0.3.0')
+    depends_on('py-fenics-basix@0.2.0', type='run', when='@0.2.0')
     depends_on('py-fenics-basix@0.1.0', type='run', when='@0.1.0')
 
     depends_on('py-numpy', type='run')