From 711ed176063f28faee9632f4d41a700b1a0e7f29 Mon Sep 17 00:00:00 2001 From: "Garth N. Wells" Date: Fri, 30 Jul 2021 10:32:28 +0100 Subject: FEniCSx: updated dependencies (#25110) Co-authored-by: Massimiliano Culpo --- .../repos/builtin/packages/fenics-basix/package.py | 4 ++-- .../builtin/packages/fenics-dolfinx/package.py | 13 +++++------- .../builtin/packages/py-fenics-basix/package.py | 3 ++- .../builtin/packages/py-fenics-dolfinx/package.py | 23 +++++++++++----------- .../builtin/packages/py-fenics-ffcx/package.py | 14 ++++++------- .../builtin/packages/py-fenics-ufl/package.py | 2 +- 6 files changed, 28 insertions(+), 31 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/fenics-basix/package.py b/var/spack/repos/builtin/packages/fenics-basix/package.py index 47fced6e74..3479510a41 100644 --- a/var/spack/repos/builtin/packages/fenics-basix/package.py +++ b/var/spack/repos/builtin/packages/fenics-basix/package.py @@ -17,6 +17,6 @@ class FenicsBasix(CMakePackage): version("main", branch="main") version("0.1.0", sha256="2ab41fe6ad4f6c42f01b17a6e7c39debb4e0ae61c334d1caebee78b741bca4e7") - depends_on("cmake@3.16:", type="build") - depends_on("xtensor@0.23.4:", type="build") + depends_on("cmake@3.18:", type="build") + depends_on("xtensor@0.23.10:") depends_on("blas", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/fenics-dolfinx/package.py b/var/spack/repos/builtin/packages/fenics-dolfinx/package.py index a8c0acec74..0f74ef4ea5 100644 --- a/var/spack/repos/builtin/packages/fenics-dolfinx/package.py +++ b/var/spack/repos/builtin/packages/fenics-dolfinx/package.py @@ -21,7 +21,7 @@ class FenicsDolfinx(CMakePackage): variant("parmetis", default=False, description="parmetis support") variant("slepc", default=False, description="slepc support") - depends_on("cmake@3.12:") + depends_on("cmake@3.18:", type="build") depends_on("pkgconfig", type="build") depends_on("mpi") depends_on("hdf5") @@ -29,6 +29,7 @@ class FenicsDolfinx(CMakePackage): depends_on("petsc+mpi+shared") depends_on("petsc+mpi+shared@3.15.0:", when="@0.1.0") depends_on("scotch+mpi") + depends_on("xtensor@0.23.10:", type=("build", "link")) depends_on("kahip", when="+kahip") depends_on("parmetis", when="+parmetis") @@ -38,13 +39,9 @@ class FenicsDolfinx(CMakePackage): 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")) - 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")) - 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("fenics-basix", type=("build", "link")) + depends_on("fenics-basix@main", type=("build", "link"), when="@main") + 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 0cfca370c3..ca3e5e9d2b 100644 --- a/var/spack/repos/builtin/packages/py-fenics-basix/package.py +++ b/var/spack/repos/builtin/packages/py-fenics-basix/package.py @@ -24,7 +24,8 @@ class PyFenicsBasix(PythonPackage): 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.2:", type="build") + depends_on("xtensor@0.23.10:", type="build") + depends_on("py-pybind11@2.6.2:2.7.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 56b0608a93..bc5d411658 100644 --- a/var/spack/repos/builtin/packages/py-fenics-dolfinx/package.py +++ b/var/spack/repos/builtin/packages/py-fenics-dolfinx/package.py @@ -18,28 +18,27 @@ class PyFenicsDolfinx(PythonPackage): version("main", branch="main") version("0.1.0", sha256="0269379769b5b6d4d1864ded64402ecaea08054c2a5793c8685ea15a59af5e33") - depends_on("cmake@3.12:", type="build") + depends_on("cmake@3.18:", type="build") depends_on("hdf5", type="build") depends_on("pkgconfig", type=("build", "run")) 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.1.0", when="@0.1.0") - 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", "link"), when="@main") + depends_on("fenics-basix@0.1.0", type=("build", "link"), when="@0.1.0") depends_on("py-mpi4py", type=("build", "run")) depends_on("py-petsc4py", type=("build", "run")) - depends_on("py-pybind11@2.6.2:", 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.1.0", type=("run"), when="@0.1.0") - 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@main", type=("run"), when="@main") - depends_on("py-fenics-ufl@2021.1.0", type=("run"), when="@0.1.0") + 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-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")) - depends_on("py-numpy", type=("run")) + depends_on("py-cffi", type="run") + depends_on("py-numpy", type="run") phases = ['build_ext', 'build', 'install'] 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 e9b2d989b9..a5d4ceeb73 100644 --- a/var/spack/repos/builtin/packages/py-fenics-ffcx/package.py +++ b/var/spack/repos/builtin/packages/py-fenics-ffcx/package.py @@ -17,14 +17,14 @@ class PyFenicsFfcx(PythonPackage): version('main', branch='main') version('0.1.0', sha256='98a47906146ac892fb4a358e04cbfd04066f12d0a4cdb505a6b08ff0b1a17e89') - depends_on('python@3.5:', type=('build', 'run')) + depends_on('python@3.7:', type=('build', 'run')) depends_on('py-setuptools', type=('build', 'run')) - depends_on('py-cffi', type=('build', 'run')) + depends_on('py-cffi', type='run') - 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-ufl@main', type='run', when='@main') + depends_on('py-fenics-ufl@2021.1.0', type='run', when='@0.1.0') - 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-fenics-basix@main', type='run', when='@main') + depends_on('py-fenics-basix@0.1.0', type='run', when='@0.1.0') - depends_on('py-numpy', type=('build', 'run')) + depends_on('py-numpy', type='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 757937beff..b23326123c 100644 --- a/var/spack/repos/builtin/packages/py-fenics-ufl/package.py +++ b/var/spack/repos/builtin/packages/py-fenics-ufl/package.py @@ -27,6 +27,6 @@ class PyFenicsUfl(PythonPackage): version('2017.1.0.post1', sha256='82c8170f44c2392c7e60aa86495df22cc209af50735af8115dc35aeda4b0ca96') version('2016.2.0', tag='ufl-2016.2.0') - depends_on("python@3.5:", type=('build', 'run')) + depends_on("python@3.7:", type=('build', 'run')) depends_on("py-setuptools", type="build") depends_on("py-numpy", type=("build", "run")) -- cgit v1.2.3-60-g2f50