forked from spack/spack
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fenicsx: remove deprecated versions (spack#44223)
- Loading branch information
1 parent
e0bf366
commit f99f642
Showing
6 changed files
with
16 additions
and
147 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -20,31 +20,12 @@ class FenicsBasix(CMakePackage): | |
| version("0.8.0", sha256="b299af82daf8fa3e4845e17f202491fe71b313bf6ab64c767a5287190b3dd7fe") | ||
| version("0.7.0", sha256="9bee81b396ee452eec8d9735f278cb44cb6994c6bc30aec8ed9bb4b12d83fa7f") | ||
| version("0.6.0", sha256="687ae53153c98facac4080dcdc7081701db1dcea8c5e7ae3feb72aec17f83304") | ||
| version( | ||
| "0.5.1", | ||
| sha256="69133476ac35f0bd0deccb480676030378c341d7dfb2adaca22cd16b7e1dc1cb", | ||
| deprecated=True, | ||
| ) | ||
| version( | ||
| "0.4.2", | ||
| sha256="a54f5e442b7cbf3dbb6319c682f9161272557bd7f42e2b8b8ccef88bc1b7a22f", | ||
| deprecated=True, | ||
| ) | ||
|
|
||
| depends_on("[email protected]:", type="build") | ||
| depends_on("blas") | ||
| depends_on("lapack") | ||
|
|
||
| depends_on("[email protected]:", when="@:0.4") | ||
| depends_on("[email protected]:", when="@:0.4") | ||
|
|
||
| conflicts( | ||
| "%gcc@:9.10", when="@0.5.0:", msg="fenics-basix requires GCC-10 or newer for C++20 support" | ||
| ) | ||
| conflicts( | ||
| "%clang@:9.10", | ||
| when="@0.5.0:", | ||
| msg="fenics-basix requires Clang-10 or newer for C++20 support", | ||
| ) | ||
| conflicts("%gcc@:9.10", msg="fenics-basix requires GCC-10 or newer for C++20 support") | ||
| conflicts("%clang@:9.10", msg="fenics-basix requires Clang-10 or newer for C++20 support") | ||
|
|
||
| root_cmakelists_dir = "cpp" | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -20,32 +20,6 @@ class FenicsDolfinx(CMakePackage): | |
| version("0.8.0", sha256="acf3104d9ecc0380677a6faf69eabfafc58d0cce43f7777e1307b95701c7cad9") | ||
| version("0.7.2", sha256="7d9ce1338ce66580593b376327f23ac464a4ce89ef63c105efc1a38e5eae5c0b") | ||
| version("0.6.0", sha256="eb8ac2bb2f032b0d393977993e1ab6b4101a84d54023a67206e3eac1a8d79b80") | ||
| version( | ||
| "0.5.1", | ||
| sha256="a570e3f6ed8e7c570e7e61d0e6fd44fa9dad2c5f8f1f48a6dc9ad22bacfbc973", | ||
| deprecated=True, | ||
| ) | ||
| version( | ||
| "0.5.0", | ||
| sha256="503c70c01a44d1ffe48e052ca987693a49f8d201877652cabbe2a44eb3b7c040", | ||
| deprecated=True, | ||
| ) | ||
| version( | ||
| "0.4.1", | ||
| sha256="68dcf29a26c750fcea5e02d8d58411e3b054313c3bf6fcbc1d0f08dd2851117f", | ||
| deprecated=True, | ||
| ) | ||
|
|
||
| conflicts( | ||
| "%gcc@:9.10", | ||
| when="@0.5.0:", | ||
| msg="fenics-dolfinx requires GCC-10 or newer for C++20 support", | ||
| ) | ||
| conflicts( | ||
| "%clang@:9.10", | ||
| when="@0.5.0:", | ||
| msg="fenics-dolfinx requires Clang-10 or newer for C++20 support", | ||
| ) | ||
|
|
||
| # Graph partitioner variants | ||
| variant( | ||
|
|
@@ -57,8 +31,7 @@ class FenicsDolfinx(CMakePackage): | |
| ) | ||
|
|
||
| # Graph partitioner dependencies | ||
| depends_on("[email protected]:", when="partitioners=kahip @0.5.0:") | ||
| depends_on("[email protected]", when="partitioners=kahip @:0.4.1") | ||
| depends_on("[email protected]:", when="partitioners=kahip") | ||
| depends_on("parmetis", when="partitioners=parmetis") | ||
| depends_on("scotch+mpi", when="partitioners=scotch") | ||
|
|
||
|
|
@@ -70,42 +43,26 @@ class FenicsDolfinx(CMakePackage): | |
| depends_on("mpi") | ||
| depends_on("hdf5+mpi") | ||
| depends_on("[email protected]:+filesystem+program_options+timer") | ||
| depends_on("pugixml") | ||
| depends_on("spdlog", when="@0.9:") | ||
|
|
||
| depends_on("petsc+mpi+shared") | ||
|
|
||
| depends_on("[email protected]:", when="@:0.5") | ||
| depends_on("[email protected]:", when="@:0.5") | ||
|
|
||
| depends_on("slepc", when="+slepc") | ||
| depends_on("adios2+mpi", when="+adios2") | ||
| depends_on("pugixml", when="@0.5.0:") | ||
|
|
||
| depends_on("fenics-ufcx@main", when="@main") | ||
| depends_on("[email protected]", when="@0.8") | ||
| depends_on("[email protected]", when="@0.7") | ||
| depends_on("[email protected]:0.6", when="@0.6.0:0.6") | ||
| depends_on("[email protected]", when="@0.5.1:0.5") | ||
| depends_on("[email protected]", when="@0.4.1") | ||
| depends_on("[email protected]", when="@0.6") | ||
|
|
||
| depends_on("fenics-basix@main", when="@main") | ||
| depends_on("[email protected]", when="@0.8") | ||
| depends_on("[email protected]", when="@0.7") | ||
| depends_on("[email protected]:0.6", when="@0.6.0:0.6") | ||
| depends_on("[email protected]:0.5", when="@0.5.0:0.5") | ||
| depends_on("[email protected]", when="@0.4.1") | ||
|
|
||
| conflicts( | ||
| "%gcc@:9.10", | ||
| when="@0.5.0:", | ||
| msg="fenics-dolfinx requires GCC-10 or newer for C++20 support", | ||
| ) | ||
| conflicts( | ||
| "%clang@:9.10", | ||
| when="@0.5.0:", | ||
| msg="fenics-dolfinx requires Clang-10 or newer for C++20 support", | ||
| ) | ||
| conflicts("%gcc@:8", msg="fenics-dolfinx requires GCC-9 or newer for improved C++17 support") | ||
| depends_on("[email protected]", when="@0.6") | ||
|
|
||
| conflicts("%gcc@:9.10", msg="fenics-dolfinx requires GCC-10 or newer for C++20 support") | ||
| conflicts("%clang@:9.10", msg="fenics-dolfinx requires Clang-10 or newer for C++20 support") | ||
|
|
||
| root_cmakelists_dir = "cpp" | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -22,21 +22,6 @@ class FenicsUfcx(CMakePackage): | |
| version("0.8.0", sha256="8a854782dbd119ec1c23c4522a2134d5281e7f1bd2f37d64489f75da055282e3") | ||
| version("0.7.0", sha256="7f3c3ca91d63ce7831d37799cc19d0551bdcd275bdfa4c099711679533dd1c71") | ||
| version("0.6.0", sha256="076fad61d406afffd41019ae1abf6da3f76406c035c772abad2156127667980e") | ||
| version( | ||
| "0.5.0.post0", | ||
| sha256="039908c9998b51ba53e5deb3a97016062c262f0a4285218644304f7d3cd35882", | ||
| deprecated=True, | ||
| ) | ||
| version( | ||
| "0.5.0", | ||
| sha256="3413409e5885e41e220f99e0f95cc817e94c4931143d1f700c6e0c5e1bfad1f6", | ||
| deprecated=True, | ||
| ) | ||
| version( | ||
| "0.4.2", | ||
| sha256="3be6eef064d6ef907245db5b6cc15d4e603762e68b76e53e099935ca91ef1ee4", | ||
| deprecated=True, | ||
| ) | ||
|
|
||
| depends_on("[email protected]:", type="build") | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -20,27 +20,15 @@ class PyFenicsBasix(PythonPackage): | |
| version("0.8.0", sha256="b299af82daf8fa3e4845e17f202491fe71b313bf6ab64c767a5287190b3dd7fe") | ||
| version("0.7.0", sha256="9bee81b396ee452eec8d9735f278cb44cb6994c6bc30aec8ed9bb4b12d83fa7f") | ||
| version("0.6.0", sha256="687ae53153c98facac4080dcdc7081701db1dcea8c5e7ae3feb72aec17f83304") | ||
| version( | ||
| "0.5.1", | ||
| sha256="69133476ac35f0bd0deccb480676030378c341d7dfb2adaca22cd16b7e1dc1cb", | ||
| deprecated=True, | ||
| ) | ||
| version( | ||
| "0.4.2", | ||
| sha256="a54f5e442b7cbf3dbb6319c682f9161272557bd7f42e2b8b8ccef88bc1b7a22f", | ||
| deprecated=True, | ||
| ) | ||
|
|
||
| depends_on("fenics-basix@main", type=("build", "run"), when="@main") | ||
| depends_on("[email protected]", type=("build", "run"), when="@0.8.0") | ||
| depends_on("[email protected]", type=("build", "run"), when="@0.7.0") | ||
| depends_on("[email protected]", type=("build", "run"), when="@0.6.0") | ||
| depends_on("[email protected]", type=("build", "run"), when="@0.5.1") | ||
| depends_on("[email protected]", type=("build", "run"), when="@0.4.2") | ||
|
|
||
| # See python/CMakeLists.txt | ||
| depends_on("[email protected]:", when="@:0.7", type="build") | ||
| depends_on("[email protected]:", when="@0.8:", type="build") | ||
| depends_on("[email protected]:", when="@:0.7", type="build") | ||
|
|
||
| # See python/pyproject.toml | ||
| depends_on("[email protected]:", when="@0.8:", type=("build", "run")) | ||
|
|
@@ -51,6 +39,4 @@ class PyFenicsBasix(PythonPackage): | |
| depends_on("[email protected]:", when="@0.8:", type="build") | ||
| depends_on("[email protected]:", when="@0.8:", type="build") | ||
|
|
||
| depends_on("[email protected]:", type="build", when="@:0.4") | ||
|
|
||
| build_directory = "python" | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -21,62 +21,37 @@ class PyFenicsDolfinx(PythonPackage): | |
| version("0.8.0", sha256="acf3104d9ecc0380677a6faf69eabfafc58d0cce43f7777e1307b95701c7cad9") | ||
| version("0.7.2", sha256="7d9ce1338ce66580593b376327f23ac464a4ce89ef63c105efc1a38e5eae5c0b") | ||
| version("0.6.0", sha256="eb8ac2bb2f032b0d393977993e1ab6b4101a84d54023a67206e3eac1a8d79b80") | ||
| version( | ||
| "0.5.1", | ||
| sha256="a570e3f6ed8e7c570e7e61d0e6fd44fa9dad2c5f8f1f48a6dc9ad22bacfbc973", | ||
| deprecated=True, | ||
| ) | ||
| version( | ||
| "0.5.0", | ||
| sha256="503c70c01a44d1ffe48e052ca987693a49f8d201877652cabbe2a44eb3b7c040", | ||
| deprecated=True, | ||
| ) | ||
| version( | ||
| "0.4.1", | ||
| sha256="68dcf29a26c750fcea5e02d8d58411e3b054313c3bf6fcbc1d0f08dd2851117f", | ||
| deprecated=True, | ||
| ) | ||
|
|
||
| depends_on("[email protected]:", type="build") | ||
| depends_on("hdf5", type="build") | ||
| depends_on("pkgconfig", type="build") | ||
|
|
||
| depends_on("[email protected]:", when="@0.8", type=("build", "run")) | ||
| depends_on("[email protected]:", when="@0.6.1:0.7", type=("build", "run")) | ||
| depends_on("[email protected]:3.10", when="@0.5:0.6.0", type=("build", "run")) | ||
| depends_on("[email protected]:3.10", when="@0.4", type=("build", "run")) | ||
| depends_on("[email protected]:", when="@0.8:", type=("build", "run")) | ||
| depends_on("[email protected]:", when="@0.7", type=("build", "run")) | ||
| depends_on("[email protected]:3.10", when="@0.6.0", type=("build", "run")) | ||
|
|
||
| depends_on("fenics-dolfinx@main", when="@main") | ||
| depends_on("[email protected]", when="@0.8.0") | ||
| depends_on("[email protected]", when="@0.7.2") | ||
| depends_on("[email protected]", when="@0.6.0") | ||
| depends_on("[email protected]", when="@0.5.1") | ||
| depends_on("[email protected]", when="@0.5.0") | ||
| depends_on("[email protected]", when="@0.4.1") | ||
|
|
||
| depends_on("py-fenics-basix@main", type=("build", "run"), when="@main") | ||
| depends_on("[email protected]", type=("build", "link"), when="@0.8") | ||
|
|
||
| depends_on("fenics-basix@main", type=("build", "link"), when="@main") | ||
| depends_on("[email protected]", type=("build", "link"), when="@0.8") | ||
| depends_on("[email protected]", type=("build", "link"), when="@0.7") | ||
| depends_on("[email protected]:0.6", type=("build", "link"), when="@0.6.0:0.6") | ||
| depends_on("[email protected]:0.5", type=("build", "link"), when="@0.5.0:0.5") | ||
| depends_on("[email protected]", type=("build", "link"), when="@0.4.1") | ||
| depends_on("[email protected]", type=("build", "link"), when="@0.6") | ||
|
|
||
| depends_on("py-fenics-ffcx@main", type=("build", "run"), when="@main") | ||
| depends_on("[email protected]", type=("build", "run"), when="@0.8") | ||
| depends_on("[email protected]", type=("build", "run"), when="@0.7") | ||
| depends_on("[email protected]", type=("build", "run"), when="@0.6") | ||
| depends_on("[email protected]", type=("build", "run"), when="@0.5.0:0.5") | ||
| depends_on("[email protected]", type=("build", "run"), when="@0.4.1") | ||
|
|
||
| depends_on("py-fenics-ufl@main", type=("build", "run"), when="@main") | ||
| depends_on("[email protected]", type=("build", "run"), when="@0.8") | ||
| depends_on("[email protected]", type=("build", "run"), when="@0.7") | ||
| depends_on("[email protected]", type=("build", "run"), when="@0.6") | ||
| depends_on("[email protected]", type=("build", "run"), when="@0.5.0:0.5") | ||
| depends_on("[email protected]", type=("build", "run"), when="@0.4.1") | ||
|
|
||
| depends_on("[email protected]:", type=("build", "run")) | ||
| depends_on("py-mpi4py", type=("build", "run")) | ||
|
|
@@ -88,6 +63,5 @@ class PyFenicsDolfinx(PythonPackage): | |
|
|
||
| depends_on("[email protected]:", when="@:0.7", type=("build", "run")) | ||
| depends_on("py-setuptools@42:", when="@:0.7", type="build") | ||
| depends_on("[email protected]:", type="build", when="@:0.5") | ||
|
|
||
| build_directory = "python" | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -20,22 +20,12 @@ class PyFenicsFfcx(PythonPackage): | |
| version("0.8.0", sha256="8a854782dbd119ec1c23c4522a2134d5281e7f1bd2f37d64489f75da055282e3") | ||
| version("0.7.0", sha256="7f3c3ca91d63ce7831d37799cc19d0551bdcd275bdfa4c099711679533dd1c71") | ||
| version("0.6.0", sha256="076fad61d406afffd41019ae1abf6da3f76406c035c772abad2156127667980e") | ||
| version( | ||
| "0.5.0.post0", | ||
| sha256="039908c9998b51ba53e5deb3a97016062c262f0a4285218644304f7d3cd35882", | ||
| deprecated=True, | ||
| ) | ||
| version( | ||
| "0.4.2", | ||
| sha256="3be6eef064d6ef907245db5b6cc15d4e603762e68b76e53e099935ca91ef1ee4", | ||
| deprecated=True, | ||
| ) | ||
|
|
||
| depends_on("[email protected]:", when="@0.8:", type=("build", "run")) | ||
| depends_on("[email protected]:", when="@:0.7", type=("build", "run")) | ||
| depends_on("py-setuptools@62:", when="@0.7:", type="build") | ||
| # Runtime dependency on pkg_resources from setuptools at 0.6.0 | ||
| depends_on("py-setuptools@58:", when="@0.4.2:0.6", type=("build", "run")) | ||
| depends_on("py-setuptools@58:", when="@:0.6", type=("build", "run")) | ||
|
|
||
| # CFFI is required at runtime for JIT support | ||
| depends_on("py-cffi", type=("build", "run")) | ||
|
|
@@ -47,15 +37,11 @@ class PyFenicsFfcx(PythonPackage): | |
| depends_on("[email protected]:", type=("build", "run"), when="@0.8") | ||
| depends_on("[email protected]", type=("build", "run"), when="@0.7") | ||
| depends_on("[email protected]", type=("build", "run"), when="@0.6") | ||
| depends_on("[email protected]", type=("build", "run"), when="@0.5.0:0.5") | ||
| depends_on("[email protected]", type=("build", "run"), when="@0.4.2") | ||
|
|
||
| depends_on("py-fenics-basix@main", type=("build", "run"), when="@main") | ||
| depends_on("[email protected]", type=("build", "run"), when="@0.8") | ||
| depends_on("[email protected]", type=("build", "run"), when="@0.7") | ||
| depends_on("[email protected]:0.6", type=("build", "run"), when="@0.6.0:0.6") | ||
| depends_on("[email protected]:0.5", type=("build", "run"), when="@0.5.0:0.5") | ||
| depends_on("[email protected]", type=("build", "run"), when="@0.4.2") | ||
| depends_on("[email protected]", type=("build", "run"), when="@0.6") | ||
|
|
||
| depends_on("py-pytest@6:", type="test") | ||
| depends_on("py-sympy", type="test") | ||
|
|
||