Skip to content

Commit

Permalink
Merge branch 'release/1.5.1' of https://github.com/jcsda/spack-stack
Browse files Browse the repository at this point in the history
…into feature/rel_151_derecho_update
  • Loading branch information
climbfuji committed Oct 30, 2023
2 parents 97bc84e + d9d5c6d commit 3aac94a
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 8 deletions.
11 changes: 5 additions & 6 deletions configs/common/packages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
# config and update the projections for lmod/tcl.
# Also, check the acorn and derecho site configs which have esmf modifications.
esmf:
version: ['8.4.2']
version: ['8.5.0']
variants: ~xerces ~pnetcdf snapshot=none ~shared +external-parallelio
require:
- any_of: ['fflags="-fp-model precise" cxxflags="-fp-model precise"']
Expand Down Expand Up @@ -95,7 +95,7 @@
gfsio:
version: ['1.4.1']
gftl-shared:
version: ['1.5.0']
version: ['1.6.1']
#git-lfs:
# Assume git-lfs is provided, hard to install
# because of dependencies on go/go-bootstrap.
Expand Down Expand Up @@ -141,7 +141,7 @@
# errors with [email protected]+, see
# https://github.com/JCSDA/spack-stack/issues/769
# also: ... extdata2g segfault UFS?
version: ['2.35.2']
version: ['2.40.3']
variants: ~shared ~extdata2g ~pflogger
# If making changes here, also check the Discover site config and the CI workflows
met:
Expand Down Expand Up @@ -238,9 +238,8 @@
variants: +blas +lapack
py-openpyxl:
version: ['3.0.3']
# DH* 20230719 try without version
#py-pandas:
# version: ['1.4.0']
py-pandas:
version: ['1.5.3']
# To avoid pip._vendor.pep517.wrappers.BackendInvalid errors with newer
# versions of py-poetry-core when using external/homebrew Python as
# we do at the moment in spack-stack.
Expand Down
2 changes: 1 addition & 1 deletion configs/templates/unified-dev/spack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ spack:
# Various fms tags (list all to avoid duplicate packages)
- fms@release-jcsda
- [email protected]
- [email protected]
- [email protected].01

# Various crtm tags (list all to avoid duplicate packages)
- [email protected]
Expand Down

0 comments on commit 3aac94a

Please sign in to comment.