From e612436e267fc5ebb42bd8e667be78b20e7e3e18 Mon Sep 17 00:00:00 2001 From: "Jose E. Roman" Date: Mon, 27 Mar 2023 16:47:18 +0200 Subject: New patch release SLEPc 3.18.3 (#36401) Thanks-To: Satish Balay --- .../repos/builtin/packages/py-slepc4py/ldshared-dev.patch | 4 ++-- var/spack/repos/builtin/packages/py-slepc4py/package.py | 11 ++++++++++- var/spack/repos/builtin/packages/slepc/package.py | 1 + 3 files changed, 13 insertions(+), 3 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-slepc4py/ldshared-dev.patch b/var/spack/repos/builtin/packages/py-slepc4py/ldshared-dev.patch index fbe430af1b..be5b2569aa 100644 --- a/var/spack/repos/builtin/packages/py-slepc4py/ldshared-dev.patch +++ b/var/spack/repos/builtin/packages/py-slepc4py/ldshared-dev.patch @@ -1,7 +1,7 @@ diff --git a/src/binding/slepc4py/conf/baseconf.py b/src/binding/slepc4py/conf/baseconf.py index b0707a65a..44ba8f194 100644 ---- a/src/binding/slepc4py/conf/baseconf.py -+++ b/src/binding/slepc4py/conf/baseconf.py +--- a/src/binding/slepc4py/conf/confpetsc.py ++++ b/src/binding/slepc4py/conf/confpetsc.py @@ -213,7 +213,7 @@ class PetscConfig: ldshared = getenv('LDSHARED', ldshared) ldflags = getenv('LDFLAGS', cflags + ' ' + (ldflags or '')) diff --git a/var/spack/repos/builtin/packages/py-slepc4py/package.py b/var/spack/repos/builtin/packages/py-slepc4py/package.py index a23002aac2..22517d6774 100644 --- a/var/spack/repos/builtin/packages/py-slepc4py/package.py +++ b/var/spack/repos/builtin/packages/py-slepc4py/package.py @@ -16,6 +16,7 @@ class PySlepc4py(PythonPackage): maintainers("joseeroman", "balay") version("main", branch="main") + version("3.18.3", sha256="93c978f115683900a575026111ff2abe6f3ce4de8c21eec53c07dfd97ea43c85") version("3.18.2", sha256="402297fd8e583ed2618d2cba05e5cae8e9d0a2c3943812a1a138f431ef3479b3") version("3.18.1", sha256="4c2bc0947d6a9cdb209e3174b7f54fe7b029220e2c90106f52844e8f8795f8f0") version("3.18.0", sha256="aa83f46f942aca05ffcbc8be29b496f56837f564e0396f5b39cec4946654ee78") @@ -36,10 +37,12 @@ class PySlepc4py(PythonPackage): patch("ldshared.patch", when="@:99") patch("ldshared-dev.patch", when="@main") - depends_on("py-cython@0.24:", type="build", when="@main") + depends_on("py-cython@0.29.32:", when="^python@3.11:", type="build") + depends_on("py-cython@0.24:", type="build") depends_on("py-setuptools", type="build") depends_on("py-petsc4py", type=("build", "run")) + depends_on("py-petsc4py@main", when="@main", type=("build", "run")) depends_on("py-petsc4py@3.18.0:3.18", when="@3.18.0:3.18", type=("build", "run")) depends_on("py-petsc4py@3.17.0:3.17", when="@3.17.0:3.17", type=("build", "run")) depends_on("py-petsc4py@3.16.0:3.16", when="@3.16.0:3.16", type=("build", "run")) @@ -49,6 +52,7 @@ class PySlepc4py(PythonPackage): depends_on("py-petsc4py@3.11.0:3.11", when="@3.11.0:3.11", type=("build", "run")) depends_on("slepc") + depends_on("slepc@main", when="@main") depends_on("slepc@3.18.0:3.18", when="@3.18.0:3.18") depends_on("slepc@3.17.0:3.17", when="@3.17.0:3.17") depends_on("slepc@3.16.0:3.16", when="@3.16.0:3.16") @@ -65,3 +69,8 @@ class PySlepc4py(PythonPackage): return os.path.join(self.stage.source_path, "src", "binding", "slepc4py") else: return self.stage.source_path + + @run_before("install") + def cythonize(self): + with working_dir(self.build_directory): + python(join_path("conf", "cythonize.py")) diff --git a/var/spack/repos/builtin/packages/slepc/package.py b/var/spack/repos/builtin/packages/slepc/package.py index da4c0e7e24..beab2aeebe 100644 --- a/var/spack/repos/builtin/packages/slepc/package.py +++ b/var/spack/repos/builtin/packages/slepc/package.py @@ -22,6 +22,7 @@ class Slepc(Package, CudaPackage, ROCmPackage): test_requires_compiler = True version("main", branch="main") + version("3.18.3", sha256="1b02bdf87c083749e81b3735aae7728098eaab78143b262b92c2ab164924c6f5") version("3.18.2", sha256="5bd90a755934e702ab1fdb3320b9fe75ab5fc28c93d364248ea86a372fbe6a62") version("3.18.1", sha256="f6e6e16d8399c3f94d187da9d4bfdfca160de50ebda7d63f6fa8ef417597e9b4") version("3.18.0", sha256="18af535d979a646363df01f407c75f0e3b0dd97b3fdeb20dca25b30cd89239ee") -- cgit v1.2.3-60-g2f50