diff options
7 files changed, 63 insertions, 36 deletions
diff --git a/var/spack/repos/builtin/packages/fenics-basix/package.py b/var/spack/repos/builtin/packages/fenics-basix/package.py index ae6ef1b16c..e4a3833bc0 100644 --- a/var/spack/repos/builtin/packages/fenics-basix/package.py +++ b/var/spack/repos/builtin/packages/fenics-basix/package.py @@ -15,6 +15,7 @@ class FenicsBasix(CMakePackage): maintainers("mscroggs", "chrisrichardson", "garth-wells", "jhale") version("main", branch="main") + version("0.6.0", sha256="687ae53153c98facac4080dcdc7081701db1dcea8c5e7ae3feb72aec17f83304") version("0.5.1", sha256="69133476ac35f0bd0deccb480676030378c341d7dfb2adaca22cd16b7e1dc1cb") version("0.4.2", sha256="a54f5e442b7cbf3dbb6319c682f9161272557bd7f42e2b8b8ccef88bc1b7a22f") version( diff --git a/var/spack/repos/builtin/packages/fenics-dolfinx/package.py b/var/spack/repos/builtin/packages/fenics-dolfinx/package.py index 69bee27efe..c5f617120a 100644 --- a/var/spack/repos/builtin/packages/fenics-dolfinx/package.py +++ b/var/spack/repos/builtin/packages/fenics-dolfinx/package.py @@ -15,6 +15,7 @@ class FenicsDolfinx(CMakePackage): maintainers("chrisrichardson", "garth-wells", "nate-sime", "jhale") version("main", branch="main") + version("0.6.0", sha256="eb8ac2bb2f032b0d393977993e1ab6b4101a84d54023a67206e3eac1a8d79b80") version("0.5.1", sha256="a570e3f6ed8e7c570e7e61d0e6fd44fa9dad2c5f8f1f48a6dc9ad22bacfbc973") version("0.5.0", sha256="503c70c01a44d1ffe48e052ca987693a49f8d201877652cabbe2a44eb3b7c040") version("0.4.1", sha256="68dcf29a26c750fcea5e02d8d58411e3b054313c3bf6fcbc1d0f08dd2851117f") @@ -88,6 +89,7 @@ class FenicsDolfinx(CMakePackage): depends_on("pugixml", when="@0.5.0:") depends_on("fenics-ufcx@main", when="@main") + depends_on("fenics-ufcx@0.6.0:0.6", when="@0.6.0:0.6") depends_on("fenics-ufcx@0.5.0", when="@0.5.1:0.5") depends_on("fenics-ufcx@0.4.2", when="@0.4.1") depends_on("py-fenics-ffcx@0.3.0", type=("build", "run"), when="@0.3.0") @@ -96,6 +98,7 @@ class FenicsDolfinx(CMakePackage): depends_on("py-fenics-ffcx@0.1.0", type=("build", "run"), when="@0.1.0") depends_on("fenics-basix@main", when="@main") + depends_on("fenics-basix@0.6.0:0.6", when="@0.6.0:0.6") depends_on("fenics-basix@0.5.1:0.5", when="@0.5.0:0.5") depends_on("fenics-basix@0.4.2", when="@0.4.1") depends_on("fenics-basix@0.3.0", when="@0.3.0") diff --git a/var/spack/repos/builtin/packages/fenics-ufcx/package.py b/var/spack/repos/builtin/packages/fenics-ufcx/package.py index e6e016c209..3d62d7a149 100644 --- a/var/spack/repos/builtin/packages/fenics-ufcx/package.py +++ b/var/spack/repos/builtin/packages/fenics-ufcx/package.py @@ -9,7 +9,7 @@ from spack.package import * class FenicsUfcx(CMakePackage): """FFCx provides the ufcx.h interface header for generated finite element kernels, used by DOLFINx. ufcx.h can be installed from the FFCx repo - without a Python build or runtime dependancy.""" + without a Python build or runtime dependency.""" homepage = "https://github.com/FEniCS/ffcx" git = "https://github.com/FEniCS/ffcx.git" @@ -17,6 +17,7 @@ class FenicsUfcx(CMakePackage): maintainers("ma595", "jhale") version("main", branch="main") + version("0.6.0", sha256="076fad61d406afffd41019ae1abf6da3f76406c035c772abad2156127667980e") version( "0.5.0.post0", sha256="039908c9998b51ba53e5deb3a97016062c262f0a4285218644304f7d3cd35882" ) 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 ea6e6fdb61..0f8e5744d0 100644 --- a/var/spack/repos/builtin/packages/py-fenics-basix/package.py +++ b/var/spack/repos/builtin/packages/py-fenics-basix/package.py @@ -15,6 +15,7 @@ class PyFenicsBasix(PythonPackage): maintainers("chrisrichardson", "mscroggs", "garth-wells", "jhale") version("main", branch="main") + version("0.6.0", sha256="687ae53153c98facac4080dcdc7081701db1dcea8c5e7ae3feb72aec17f83304") version("0.5.1", sha256="69133476ac35f0bd0deccb480676030378c341d7dfb2adaca22cd16b7e1dc1cb") version("0.4.2", sha256="a54f5e442b7cbf3dbb6319c682f9161272557bd7f42e2b8b8ccef88bc1b7a22f") version( @@ -34,16 +35,20 @@ class PyFenicsBasix(PythonPackage): ) depends_on("fenics-basix@main", type=("build", "run"), when="@main") + depends_on("fenics-basix@0.6.0", type=("build", "run"), when="@0.6.0") depends_on("fenics-basix@0.5.1", type=("build", "run"), when="@0.5.1") depends_on("fenics-basix@0.4.2", type=("build", "run"), when="@0.4.2") 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("py-setuptools@42:", type="build", when="@0.4:") + depends_on("py-setuptools@40:", type="build") + depends_on("py-numpy@1.21:", type=("build", "run")) depends_on("cmake@3.19:", type="build") depends_on("python@3.7:", type=("build", "run")) - depends_on("py-numpy", type=("build", "run")) - depends_on("py-pybind11@2.6.2:", type="build") + depends_on("py-pybind11@2.9.1:", type="build", when="@0.4:") + depends_on("py-pybind11@2.2.4:", type="build") depends_on("xtensor@0.23.10:", type="build", when="@:0.4") 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 712aebd1d5..53e3be6411 100644 --- a/var/spack/repos/builtin/packages/py-fenics-dolfinx/package.py +++ b/var/spack/repos/builtin/packages/py-fenics-dolfinx/package.py @@ -16,6 +16,7 @@ class PyFenicsDolfinx(PythonPackage): maintainers("chrisrichardson", "garth-wells", "nate-sime", "jhale") version("main", branch="main") + version("0.6.0", sha256="eb8ac2bb2f032b0d393977993e1ab6b4101a84d54023a67206e3eac1a8d79b80") version("0.5.1", sha256="a570e3f6ed8e7c570e7e61d0e6fd44fa9dad2c5f8f1f48a6dc9ad22bacfbc973") version("0.5.0", sha256="503c70c01a44d1ffe48e052ca987693a49f8d201877652cabbe2a44eb3b7c040") version("0.4.1", sha256="68dcf29a26c750fcea5e02d8d58411e3b054313c3bf6fcbc1d0f08dd2851117f") @@ -37,10 +38,12 @@ class PyFenicsDolfinx(PythonPackage): depends_on("cmake@3.19:", type="build") depends_on("hdf5", type="build") - depends_on("pkgconfig", type=("build", "run")) + depends_on("pkgconfig", type="build") + depends_on("python@3.8:", type=("build", "run"), when="@0.5:") depends_on("python@3.7:", type=("build", "run")) depends_on("fenics-dolfinx@main", when="@main") + depends_on("fenics-dolfinx@0.6.0", when="@0.6.0") depends_on("fenics-dolfinx@0.5.1", when="@0.5.1") depends_on("fenics-dolfinx@0.5.0", when="@0.5.0") depends_on("fenics-dolfinx@0.4.1", when="@0.4.1") @@ -49,32 +52,37 @@ class PyFenicsDolfinx(PythonPackage): 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.6.0:0.6", type=("build", "link"), when="@0.6.0:0.6") depends_on("fenics-basix@0.5.1:0.5", type=("build", "link"), when="@0.5.0:0.5") depends_on("fenics-basix@0.4.2", type=("build", "link"), when="@0.4.1") 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-fenics-ffcx@main", type="run", when="@main") - depends_on("py-fenics-ffcx@0.5.0.post0", type="run", when="@0.5.0:0.5") - depends_on("py-fenics-ffcx@0.4.2", type="run", when="@0.4.1") - 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-ffcx@main", type=("build", "run"), when="@main") + depends_on("py-fenics-ffcx@0.6", type=("build", "run"), when="@0.6") + depends_on("py-fenics-ffcx@0.5.0.post0", type=("build", "run"), when="@0.5.0:0.5") + depends_on("py-fenics-ffcx@0.4.2", type=("build", "run"), when="@0.4.1") + 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("py-fenics-ufl@main", type="run", when="@main") - depends_on("py-fenics-ufl@2022.2.0", type="run", when="@0.5.0:0.5") - depends_on("py-fenics-ufl@2022.1.0", type="run", when="@0.4.1") - depends_on("py-fenics-ufl@2021.1.0", type="run", when="@0.1:0.3.99") - - depends_on("py-numpy@1.21:", type=("build", "run"), when="@0.5.0:") - depends_on("py-numpy", type=("build", "run")) + depends_on("py-fenics-ufl@main", type=("build", "run"), when="@main") + depends_on("py-fenics-ufl@2023.1", type=("build", "run"), when="@0.6") + depends_on("py-fenics-ufl@2022.2.0", type=("build", "run"), when="@0.5.0:0.5") + depends_on("py-fenics-ufl@2022.1.0", type=("build", "run"), when="@0.4.1") + depends_on("py-fenics-ufl@2021.1.0", type=("build", "run"), when="@0.1:0.3.99") + depends_on("py-numpy@1.21:", type=("build", "run")) 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.7.0:", type=("build", "run"), when="@0.4:") + depends_on("py-pybind11@2.2.4:", type=("build", "run")) depends_on("xtensor@0.23.10:", type="build", when="@:0.5") - depends_on("py-cffi", type="run") + depends_on("py-setuptools@42:", type="build", when="@0.4:") + depends_on("py-setuptools@40:", type="build") + + depends_on("py-cffi", type=("build", "run")) build_directory = "python" 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 6191a08e74..f21011dafd 100644 --- a/var/spack/repos/builtin/packages/py-fenics-ffcx/package.py +++ b/var/spack/repos/builtin/packages/py-fenics-ffcx/package.py @@ -15,6 +15,7 @@ class PyFenicsFfcx(PythonPackage): maintainers("chrisrichardson", "garth-wells", "jhale") version("main", branch="main") + version("0.6.0", sha256="076fad61d406afffd41019ae1abf6da3f76406c035c772abad2156127667980e") version( "0.5.0.post0", sha256="039908c9998b51ba53e5deb3a97016062c262f0a4285218644304f7d3cd35882" ) @@ -36,19 +37,22 @@ class PyFenicsFfcx(PythonPackage): ) depends_on("python@3.7:", type=("build", "run")) - depends_on("py-setuptools@58:", type="build", when="@0.4:") - - depends_on("py-cffi", type="run") - depends_on("py-numpy", type="run") - - depends_on("py-fenics-ufl@main", type="run", when="@main") - depends_on("py-fenics-ufl@2022.2.0", type="run", when="@0.5.0:0.5") - depends_on("py-fenics-ufl@2022.1.0", type="run", when="@0.4.2") - depends_on("py-fenics-ufl@2021.1.0", type="run", when="@0.1.0:0.3") - - depends_on("py-fenics-basix@main", type="run", when="@main") - depends_on("py-fenics-basix@0.5.1:0.5", type="run", when="@0.5.0:0.5") - depends_on("py-fenics-basix@0.4.2", type="run", when="@0.4.2") - 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-setuptools@58:", type=("build", "run"), when="@0.4:") + depends_on("py-setuptools@40:", type=("build", "run")) + + depends_on("py-cffi", type=("build", "run")) + depends_on("py-numpy@1.21:", type=("build", "run")) + + depends_on("py-fenics-ufl@main", type=("build", "run"), when="@main") + depends_on("py-fenics-ufl@2023.1", type=("build", "run"), when="@0.6") + depends_on("py-fenics-ufl@2022.2.0", type=("build", "run"), when="@0.5.0:0.5") + depends_on("py-fenics-ufl@2022.1.0", type=("build", "run"), when="@0.4.2") + depends_on("py-fenics-ufl@2021.1.0", type=("build", "run"), when="@0.1.0:0.3") + + depends_on("py-fenics-basix@main", type=("build", "run"), when="@main") + depends_on("py-fenics-basix@0.6.0:0.6", type=("build", "run"), when="@0.6.0:0.6") + depends_on("py-fenics-basix@0.5.1:0.5", type=("build", "run"), when="@0.5.0:0.5") + depends_on("py-fenics-basix@0.4.2", type=("build", "run"), when="@0.4.2") + depends_on("py-fenics-basix@0.3.0", type=("build", "run"), when="@0.3.0") + depends_on("py-fenics-basix@0.2.0", type=("build", "run"), when="@0.2.0") + depends_on("py-fenics-basix@0.1.0", type=("build", "run"), when="@0.1.0") 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 ca22bc89da..81690fcd11 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,9 @@ class PyFenicsUfl(PythonPackage): maintainers("chrisrichardson", "garth-wells", "jhale") version("main", branch="main") + version( + "2023.1.1.post0", sha256="9e6e87f1447635029cec42604f62a76bba84899beb4b8822af10389d1f93a9b6" + ) version("2022.2.0", sha256="d6e18e06df5d7a626c3138d49a543914d68186afb6159c4d1a7cd72b2a199b02") version("2022.1.0", sha256="48359903d47fb397900d105fe4a60b459c50bbf9d9da78beb9accb54e4e4acaf") version("2021.1.0", sha256="130fdc09bb7fcd39dcd2618426912b8a25a03431d94575711068b38c666b4337") @@ -34,4 +37,6 @@ class PyFenicsUfl(PythonPackage): version("2016.2.0", tag="ufl-2016.2.0") depends_on("python@3.7:", type=("build", "run")) - depends_on("py-numpy", type=("build", "run")) + depends_on("py-setuptools@58:", type=("build", "run"), when="@2022.1.0:") + depends_on("py-setuptools@40:", type=("build", "run")) + depends_on("py-numpy@1.21:", type=("build", "run")) |