From e1921fab9adbfa882df8deee91f711c4be24eaa1 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Wed, 6 Sep 2023 09:02:05 -0600 Subject: [PATCH 1/3] Update .gitmodules and submodule pointer for spack for code review and testing --- .gitmodules | 10 ++++++---- spack | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index b1f475b64..d974e25d2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,11 @@ [submodule "spack"] path = spack - #url = https://github.com/spack/spack - #branch = develop - url = https://github.com/jcsda/spack - branch = jcsda_emc_spack_stack + ##url = https://github.com/spack/spack + ##branch = develop + #url = https://github.com/jcsda/spack + #branch = jcsda_emc_spack_stack + url = https://github.com/climbfuji/spack + branch = feature/update_awscli [submodule "doc/CMakeModules"] path = doc/CMakeModules url = https://github.com/noaa-emc/cmakemodules diff --git a/spack b/spack index 24160ebdd..b9bd1d935 160000 --- a/spack +++ b/spack @@ -1 +1 @@ -Subproject commit 24160ebddc7adf79b21ac7bb3fa1bd47601feb08 +Subproject commit b9bd1d9353d924c3d8cbfc87edc5b0668edb14da From c22bfc248fdfb76cd08c7517247fd660cc21f9cc Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Wed, 6 Sep 2023 09:02:25 -0600 Subject: [PATCH 2/3] Pin version of awscli to 1.29.41 --- configs/common/packages.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/common/packages.yaml b/configs/common/packages.yaml index 394d1b203..9f3eaeab0 100644 --- a/configs/common/packages.yaml +++ b/configs/common/packages.yaml @@ -11,6 +11,8 @@ lapack: [openblas] yacc: [bison] # + awscli: + version: ['1.29.41'] bacio: version: ['2.4.1'] bison: From 2e1df001d524b99f74549f0a14587be057599131 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Wed, 6 Sep 2023 10:09:47 -0600 Subject: [PATCH 3/3] Revert .gitmodules and update submodule pointer for spack --- .gitmodules | 10 ++++------ spack | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.gitmodules b/.gitmodules index d974e25d2..b1f475b64 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,11 +1,9 @@ [submodule "spack"] path = spack - ##url = https://github.com/spack/spack - ##branch = develop - #url = https://github.com/jcsda/spack - #branch = jcsda_emc_spack_stack - url = https://github.com/climbfuji/spack - branch = feature/update_awscli + #url = https://github.com/spack/spack + #branch = develop + url = https://github.com/jcsda/spack + branch = jcsda_emc_spack_stack [submodule "doc/CMakeModules"] path = doc/CMakeModules url = https://github.com/noaa-emc/cmakemodules diff --git a/spack b/spack index b9bd1d935..96ad2772c 160000 --- a/spack +++ b/spack @@ -1 +1 @@ -Subproject commit b9bd1d9353d924c3d8cbfc87edc5b0668edb14da +Subproject commit 96ad2772c88c5d0466829d188acb264bc0e78da7