From e933f50a8e5a3ba59aed84fd6db93fb658708f3b Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Wed, 3 Jun 2026 07:34:56 -0600 Subject: [PATCH 1/3] repos/spack_stack/spack_repo/spack_stack/packages/ioda_converters/package.py: fix missing git build dependency --- .gitmodules | 6 ++++-- repos/builtin | 2 +- .../spack_stack/packages/ioda_converters/package.py | 3 +++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 2f6cb0566..e27052a71 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,5 +4,7 @@ branch = spack-stack-dev [submodule "repos/builtin"] path = repos/builtin - url = https://github.com/jcsda/spack-packages - branch = spack-stack-dev + #url = https://github.com/jcsda/spack-packages + #branch = spack-stack-dev + url = https://github.com/climbfuji/spack-packages + branch = bugfix/jedicmake diff --git a/repos/builtin b/repos/builtin index 6fd08efa4..91982f91b 160000 --- a/repos/builtin +++ b/repos/builtin @@ -1 +1 @@ -Subproject commit 6fd08efa4662fda2b4ef626cdc98c264d2dc05e5 +Subproject commit 91982f91bf633ae28d9217b654ad78ed8263f361 diff --git a/repos/spack_stack/spack_repo/spack_stack/packages/ioda_converters/package.py b/repos/spack_stack/spack_repo/spack_stack/packages/ioda_converters/package.py index ce53b51db..6ee9249e0 100644 --- a/repos/spack_stack/spack_repo/spack_stack/packages/ioda_converters/package.py +++ b/repos/spack_stack/spack_repo/spack_stack/packages/ioda_converters/package.py @@ -41,6 +41,9 @@ class IodaConverters(CMakePackage): depends_on("eccodes") depends_on("eckit") depends_on("eigen@3") + # error: could not find git for clone of yaml-cpp-populate + # fixed in repo Sep 25, 2025 - need only for 0.0.1.20250830 + depends_on("git", type=("build"), when="@0.0.1.20250830") depends_on("gsl-lite") depends_on("ioda") depends_on("jedi-cmake", type=("build")) From 545411e42a8654e2af5f625827cc3aba0e247dae Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Wed, 3 Jun 2026 07:35:22 -0600 Subject: [PATCH 2/3] Add bats to dev-utils-env and cylc-dev --- configs/templates/cylc-dev/spack.yaml | 4 ++-- .../spack_repo/spack_stack/packages/dev_utils_env/package.py | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/configs/templates/cylc-dev/spack.yaml b/configs/templates/cylc-dev/spack.yaml index 1370b9dfb..342893872 100644 --- a/configs/templates/cylc-dev/spack.yaml +++ b/configs/templates/cylc-dev/spack.yaml @@ -15,7 +15,7 @@ spack: view: cylc: root: view - select: [^python] + select: [^python, bats] link: run link_type: symlink include: [] @@ -24,4 +24,4 @@ spack: - py-cylc-flow@8.4.2 - py-cylc-rose@1.5.1 - py-cylc-uiserver@1.6.1 - + - bats diff --git a/repos/spack_stack/spack_repo/spack_stack/packages/dev_utils_env/package.py b/repos/spack_stack/spack_repo/spack_stack/packages/dev_utils_env/package.py index 2e3911b54..942be7994 100644 --- a/repos/spack_stack/spack_repo/spack_stack/packages/dev_utils_env/package.py +++ b/repos/spack_stack/spack_repo/spack_stack/packages/dev_utils_env/package.py @@ -34,6 +34,7 @@ class DevUtilsEnv(BundlePackage): depends_on("cube +gui", when="+scalasca", type="run") # Miscellaneous + depends_on("bats", type="run") depends_on("cloc", type="run") depends_on("rank-run", type="run") From 35d37ed0dbf340d5975e9464c111fd5f327cc28e Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Wed, 3 Jun 2026 15:05:40 -0600 Subject: [PATCH 3/3] Revert .gitmodules and update submodule pointer for repos/builtin --- .gitmodules | 6 ++---- repos/builtin | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index e27052a71..2f6cb0566 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,7 +4,5 @@ branch = spack-stack-dev [submodule "repos/builtin"] path = repos/builtin - #url = https://github.com/jcsda/spack-packages - #branch = spack-stack-dev - url = https://github.com/climbfuji/spack-packages - branch = bugfix/jedicmake + url = https://github.com/jcsda/spack-packages + branch = spack-stack-dev diff --git a/repos/builtin b/repos/builtin index 91982f91b..beebc2fa3 160000 --- a/repos/builtin +++ b/repos/builtin @@ -1 +1 @@ -Subproject commit 91982f91bf633ae28d9217b654ad78ed8263f361 +Subproject commit beebc2fa33f45e9f050f613a53528f7566598062