From 7e0c1a4c258315d5e3c03d7daeccefcc66000e40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ufuk=20Turun=C3=A7o=C4=9Flu?= Date: Mon, 13 Jan 2025 04:25:04 -0700 Subject: [PATCH 1/6] esmf: add v8.8.0 (#48495) --- 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 6371cbd15889bc..98ac62e7e57d2e 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.0b10", commit="dc03809c35e37482fc349011540f80c191c452eb") + version("8.8.0", sha256="f89327428aeef6ad34660b5b78f30d1c55ec67efb8f7df1991fdaa6b1eb3a27c") version("8.7.0", sha256="d7ab266e2af8c8b230721d4df59e61aa03c612a95cc39c07a2d5695746f21f56") version("8.6.1", sha256="dc270dcba1c0b317f5c9c6a32ab334cb79468dda283d1e395d98ed2a22866364") version("8.6.0", sha256="ed057eaddb158a3cce2afc0712b49353b7038b45b29aee86180f381457c0ebe7") From 151600f5b93180bb2f0cc9969428a95758337c1f Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Thu, 9 Jan 2025 19:43:47 -0700 Subject: [PATCH 2/6] Comment out py-arrow@1.3.0 because of build errors with basic gcc stack (#48478) * Comment out py-arrow@1.3.0 because of build errors with basic gcc stack * Also comment out 1.3.0-specific depends_on lines --- var/spack/repos/builtin/packages/py-arrow/package.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/var/spack/repos/builtin/packages/py-arrow/package.py b/var/spack/repos/builtin/packages/py-arrow/package.py index 901833d320c5ea..10b87780e6f7e6 100644 --- a/var/spack/repos/builtin/packages/py-arrow/package.py +++ b/var/spack/repos/builtin/packages/py-arrow/package.py @@ -30,12 +30,15 @@ class PyArrow(PythonPackage): version("0.14.7", sha256="67f8be7c0cf420424bc62d8d7dc40b44e4bb2f7b515f9cc2954fb36e35797656") version("0.14.1", sha256="2d30837085011ef0b90ff75aa0a28f5c7d063e96b7e76b6cbc7e690310256685") - depends_on("python@3.8:", type=("build", "run"), when="@1.3:") + # https://github.com/spack/spack/issues/48477 + # depends_on("python@3.8:", type=("build", "run"), when="@1.3:") depends_on("python@3.6:", type=("build", "run"), when="@1.2.1:") depends_on("python@2.7:2.8,3.5:", type=("build", "run"), when="@:0.16.0") depends_on("py-setuptools", type="build", when="@:1.2") - depends_on("py-flit-core@3.2:3", type="build", when="@1.3:") + # https://github.com/spack/spack/issues/48477 + # depends_on("py-flit-core@3.2:3", type="build", when="@1.3:") depends_on("py-python-dateutil", type=("build", "run")) depends_on("py-typing-extensions", type=("build", "run"), when="@1.2.1:1.2 ^python@:3.7") depends_on("py-python-dateutil@2.7.0:", type=("build", "run"), when="@1.2.1:") - depends_on("py-types-python-dateutil@2.8.10:", type=("build", "run"), when="@1.3:") + # https://github.com/spack/spack/issues/48477 + # depends_on("py-types-python-dateutil@2.8.10:", type=("build", "run"), when="@1.3:") From 62c47c9ddf455a3222ccb82d3f76ea1fba2877f7 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Fri, 20 Dec 2024 23:23:27 -0700 Subject: [PATCH 3/6] Add conflict for py-scipy@1.14: with Intel Classic (#48251) From a13aa57795ea642079bb70c0332b7f2e5f3f8435 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Sat, 4 Jan 2025 05:44:10 -0700 Subject: [PATCH 4/6] ectrans: add conflict for versions 1.5.x with oneapi@2025: (#48238) --- var/spack/repos/builtin/packages/ectrans/package.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/var/spack/repos/builtin/packages/ectrans/package.py b/var/spack/repos/builtin/packages/ectrans/package.py index ed9d3ff91c2766..1c2e797c5015ec 100644 --- a/var/spack/repos/builtin/packages/ectrans/package.py +++ b/var/spack/repos/builtin/packages/ectrans/package.py @@ -61,6 +61,9 @@ class Ectrans(CMakePackage): depends_on("fiat~mpi", when="~mpi") depends_on("fiat+mpi", when="+mpi") + # https://github.com/ecmwf-ifs/ectrans/issues/194 + conflicts("%oneapi@2025:", when="@1.3.1:1.5.1") + def cmake_args(self): args = [ self.define_from_variant("ENABLE_MPI", "mpi"), From bfcc627a65a2a9087b3ebf26850161db72ef485e Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Wed, 18 Dec 2024 21:02:20 -0700 Subject: [PATCH 5/6] `spack external find grep` on Linux AND macOS (#48134) * Configure 'spack external find grep' * Fix style for finding external grep * Remove unused 're' Python module from grep --- var/spack/repos/builtin/packages/grep/package.py | 1 + 1 file changed, 1 insertion(+) diff --git a/var/spack/repos/builtin/packages/grep/package.py b/var/spack/repos/builtin/packages/grep/package.py index e335e9bb0f0aac..58fff20511753c 100644 --- a/var/spack/repos/builtin/packages/grep/package.py +++ b/var/spack/repos/builtin/packages/grep/package.py @@ -2,6 +2,7 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) + from spack.package import * From 699959e7a20eb7e3e6a4ad434fb54f8da5489255 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Fri, 10 Jan 2025 11:12:41 -0700 Subject: [PATCH 6/6] py-cylc-flow package: update package and dependents/dependencies * Add py-protobuf@4.24.4 (needed for py-cylc-flow@8.3.6). * Add py-cylc-flow@8.3.6 and enable png output when creating graphs by requesting variant pangocairo for graphviz dependency. * Add corresponding versions of py-metomi-rose@2.3.2, py-cylc-rose@1.4.2, py-cylc-uiserver@1.4.2. * Add myself as maintainer to all the cylc-related packages. --- var/spack/repos/builtin/packages/py-cylc-flow/package.py | 3 ++- var/spack/repos/builtin/packages/py-cylc-rose/package.py | 3 ++- var/spack/repos/builtin/packages/py-cylc-uiserver/package.py | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/var/spack/repos/builtin/packages/py-cylc-flow/package.py b/var/spack/repos/builtin/packages/py-cylc-flow/package.py index d5df39ecbfc4ef..6608a79ade9d68 100644 --- a/var/spack/repos/builtin/packages/py-cylc-flow/package.py +++ b/var/spack/repos/builtin/packages/py-cylc-flow/package.py @@ -17,7 +17,8 @@ class PyCylcFlow(PythonPackage): license("GPL-3.0-only") - # 8.3.6 not on PyPI server? + # Version 8.3.6 is available at PyPI, but not at the URL that is considered canonical by Spack + # https://github.com/spack/spack/issues/48479 version("8.3.6", commit="7f63b43164638e27636b992b14b3fa088b692b94") version("8.2.3", sha256="dd5bea9e4b8dad00edd9c3459a38fb778e5a073da58ad2725bc9b84ad718e073") version("8.2.0", sha256="cbe35e0d72d1ca36f28a4cebe9b9040a3445a74253bc94051a3c906cf179ded0") diff --git a/var/spack/repos/builtin/packages/py-cylc-rose/package.py b/var/spack/repos/builtin/packages/py-cylc-rose/package.py index 6390c77172704a..1c22f06b508866 100644 --- a/var/spack/repos/builtin/packages/py-cylc-rose/package.py +++ b/var/spack/repos/builtin/packages/py-cylc-rose/package.py @@ -17,7 +17,8 @@ class PyCylcRose(PythonPackage): license("GPL-3.0-only") - # 1.4.2 not on PyPI server? + # Version 1.4.2 is available at PyPI, but not at the URL that is considered canonical by Spack + # https://github.com/spack/spack/issues/48479 version("1.4.2", commit="8deda0480afed8cf92cfdf7938fc78d0aaf0c0e4") version("1.3.0", sha256="017072b69d7a50fa6d309a911d2428743b07c095f308529b36b1b787ebe7ab88") diff --git a/var/spack/repos/builtin/packages/py-cylc-uiserver/package.py b/var/spack/repos/builtin/packages/py-cylc-uiserver/package.py index ba09620cf27171..e60c62fbd961ce 100644 --- a/var/spack/repos/builtin/packages/py-cylc-uiserver/package.py +++ b/var/spack/repos/builtin/packages/py-cylc-uiserver/package.py @@ -17,7 +17,8 @@ class PyCylcUiserver(PythonPackage): license("GPL-3.0-or-later") - # 1.5.1 not on PyPI server? + # Version 1.5.1 is available at PyPI, but not at the URL that is considered canonical by Spack + # https://github.com/spack/spack/issues/48479 version("1.5.1", commit="3a41c6fbefbcea33c41410f3698de8b62c9871b8") version("1.3.0", sha256="f3526e470c7ac2b61bf69e9b8d17fc7a513392219d28baed9b1166dcc7033d7a")