From b3b3a5a6fd5e030354f79165bc7722258210958e Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Sun, 17 Nov 2024 17:54:55 -0500 Subject: [PATCH 1/7] Add py-phdf@0.11.4 and add conflict for py-pyhdf@0.10.4 with numpy@1.25: --- var/spack/repos/builtin/packages/py-pyhdf/package.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/var/spack/repos/builtin/packages/py-pyhdf/package.py b/var/spack/repos/builtin/packages/py-pyhdf/package.py index e1059e20971e20..c7631f64c8c32e 100644 --- a/var/spack/repos/builtin/packages/py-pyhdf/package.py +++ b/var/spack/repos/builtin/packages/py-pyhdf/package.py @@ -20,6 +20,7 @@ class PyPyhdf(PythonPackage): license("MIT") version("master", branch="master") + version("0.11.4", sha256="f4d48ee6f297be76e07b1a31710ef898caa31757dfdf173e5a4b94988ea76164") version("0.10.4", sha256="ea09b2bdafc9be0f7f43d72ff122d8efbde61881f4da3a659b33be5e29215f93") depends_on("c", type="build") # generated @@ -31,6 +32,8 @@ class PyPyhdf(PythonPackage): depends_on("zlib-api", type=("build", "run")) depends_on("hdf@4.2", type=("build", "run")) depends_on("py-numpy", type=("build", "run")) + # https://github.com/fhs/pyhdf/issues/63 + depends_on("py-numpy@:1.24", when="@0.10.4", type=("build", "run")) depends_on("jpeg", type=("build", "run")) def setup_build_environment(self, env): From a7094a0e66d11cbaf44b75f5722d65c97c4cdb61 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Mon, 18 Nov 2024 21:51:03 -0500 Subject: [PATCH 2/7] Add esmf@8.8.0b06 snapshot=b06 (not intended for spack develop) --- var/spack/repos/builtin/packages/esmf/package.py | 1 + 1 file changed, 1 insertion(+) diff --git a/var/spack/repos/builtin/packages/esmf/package.py b/var/spack/repos/builtin/packages/esmf/package.py index d9815c23ae9238..35574a65f65d26 100644 --- a/var/spack/repos/builtin/packages/esmf/package.py +++ b/var/spack/repos/builtin/packages/esmf/package.py @@ -29,6 +29,7 @@ class Esmf(MakefilePackage, PythonExtension): # Develop is a special name for spack and is always considered the newest version version("develop", branch="develop") # generate chksum with 'spack checksum esmf@x.y.z' + version("8.8.0b06", sha256="760c9c628e6a4b6560434f7f7285c74eef7c9262fa49c8b87ca9bbb638b62518") version("8.7.0", sha256="d7ab266e2af8c8b230721d4df59e61aa03c612a95cc39c07a2d5695746f21f56") version("8.7.0b11", commit="7b36ed9d21ecf904c95c436c8ecaa5075601893e") version("8.7.0b04", commit="609c81179572747407779492c43776e34495d267") From 0e615a1afced4af695fb87bb76d1e9e74bb6491a Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Tue, 19 Nov 2024 13:22:48 -0500 Subject: [PATCH 3/7] Change sha256 to commit for esmf@8.8.0b06 --- var/spack/repos/builtin/packages/esmf/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/var/spack/repos/builtin/packages/esmf/package.py b/var/spack/repos/builtin/packages/esmf/package.py index 35574a65f65d26..c9692965159844 100644 --- a/var/spack/repos/builtin/packages/esmf/package.py +++ b/var/spack/repos/builtin/packages/esmf/package.py @@ -29,7 +29,7 @@ class Esmf(MakefilePackage, PythonExtension): # Develop is a special name for spack and is always considered the newest version version("develop", branch="develop") # generate chksum with 'spack checksum esmf@x.y.z' - version("8.8.0b06", sha256="760c9c628e6a4b6560434f7f7285c74eef7c9262fa49c8b87ca9bbb638b62518") + version("8.8.0b06", commit="aed3278586544bb7687bb03b5c9b65dff67c18a8") version("8.7.0", sha256="d7ab266e2af8c8b230721d4df59e61aa03c612a95cc39c07a2d5695746f21f56") version("8.7.0b11", commit="7b36ed9d21ecf904c95c436c8ecaa5075601893e") version("8.7.0b04", commit="609c81179572747407779492c43776e34495d267") From b35267b00a89f09f01a733b28962e7224e15d8b7 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Fri, 22 Nov 2024 09:08:33 -0500 Subject: [PATCH 4/7] In var/spack/repos/builtin/packages/esmf/package.py move patch decorator to if self.spec.satisifes --- var/spack/repos/builtin/packages/esmf/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/var/spack/repos/builtin/packages/esmf/package.py b/var/spack/repos/builtin/packages/esmf/package.py index c9692965159844..cca7ec870ca9bd 100644 --- a/var/spack/repos/builtin/packages/esmf/package.py +++ b/var/spack/repos/builtin/packages/esmf/package.py @@ -199,9 +199,9 @@ class MakefileBuilder(spack.build_systems.makefile.MakefileBuilder): filter_compiler_wrappers("esmf.mk", relative_root="lib") # Make script from mvapich2.patch executable - @when("@:7.0") @run_before("build") def chmod_scripts(self): + if self.spec.satisfies(":7.0"): chmod = which("chmod") chmod("+x", "scripts/libs.mvapich2f90") From c684de821a62db66758ed9d1398a5e562dfa26f6 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Fri, 22 Nov 2024 11:48:16 -0500 Subject: [PATCH 5/7] Fix wrong indentation in var/spack/repos/builtin/packages/esmf/package.py --- var/spack/repos/builtin/packages/esmf/package.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/var/spack/repos/builtin/packages/esmf/package.py b/var/spack/repos/builtin/packages/esmf/package.py index cca7ec870ca9bd..292b0e36743d4c 100644 --- a/var/spack/repos/builtin/packages/esmf/package.py +++ b/var/spack/repos/builtin/packages/esmf/package.py @@ -201,9 +201,9 @@ class MakefileBuilder(spack.build_systems.makefile.MakefileBuilder): # Make script from mvapich2.patch executable @run_before("build") def chmod_scripts(self): - if self.spec.satisfies(":7.0"): - chmod = which("chmod") - chmod("+x", "scripts/libs.mvapich2f90") + if self.spec.satisfies("@:7.0"): + chmod = which("chmod") + chmod("+x", "scripts/libs.mvapich2f90") def url_for_version(self, version): if version < Version("8.0.0"): From bfac27641902b6d788e3ec00634ad9b101bc61c8 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Fri, 22 Nov 2024 17:25:54 -0700 Subject: [PATCH 6/7] Remove deprecated beta snapshots and duplicate 8.6.1 version from ESMF package --- var/spack/repos/builtin/packages/esmf/package.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/var/spack/repos/builtin/packages/esmf/package.py b/var/spack/repos/builtin/packages/esmf/package.py index 292b0e36743d4c..1a7e39619a1604 100644 --- a/var/spack/repos/builtin/packages/esmf/package.py +++ b/var/spack/repos/builtin/packages/esmf/package.py @@ -31,10 +31,6 @@ class Esmf(MakefilePackage, PythonExtension): # generate chksum with 'spack checksum esmf@x.y.z' version("8.8.0b06", commit="aed3278586544bb7687bb03b5c9b65dff67c18a8") version("8.7.0", sha256="d7ab266e2af8c8b230721d4df59e61aa03c612a95cc39c07a2d5695746f21f56") - version("8.7.0b11", commit="7b36ed9d21ecf904c95c436c8ecaa5075601893e") - version("8.7.0b04", commit="609c81179572747407779492c43776e34495d267") - version("8.6.1", sha256="dc270dcba1c0b317f5c9c6a32ab334cb79468dda283d1e395d98ed2a22866364") - version("8.6.1b04", commit="64d3aacc36f2d4d39255eb521c34123903cc0551") version("8.6.1", sha256="dc270dcba1c0b317f5c9c6a32ab334cb79468dda283d1e395d98ed2a22866364") version("8.6.0", sha256="ed057eaddb158a3cce2afc0712b49353b7038b45b29aee86180f381457c0ebe7") version("8.5.0", sha256="acd0b2641587007cc3ca318427f47b9cae5bfd2da8d2a16ea778f637107c29c4") @@ -51,7 +47,6 @@ class Esmf(MakefilePackage, PythonExtension): sha256="0ff43ede83d1ac6beabd3d5e2a646f7574174b28a48d1b9f2c318a054ba268fd", deprecated=True, ) - version("8.3.0b09", commit="5b7e546c4ba350bff9c9ebd00e5fa1c6315d17da", deprecated=True) version("8.2.0", sha256="27866c31fdb63c58e78211de970470ca02d274f5d4d6d97e94284d63b1c1d9e4") version("8.1.1", sha256="629690c7a488e84ac7252470349458d7aaa98b54c260f8b3911a2e2f3e713dd0") version( From ca86d9f50521a3db4e8600a45b95fcd7addd89f4 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Fri, 22 Nov 2024 17:27:44 -0700 Subject: [PATCH 7/7] Attempt to reenable style tests for each PR/push --- .github/workflows/valid-style.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.github/workflows/valid-style.yml b/.github/workflows/valid-style.yml index ad96ff2cc5604c..711a4b52d532b6 100644 --- a/.github/workflows/valid-style.yml +++ b/.github/workflows/valid-style.yml @@ -1,6 +1,18 @@ name: style on: + push: + branches: + - develop + - releases/** + - spack-stack-dev + - release/** + pull_request: + branches: + - develop + - releases/** + - spack-stack-dev + - release/** workflow_call: inputs: with_coverage: