From b57c2a10d48b6889a38aab5c55dd866989a77203 Mon Sep 17 00:00:00 2001 From: Harmen Stoppels Date: Mon, 25 Sep 2023 08:28:13 +0200 Subject: phist: remove python 3.10 upperbound (#40175) --- var/spack/repos/builtin/packages/phist/package.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/var/spack/repos/builtin/packages/phist/package.py b/var/spack/repos/builtin/packages/phist/package.py index 6d7d61c0e5..a67deddebd 100644 --- a/var/spack/repos/builtin/packages/phist/package.py +++ b/var/spack/repos/builtin/packages/phist/package.py @@ -138,6 +138,8 @@ class Phist(CMakePackage): conflicts("^trilinos@14:", when="@:1.11.2") # Build error with cray-libsci because they define macro 'I', workaround in phist-1.11.2 conflicts("^cray-libsci", when="@:1.11.1") + # phist@1.11.2 got rid of some deprecated python code + a patch below + conflicts("^python@3.11:", when="@:1.11.1") # The builtin kernels switched from the 'mpi' to the 'mpi_f08' module in # phist 1.9.6, which causes compile-time errors with mpich and older # GCC versions. @@ -175,8 +177,7 @@ class Phist(CMakePackage): # Python 3 or later is required for generating the Fortran 2003 bindings # since version 1.7, you can get rid of the dependency by switching off # the feature (e.g. use the '~fortran' variant) - # For the upperbound see https://bitbucket.org/essex/phist/issues/246/does-not-build-with-python-311 - depends_on("python@3:3.10", when="@1.7: +fortran", type="build") + depends_on("python@3:", when="@1.7: +fortran", type="build") depends_on("mpi", when="+mpi") depends_on("trilinos@12:+tpetra gotype=long_long", when="kernel_lib=tpetra +int64") depends_on("trilinos@12:+tpetra gotype=int", when="kernel_lib=tpetra ~int64") -- cgit v1.2.3-60-g2f50