From dfb3bfb36776498f1c63bea65a211711cb10fd1a Mon Sep 17 00:00:00 2001 From: Hang-Lei-NOAA <44901908+Hang-Lei-NOAA@users.noreply.github.com> Date: Mon, 5 Oct 2026 14:28:12 -0400 Subject: [PATCH 01/10] Add dependency on py-pyresample This change is corresponding to the modifications on spack-packages#94 --- .../spack_stack/packages/global_workflow_env/package.py | 1 + 1 file changed, 1 insertion(+) diff --git a/repos/spack_stack/spack_repo/spack_stack/packages/global_workflow_env/package.py b/repos/spack_stack/spack_repo/spack_stack/packages/global_workflow_env/package.py index 0e0a89427..6312a0a41 100644 --- a/repos/spack_stack/spack_repo/spack_stack/packages/global_workflow_env/package.py +++ b/repos/spack_stack/spack_repo/spack_stack/packages/global_workflow_env/package.py @@ -67,6 +67,7 @@ class GlobalWorkflowEnv(BundlePackage): depends_on("jedi-tools-env") depends_on("ioda") depends_on("pigz") + depends_on("py-pyresample") # GSI dependencies depends_on("gsi-env", when="+gsi") From 197de478641eb857980e7513ed32e5a9f80f1fb8 Mon Sep 17 00:00:00 2001 From: Hang-Lei-NOAA <44901908+Hang-Lei-NOAA@users.noreply.github.com> Date: Mon, 5 Oct 2026 15:53:24 -0400 Subject: [PATCH 02/10] Update submodule URL for spack-pack temporary test --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 2f6cb0566..52ad65362 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,5 +4,5 @@ branch = spack-stack-dev [submodule "repos/builtin"] path = repos/builtin - url = https://github.com/jcsda/spack-packages + url = https://github.com/Hang-Lei-NOAA/spack-packages branch = spack-stack-dev From df6b292fc983119813137834dd7a30cb39999e6f Mon Sep 17 00:00:00 2001 From: Hang Lei Date: Mon, 5 Oct 2026 20:05:37 +0000 Subject: [PATCH 03/10] Update repos/builtin to Hang-Lei-NOAA/spack-packages for temporary test --- .gitmodules | 4 ++-- repos/builtin | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 52ad65362..55af2580d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,5 +4,5 @@ branch = spack-stack-dev [submodule "repos/builtin"] path = repos/builtin - url = https://github.com/Hang-Lei-NOAA/spack-packages - branch = spack-stack-dev + url = https://github.com/Hang-Lei-NOAA/spack-packages + branch = spack-stack-dev diff --git a/repos/builtin b/repos/builtin index 63d028456..21c215dde 160000 --- a/repos/builtin +++ b/repos/builtin @@ -1 +1 @@ -Subproject commit 63d0284567cd34f6fca52b095d0ae2e3cc2f7053 +Subproject commit 21c215dde2cc533701323e3344002f36044fef86 From 1fc3dda76267ccacb31d23a7db8e1b2ec9e92a9b Mon Sep 17 00:00:00 2001 From: Hang Lei Date: Tue, 6 Oct 2026 13:41:40 +0000 Subject: [PATCH 04/10] Update repos/builtin to new hash --- repos/builtin | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repos/builtin b/repos/builtin index 21c215dde..b7d370fcf 160000 --- a/repos/builtin +++ b/repos/builtin @@ -1 +1 @@ -Subproject commit 21c215dde2cc533701323e3344002f36044fef86 +Subproject commit b7d370fcfc35a08db8fc7fcf10ab0bf8f7a90b85 From 0b0aa79da98356980298b74db5450fcc6714328e Mon Sep 17 00:00:00 2001 From: Hang Lei Date: Tue, 6 Oct 2026 19:22:32 +0000 Subject: [PATCH 05/10] Update repos/builtin to 2 new hash --- repos/builtin | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repos/builtin b/repos/builtin index b7d370fcf..a2bdb79f3 160000 --- a/repos/builtin +++ b/repos/builtin @@ -1 +1 @@ -Subproject commit b7d370fcfc35a08db8fc7fcf10ab0bf8f7a90b85 +Subproject commit a2bdb79f392771ad02d1f21791c989a53ce8d0f4 From f4011ce2d589a99fac9a13ece9cdee70cae97786 Mon Sep 17 00:00:00 2001 From: Hang Lei Date: Wed, 7 Oct 2026 13:49:00 +0000 Subject: [PATCH 06/10] Update repos/builtin to 3 new hash --- repos/builtin | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repos/builtin b/repos/builtin index a2bdb79f3..acdecc680 160000 --- a/repos/builtin +++ b/repos/builtin @@ -1 +1 @@ -Subproject commit a2bdb79f392771ad02d1f21791c989a53ce8d0f4 +Subproject commit acdecc680492af9250ab1e54b856ada17427a38b From d9e441011cabfce580ddafd8ae484f5e724e42a0 Mon Sep 17 00:00:00 2001 From: Hang Lei Date: Wed, 7 Oct 2026 19:20:15 +0000 Subject: [PATCH 07/10] Update repos/builtin to 4 new hash --- repos/builtin | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repos/builtin b/repos/builtin index acdecc680..bae8fc6d2 160000 --- a/repos/builtin +++ b/repos/builtin @@ -1 +1 @@ -Subproject commit acdecc680492af9250ab1e54b856ada17427a38b +Subproject commit bae8fc6d276a441ed98d0b2527c2c08457c9ee21 From 0c4d7bccfe619c3b7e66960385bb053753da773a Mon Sep 17 00:00:00 2001 From: Hang Lei Date: Fri, 9 Oct 2026 01:11:29 +0000 Subject: [PATCH 08/10] Update repos/builtin to 5 new hash --- repos/builtin | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repos/builtin b/repos/builtin index bae8fc6d2..161f99ddd 160000 --- a/repos/builtin +++ b/repos/builtin @@ -1 +1 @@ -Subproject commit bae8fc6d276a441ed98d0b2527c2c08457c9ee21 +Subproject commit 161f99dddbd3f2b230685cc538da39b1964dc7d5 From 28f402d12d7b6a799e4a960769a5d8053516e749 Mon Sep 17 00:00:00 2001 From: Hang-Lei-NOAA <44901908+Hang-Lei-NOAA@users.noreply.github.com> Date: Thu, 8 Oct 2026 22:26:46 -0400 Subject: [PATCH 09/10] Update submodule URL for spack-packages to pass the merge conflict --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 55af2580d..7663126f3 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,5 +4,5 @@ branch = spack-stack-dev [submodule "repos/builtin"] path = repos/builtin - url = https://github.com/Hang-Lei-NOAA/spack-packages + url = https://github.com/JCSDA/spack-packages branch = spack-stack-dev From 4778d25a36d26e6680c40f0c2567d67d8b1d567d Mon Sep 17 00:00:00 2001 From: Hang-Lei-NOAA <44901908+Hang-Lei-NOAA@users.noreply.github.com> Date: Thu, 8 Oct 2026 22:36:36 -0400 Subject: [PATCH 10/10] Try to solve github merge conflicts --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 7663126f3..55af2580d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,5 +4,5 @@ branch = spack-stack-dev [submodule "repos/builtin"] path = repos/builtin - url = https://github.com/JCSDA/spack-packages + url = https://github.com/Hang-Lei-NOAA/spack-packages branch = spack-stack-dev