Fenicsx packages: updates for 0.1.0 releases (#23836)

6 files changed, 46 insertions, 19 deletions

diff --git a/var/spack/repos/builtin/packages/fenics-basix/package.py b/var/spack/repos/builtin/packages/fenics-basix/package.py
index f2d97cbc74..76808f2388 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"
     git = "https://github.com/FEniCS/basix.git"
     maintainers = ["mscroggs", "chrisrichardson"]
 
     version("main", branch="main")
+    version("0.1.0", sha256="2ab41fe6ad4f6c42f01b17a6e7c39debb4e0ae61c334d1caebee78b741bca4e7")
 
     depends_on("cmake@3.16:", type="build")
-    depends_on("xtensor@0.23.2:", type="build")
-    depends_on("blas")
+    depends_on("xtensor@0.23.4:", type="build")
+    depends_on("blas", type="run")
diff --git a/var/spack/repos/builtin/packages/fenics-dolfinx/package.py b/var/spack/repos/builtin/packages/fenics-dolfinx/package.py
index 7607387afa..7c1b52a4b6 100644
--- a/var/spack/repos/builtin/packages/fenics-dolfinx/package.py
+++ b/var/spack/repos/builtin/packages/fenics-dolfinx/package.py
@@ -11,9 +11,11 @@ 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"]
 
     version("main", branch="main")
+    version("0.1.0", sha256="0269379769b5b6d4d1864ded64402ecaea08054c2a5793c8685ea15a59af5e33")
 
     variant("kahip", default=False, description="kahip support")
     variant("parmetis", default=False, description="parmetis support")
@@ -24,17 +26,21 @@ class FenicsDolfinx(CMakePackage):
     depends_on("mpi")
     depends_on("hdf5")
     depends_on("boost@1.7.0:+filesystem+program_options+timer")
-    depends_on("eigen@3.3.7:")
-    depends_on("petsc+mpi+shared")
+    depends_on("petsc+mpi+shared", when="@main")
+    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"))
-    depends_on("fenics-basix", type=("build", "run"))
-    depends_on("py-fenics-basix", type=("build", "run"))
+    depends_on("py-fenics-ffcx", 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@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@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 9fec47e0db..75dca03d9d 100644
--- a/var/spack/repos/builtin/packages/py-fenics-basix/package.py
+++ b/var/spack/repos/builtin/packages/py-fenics-basix/package.py
@@ -11,17 +11,20 @@ class PyFenicsBasix(PythonPackage):
     environment"""
 
     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"]
 
     version("main", branch="main")
+    version("0.1.0", sha256="2ab41fe6ad4f6c42f01b17a6e7c39debb4e0ae61c334d1caebee78b741bca4e7")
+
+    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("fenics-basix@main", type=("build", "run"))
     depends_on("python@3.6:", type=('build', 'run'))
-    depends_on("eigen@3.3.7:")
     depends_on("py-setuptools", type="build")
     depends_on("cmake@3.18:", type="build")
-    depends_on("py-pybind11@2.6.2:", type="build")
+    depends_on("py-pybind11@2.6.1:2.6.99", 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 d23c7dd508..ec4f268a4d 100644
--- a/var/spack/repos/builtin/packages/py-fenics-dolfinx/package.py
+++ b/var/spack/repos/builtin/packages/py-fenics-dolfinx/package.py
@@ -11,24 +11,32 @@ class PyFenicsDolfinx(PythonPackage):
     environment"""
 
     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"]
 
     version("main", branch="main")
+    version("0.1.0", sha256="0269379769b5b6d4d1864ded64402ecaea08054c2a5793c8685ea15a59af5e33")
 
     depends_on("cmake@3.9:", type="build")
     depends_on("pkgconfig", type=("build", "run"))
     depends_on('python@3.5:', type=('build', 'run'))
     depends_on("py-setuptools", type="build")
-    depends_on("fenics-dolfinx@main")
-    depends_on("fenics-basix@main", type=("build", "run"))
+    depends_on("fenics-dolfinx", 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@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", type=("build", "run"))
+    depends_on("py-pybind11@2.6.1:2.6.99", type=("build", "run"))
 
     depends_on("py-fenics-ffcx", type=("run"))
+    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@0.1.0", type=("run"), when="@0.1.0")
     depends_on("py-fenics-ufl", type=("run"))
+    depends_on("py-fenics-ufl@2021.1.0", type=("run"), when="@0.1.0")
+
     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 53959c1278..8272b7efe6 100644
--- a/var/spack/repos/builtin/packages/py-fenics-ffcx/package.py
+++ b/var/spack/repos/builtin/packages/py-fenics-ffcx/package.py
@@ -10,14 +10,21 @@ 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"
     git = "https://github.com/FEniCS/ffcx.git"
     maintainers = ["js947", "chrisrichardson"]
 
-    version("main", branch="main")
+    version('main', branch='main')
+    version('0.1.0', sha256='98a47906146ac892fb4a358e04cbfd04066f12d0a4cdb505a6b08ff0b1a17e89')
 
     depends_on('python@3.5:', type=('build', 'run'))
-    depends_on("py-setuptools", type=("build", "run"))
-    depends_on("py-cffi", type=("build", "run"))
-    depends_on("py-fenics-ufl@master", type=("build", "run"))
-    depends_on("py-fenics-basix@main", type=("build", "run"))
-    depends_on("py-numpy", type=("build", "run"))
+    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@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@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 7d3aeb9a67..10cfa7437b 100644
--- a/var/spack/repos/builtin/packages/py-fenics-ufl/package.py
+++ b/var/spack/repos/builtin/packages/py-fenics-ufl/package.py
@@ -19,6 +19,7 @@ class PyFenicsUfl(PythonPackage):
     maintainers = ["js947", "chrisrichardson"]
 
     version("master", branch="master")
+    version('2021.1.0',       sha256='130fdc09bb7fcd39dcd2618426912b8a25a03431d94575711068b38c666b4337')
     version('2019.1.0',       sha256='46ac0df4e96327be10b9576d2b8fa8b2c4ca62d3c681d407f5718b162d3ca22d')
     version('2018.1.0',       sha256='b0d4c2f43f396fd5609317b70d55b53b89c649962fc8a593f4e0e21607da211d')
     version('2017.2.0.post0', sha256='111e77707cd6731584b1041f405c2fd3f1752a86c51fd9c430524bd396f293b0')