From af643cc853d6891b44c8707bdb4d6a01551da4a9 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Mon, 5 Aug 2024 12:03:07 -0600 Subject: [PATCH 1/6] Bump Python to 3.11.7 --- configs/common/packages.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/common/packages.yaml b/configs/common/packages.yaml index b26f9a038..164d1fb0b 100644 --- a/configs/common/packages.yaml +++ b/configs/common/packages.yaml @@ -184,7 +184,7 @@ proj: require: '~tiff' python: - require: '@3.10.13' + require: '@3.11.7' py-attrs: # https://github.com/JCSDA/spack-stack/issues/740 require: '@21.4.0' From a12300cf288952fdaaa707a08fa3453b844bfb8f Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Mon, 5 Aug 2024 13:01:50 -0600 Subject: [PATCH 2/6] Update .gitmodules and submodule pointer for spack for code review and testing --- .gitmodules | 6 ++++-- spack | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index a69f3e4f1..b3b180b16 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,9 @@ [submodule "spack"] path = spack - url = https://github.com/jcsda/spack - branch = spack-stack-dev + #url = https://github.com/jcsda/spack + #branch = spack-stack-dev + url = https://github.com/climbfuji/spack + branch = feature/cherry_pick_globus_updates_from_spack_develop [submodule "doc/CMakeModules"] path = doc/CMakeModules url = https://github.com/noaa-emc/cmakemodules diff --git a/spack b/spack index e77862a08..c259af1cc 160000 --- a/spack +++ b/spack @@ -1 +1 @@ -Subproject commit e77862a0839789e9ee5bb501aba3884b6b0e4119 +Subproject commit c259af1cca85d5a6d6881f2a21a256920f78fd86 From 89fa6eabd6d40a8c03c3a1bc29c067aa2b31bd21 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Mon, 5 Aug 2024 15:30:18 -0600 Subject: [PATCH 3/6] Bump Python in Github actions to 3.11.7 --- .github/workflows/macos-ci-aarch64.yaml | 2 +- .github/workflows/ubuntu-ci-x86_64-gnu.yaml | 2 +- .github/workflows/ubuntu-ci-x86_64-intel.yaml | 2 +- .github/workflows/ubuntu-ci-x86_64-oneapi.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/macos-ci-aarch64.yaml b/.github/workflows/macos-ci-aarch64.yaml index 514b01d0d..f1b3bc864 100644 --- a/.github/workflows/macos-ci-aarch64.yaml +++ b/.github/workflows/macos-ci-aarch64.yaml @@ -168,7 +168,7 @@ jobs: module use ${ENVDIR}/install/modulefiles/Core module load stack-apple-clang/14.0.3 module load stack-openmpi/5.0.3 - module load stack-python/3.10.13 + module load stack-python/3.11.7 module available module load jedi-ufs-env diff --git a/.github/workflows/ubuntu-ci-x86_64-gnu.yaml b/.github/workflows/ubuntu-ci-x86_64-gnu.yaml index 8a60dc15c..15ecfef74 100644 --- a/.github/workflows/ubuntu-ci-x86_64-gnu.yaml +++ b/.github/workflows/ubuntu-ci-x86_64-gnu.yaml @@ -199,7 +199,7 @@ jobs: module use ${ENVDIR}/install/modulefiles/Core module load stack-gcc/11.4.0 module load stack-openmpi/5.0.3 - module load stack-python/3.10.13 + module load stack-python/3.11.7 module available module load jedi-ufs-env diff --git a/.github/workflows/ubuntu-ci-x86_64-intel.yaml b/.github/workflows/ubuntu-ci-x86_64-intel.yaml index a4a299b2b..56ee63fe1 100644 --- a/.github/workflows/ubuntu-ci-x86_64-intel.yaml +++ b/.github/workflows/ubuntu-ci-x86_64-intel.yaml @@ -224,7 +224,7 @@ jobs: module use ${ENVDIR}/install/modulefiles/Core module load stack-intel/2021.10.0 module load stack-intel-oneapi-mpi/2021.10.0 - module load stack-python/3.10.13 + module load stack-python/3.11.7 module available module load jedi-ufs-env diff --git a/.github/workflows/ubuntu-ci-x86_64-oneapi.yaml b/.github/workflows/ubuntu-ci-x86_64-oneapi.yaml index 585bcc773..c490ec6a5 100644 --- a/.github/workflows/ubuntu-ci-x86_64-oneapi.yaml +++ b/.github/workflows/ubuntu-ci-x86_64-oneapi.yaml @@ -244,7 +244,7 @@ jobs: module use ${ENVDIR}/install/modulefiles/Core module load stack-oneapi/2024.2.0 module load stack-intel-oneapi-mpi/2021.13 - module load stack-python/3.10.13 + module load stack-python/3.11.7 module available module load jedi-ufs-env From ee7ca359bdb4d9e3327605af260e415be5088a7c Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Tue, 6 Aug 2024 16:08:02 -0600 Subject: [PATCH 4/6] Revert .gitmodules and update submodule pointer for spack --- .gitmodules | 6 ++---- spack | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index b3b180b16..a69f3e4f1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,7 @@ [submodule "spack"] path = spack - #url = https://github.com/jcsda/spack - #branch = spack-stack-dev - url = https://github.com/climbfuji/spack - branch = feature/cherry_pick_globus_updates_from_spack_develop + url = https://github.com/jcsda/spack + branch = spack-stack-dev [submodule "doc/CMakeModules"] path = doc/CMakeModules url = https://github.com/noaa-emc/cmakemodules diff --git a/spack b/spack index c259af1cc..fffff276c 160000 --- a/spack +++ b/spack @@ -1 +1 @@ -Subproject commit c259af1cca85d5a6d6881f2a21a256920f78fd86 +Subproject commit fffff276c9c7eff3646053d0d2eb8d75b37b834a From 559fca50c7c786d1cc621a61591d4cbbf3662c66 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Fri, 9 Aug 2024 16:10:37 -0600 Subject: [PATCH 5/6] Update submodule pointer for spack --- spack | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack b/spack index e28d8ef9a..e422f4293 160000 --- a/spack +++ b/spack @@ -1 +1 @@ -Subproject commit e28d8ef9a3dc4e36de12b26d227dcb7523371af9 +Subproject commit e422f42938148d69e310c85a4c15b4795c9c000b From 85fe5d400dab2abfb3bee214d1963449b4eaca6f Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Thu, 15 Aug 2024 17:52:32 -0600 Subject: [PATCH 6/6] Add 'py-dask +delayed' to gmao-swell-env and add comments in that package and in py-xnrl about the +delayed variant --- .../spack-stack/packages/gmao-swell-env/package.py | 11 +++++++---- .../repos/spack-stack/packages/py-xnrl/package.py | 2 ++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/spack-ext/repos/spack-stack/packages/gmao-swell-env/package.py b/spack-ext/repos/spack-stack/packages/gmao-swell-env/package.py index 28b73d67f..092fe668e 100644 --- a/spack-ext/repos/spack-stack/packages/gmao-swell-env/package.py +++ b/spack-ext/repos/spack-stack/packages/gmao-swell-env/package.py @@ -45,10 +45,13 @@ class GmaoSwellEnv(BundlePackage): depends_on("py-urllib3", type="run") depends_on("py-wheel", type="run") depends_on("py-setuptools", type="run") - - # Different versions than other bundles - depends_on("py-pycodestyle@2.10:", type="run") - depends_on("py-pyyaml@6:", type="run") + depends_on("py-pycodestyle", type="run") + depends_on("py-pyyaml", type="run") + # Note that the +delayed option is for compatibility + # with the py-xnrl package (this restricts py-dask + # to certain versions, since the newest versions + # don't have that option anymore. + depends_on("py-dask +delayed", type="run") # Future dependencies needed # depends_on("py-bokeh", type="run") diff --git a/spack-ext/repos/spack-stack/packages/py-xnrl/package.py b/spack-ext/repos/spack-stack/packages/py-xnrl/package.py index 8f620efea..add77b186 100644 --- a/spack-ext/repos/spack-stack/packages/py-xnrl/package.py +++ b/spack-ext/repos/spack-stack/packages/py-xnrl/package.py @@ -27,6 +27,8 @@ class PyXnrl(PythonPackage): depends_on("py-poetry", type="build") depends_on("py-metpy", type=("build", "run")) + # Note: if the +delayed option is removed, also + # need to remove it from gmao-swell-env. depends_on("py-dask +delayed", type=("build", "run")) depends_on("py-h5netcdf", type=("build", "run")) depends_on("py-netcdf4", type=("build", "run"))