diff options
| author | Garth N. Wells <gnw20@cam.ac.uk> | 2020-09-09 16:55:06 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-09 10:55:06 -0500 |
| commit | 3dedd2e321ffdcae4bfed4a9ea5df1d505faf70c (patch) | |
| tree | 5a3548d3abf45412cd233901c5990b87f07f2073 | |
| parent | 4c5151327f9398c5c933f5776aae509335c9b967 (diff) | |
| download | spack-3dedd2e321ffdcae4bfed4a9ea5df1d505faf70c.tar.gz spack-3dedd2e321ffdcae4bfed4a9ea5df1d505faf70c.tar.bz2 spack-3dedd2e321ffdcae4bfed4a9ea5df1d505faf70c.tar.xz spack-3dedd2e321ffdcae4bfed4a9ea5df1d505faf70c.zip | |
(py-)fenics-dolfinx: fix dependencies (#18586)
* Fix (py-)fenics-dolfinx dependencies
* flake8 updates
| -rw-r--r-- | var/spack/repos/builtin/packages/fenics-dolfinx/package.py | 8 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/py-fenics-dolfinx/package.py | 7 |
2 files changed, 11 insertions, 4 deletions
diff --git a/var/spack/repos/builtin/packages/fenics-dolfinx/package.py b/var/spack/repos/builtin/packages/fenics-dolfinx/package.py index 30f37b304a..6cdc7e8f66 100644 --- a/var/spack/repos/builtin/packages/fenics-dolfinx/package.py +++ b/var/spack/repos/builtin/packages/fenics-dolfinx/package.py @@ -22,17 +22,17 @@ class FenicsDolfinx(CMakePackage): depends_on("cmake@3.9:", type="build") depends_on("pkgconfig", type="build") depends_on("mpi") - depends_on("hdf5+hl+fortran") - depends_on("boost") + depends_on("hdf5") + depends_on("boost@1.7.0:+filesystem+program_options+timer") depends_on("eigen@3.3.7:") - depends_on("petsc+mpi+shared+hypre+metis") + depends_on("petsc+mpi+shared") 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("py-fenics-ffcx", type=("build", "run")) conflicts('%gcc@:6', msg='C++17 support required') 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 1231f1f23e..f84f9ce565 100644 --- a/var/spack/repos/builtin/packages/py-fenics-dolfinx/package.py +++ b/var/spack/repos/builtin/packages/py-fenics-dolfinx/package.py @@ -17,12 +17,19 @@ class PyFenicsDolfinx(PythonPackage): version("master", branch="master") 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@master") depends_on("py-mpi4py", type=("build", "run")) depends_on("py-petsc4py", type=("build", "run")) depends_on("py-pybind11", type=("build", "run")) + depends_on("py-fenics-ffcx", type=("run")) + depends_on("py-fenics-ufl", type=("run")) + depends_on("py-cffi", type=("run")) + depends_on("py-numpy", type=("run")) + import_modules = ['dolfinx'] phases = ['build_ext', 'build', 'install'] |