Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
76 commits
Select commit Hold shift + click to select a range
073f814
Set up submodule for testing
AlexanderRichert-NOAA Nov 16, 2023
963460b
try removing openssl default version
AlexanderRichert-NOAA Nov 16, 2023
9a6c6bf
Remove some defaults to clear up duplicates
AlexanderRichert-NOAA Nov 17, 2023
4cc3cf3
update default prod-util
AlexanderRichert-NOAA Nov 17, 2023
662cb3e
use new deprecated_io variant name for fms
AlexanderRichert-NOAA Nov 17, 2023
0b8f076
submodule update
AlexanderRichert-NOAA Nov 20, 2023
e29b15f
submodule pointer (libdap4 update)
AlexanderRichert-NOAA Nov 21, 2023
6408d4a
submodule pointer (libxpm update)
AlexanderRichert-NOAA Nov 21, 2023
377881d
submodule pointer
AlexanderRichert-NOAA Nov 21, 2023
7cc9b16
add _8 precision variants for w3emc, sp, ip
AlexanderRichert-NOAA Nov 21, 2023
1fbc677
submodule pointer
AlexanderRichert-NOAA Nov 21, 2023
a7aabe7
submodule pointer
AlexanderRichert-NOAA Nov 21, 2023
68da01f
submodule pointer (gmake fix)
AlexanderRichert-NOAA Nov 21, 2023
c3e7d5c
mysql: set download_boost as default
AlexanderRichert-NOAA Nov 21, 2023
8d33659
submodule pointer (mysql update)
AlexanderRichert-NOAA Nov 21, 2023
4525443
submodule pointer (merge jcsda_emc_spack_stack)
AlexanderRichert-NOAA Nov 21, 2023
458572a
fiddling with submodule
AlexanderRichert-NOAA Nov 21, 2023
f0640ad
Merge remote-tracking branch 'jcsda/develop' into nov2023_spackmerge
AlexanderRichert-NOAA Nov 21, 2023
f146a26
point submodule back to test repo
AlexanderRichert-NOAA Nov 21, 2023
b04cdf0
submodule pointer (lmod.py fix)
AlexanderRichert-NOAA Nov 21, 2023
d496370
submodule pointer (containers __init__.py fix)
AlexanderRichert-NOAA Nov 21, 2023
aef9bbb
pin gettext version because of intel (ubuntu CI) issue (one-arg stati…
AlexanderRichert-NOAA Nov 21, 2023
ee7a96a
fix macos-ci-aarch64.yaml (buildcache build-env call)
AlexanderRichert-NOAA Nov 22, 2023
d8e18a1
fix ci (buildcache calls)
AlexanderRichert-NOAA Nov 22, 2023
ea55f96
Update submodule pointer for spack
climbfuji Nov 22, 2023
db71994
Update submodule pointer for spack
climbfuji Nov 22, 2023
3a4c991
Trigger CI
climbfuji Nov 23, 2023
63a608c
submodule pointer (revert prebuilt aws; add rust-bootstrap for py-cry…
AlexanderRichert-NOAA Nov 29, 2023
c3cce38
set py-cryptography+rust_bootstrap by default
AlexanderRichert-NOAA Nov 29, 2023
88a181f
remove openssl version setting
AlexanderRichert-NOAA Nov 29, 2023
e087963
submodule pointer
AlexanderRichert-NOAA Nov 29, 2023
df51b66
remove py-crypto version setting
AlexanderRichert-NOAA Nov 29, 2023
e2e3b1d
use rust-bootstrap for py-setuptools-rust
AlexanderRichert-NOAA Nov 29, 2023
ab7b0cf
submodule pointer
AlexanderRichert-NOAA Nov 30, 2023
cedf950
pin py-numpy version
AlexanderRichert-NOAA Nov 30, 2023
199a93b
test numpy build (revert this commit)
AlexanderRichert-NOAA Nov 30, 2023
2f9b718
Revert "test numpy build (revert this commit)"
AlexanderRichert-NOAA Nov 30, 2023
e1cfc21
re-pin py-setuptools version
AlexanderRichert-NOAA Nov 30, 2023
9963f47
debug (revert this commit)
AlexanderRichert-NOAA Nov 30, 2023
a57f031
submodule pointer (hdf-eos2/apple-clang)
AlexanderRichert-NOAA Nov 30, 2023
e5588b4
Revert "debug (revert this commit)"
AlexanderRichert-NOAA Nov 30, 2023
d901856
submodule pointer (test hdf-eos2 tweak)
AlexanderRichert-NOAA Nov 30, 2023
793bad4
revert me
AlexanderRichert-NOAA Nov 30, 2023
65f8cce
Revert "revert me"
AlexanderRichert-NOAA Nov 30, 2023
c3d0116
Merge branch 'develop' into nov2023_spackmerge
AlexanderRichert-NOAA Dec 1, 2023
2ab5589
Merge branch 'develop' of https://github.com/jcsda/spack-stack into n…
climbfuji Dec 4, 2023
acbe5d4
Update .gitmodules and submodule pointer for spack for code review an…
climbfuji Dec 4, 2023
d45a349
Merge branch 'nov2023_spackmerge' of https://github.com/alexanderrich…
climbfuji Dec 4, 2023
c8d7167
update rhel-emc packages.yaml (remove bison,python,llvm)
AlexanderRichert-NOAA Dec 5, 2023
96c85aa
Update variant ectrans for ecmwf-atlas to just trans
climbfuji Dec 5, 2023
88edf67
set zlib to be the provider of zlib-api in common/packages.yaml
AlexanderRichert-NOAA Dec 5, 2023
305414d
Bump sp to 2.5.0
climbfuji Dec 5, 2023
4c2b758
Merge branch 'nov2023_spackmerge' of https://github.com/AlexanderRich…
climbfuji Dec 5, 2023
bad3b9b
S4 site config update: remove external perl
climbfuji Dec 5, 2023
ba2743b
update submodule pointer (met fix)
AlexanderRichert-NOAA Dec 5, 2023
f8c3ad5
Update configs/sites/nautilus/packages.yaml
climbfuji Dec 5, 2023
6b78fc5
Update doc/source/KnownIssues.rst
climbfuji Dec 5, 2023
390cced
Update doc/source/KnownIssues.rst for Discover
climbfuji Dec 6, 2023
2362336
Pin patchelf version on Derecho to avoid build errors with Intel
climbfuji Dec 6, 2023
953ec46
Don't use external perl for Linux
climbfuji Dec 6, 2023
4e7edd9
Require python@3.10.13
climbfuji Dec 7, 2023
1a516a6
Merge branch 'nov2023_spackmerge' of https://github.com/alexanderrich…
climbfuji Dec 7, 2023
73f0436
Merge branch 'develop' of https://github.com/jcsda/spack-stack into f…
climbfuji Dec 7, 2023
48c2b35
Update submodule pointer for spack
climbfuji Dec 7, 2023
76d24fa
Configure unified-dev and skylab-dev to build ewok with both ecflow a…
climbfuji Dec 7, 2023
1d21fb4
Update submodule pointer for spack
climbfuji Dec 11, 2023
cb645b9
Merge branch 'develop' of https://github.com/jcsda/spack-stack into f…
climbfuji Dec 11, 2023
d317a4a
Update submodule pointer for spack
climbfuji Dec 11, 2023
98d87c9
Add external sed on aws-pcluster, needed to build cylc parts
climbfuji Dec 12, 2023
d8e9598
Update submodule pointer for spack
climbfuji Dec 12, 2023
9d9011f
In configs/common/packages.yaml: ping py-cython to 0.29.36 to avoid d…
climbfuji Dec 12, 2023
a1a941e
Find external sed in .github/workflows/ubuntu-ci-x86_64.yaml
climbfuji Dec 12, 2023
14a5b0d
Bump Python version in .github/workflows/*.yaml
climbfuji Dec 12, 2023
00dc5f5
Pin py-cartopy to 0.21.1 and py-shapely to 1.8.0 to avoid plotting er…
climbfuji Dec 13, 2023
bf43ed3
Revert .gitmodules and update submodule pointer for spack
climbfuji Dec 13, 2023
e51bf1a
Merge branch 'develop' of https://github.com/jcsda/spack-stack into f…
climbfuji Dec 13, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/macos-ci-aarch64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ jobs:
module use ${ENVDIR}/install/modulefiles/Core
module load stack-apple-clang/14.0.3
module load stack-openmpi/4.1.6
module load stack-python/3.10.8
module load stack-python/3.10.13
module available

module load jedi-ufs-env/1.0.0
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/macos-ci-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ jobs:
module use ${ENVDIR}/install/modulefiles/Core
module load stack-apple-clang/14.0.0
module load stack-openmpi/4.1.6
module load stack-python/3.10.8
module load stack-python/3.10.13
module available

module load jedi-ufs-env/1.0.0
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/ubuntu-ci-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ jobs:

# Find external packages
spack external find --scope system --exclude bison --exclude openssl
spack external find --scope system sed
spack external find --scope system perl
spack external find --scope system wget
PATH="/usr/local/opt/curl/bin:$PATH" \
Expand Down Expand Up @@ -182,7 +183,7 @@ jobs:
module use ${ENVDIR}/install/modulefiles/Core
module load stack-intel/2022.1.0
module load stack-intel-oneapi-mpi/2021.6.0
module load stack-python/3.10.8
module load stack-python/3.10.13
module available

module load jedi-ufs-env/1.0.0
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ubuntu-rnd-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ jobs:
module use /home/ubuntu/spack-stack/CI/unified-env/${TODAY}/modulefiles/Core
module load stack-intel/2022.1.0
module load stack-intel-oneapi-mpi/2021.6.0
module load stack-python/3.10.8
module load stack-python/3.10.13
module available

module load jedi-ufs-env/1.0.0
Expand Down
35 changes: 7 additions & 28 deletions configs/common/packages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -207,21 +207,20 @@
proj:
version: ['8.1.0']
variants: ~tiff
# Check site configs for the following systems when making changes here:
# Derecho, Narwhal, Gaea-C5
python:
version: ['3.10.8']
require: "@3.10.13"
py-attrs:
# https://github.com/JCSDA/spack-stack/issues/740
version: ['21.4.0']
py-cartopy:
variants: +plotting
py-click:
version: ['8.0.3']
require: "@0.21.1"
py-cryptography:
variants: +rust_bootstrap
py-eccodes:
version: ['1.4.2']
# Introduced in https://github.com/JCSDA/spack-stack/pull/894, pin py-cython
# to avoid duplicate packages being built (cylc dependencies soft-want @3:)
py-cython:
require: "@0.29.36"
py-h5py:
version: ['3.7.0']
variants: ~mpi
Expand All @@ -241,33 +240,13 @@
# 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.
py-poetry-core:
version: ['1.0.8']
py-pybind11:
version: ['2.8.1']
py-pygithub:
version: ['1.55']
py-pygrib:
version: ['2.1.4']
py-pyhdf:
version: ['0.10.4']
py-pyproj:
version: ['3.1.0']
py-python-dateutil:
version: ['2.8.2']
py-pythran:
# Versions earlier than 0.11.0 don't compile on macOS with llvm-clang/13.0.0 and Python/3.9,
# and 0.11.0 leads to downstream errors in py-scipy with the Intel compilers
version: ['0.12.2']
py-scipy:
version: ['1.9.3']
# Pin the py-setuptools version to avoid duplicate Python packages
py-setuptools:
require: ['@63.4.3']
py-setuptools-rust:
variants: +rust_bootstrap
py-shapely:
version: ['1.8.0']
require: ['@1.8.0']
qt:
version: ['5.15.3']
scotch:
Expand Down
4 changes: 4 additions & 0 deletions configs/sites/aws-pcluster/packages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,10 @@ packages:
externals:
- spec: qt@5.12.8
prefix: /usr
sed:
externals:
- spec: sed@4.7
prefix: /usr
tar:
externals:
- spec: tar@1.30
Expand Down
2 changes: 1 addition & 1 deletion configs/templates/skylab-dev/spack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ spack:
definitions:
- compilers: ['%aocc', '%apple-clang', '%gcc', '%intel']
- packages:
- ewok-env
- ewok-env +ecflow +cylc
- jedi-fv3-env
- jedi-mpas-env
- jedi-neptune-env
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 @@ -11,7 +11,7 @@ spack:
- global-workflow-env
- gmao-swell-env
- gsi-env
- ewok-env
- ewok-env +ecflow +cylc
- jedi-fv3-env
- jedi-mpas-env
- jedi-neptune-env
Expand Down