Skip to content

Commit 67955c5

Browse files
Merge branch 'JCSDA:develop' into develop
2 parents 51f036b + a706c80 commit 67955c5

23 files changed

+74
-303
lines changed

.github/workflows/macos-ci-aarch64.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -211,8 +211,8 @@ jobs:
211211
212212
module use ${ENVDIR}/install/modulefiles/Core
213213
module load stack-apple-clang/14.0.3
214-
module load stack-openmpi/5.0.5
215-
module load stack-python/3.11.7
214+
module load stack-openmpi/5.0.6
215+
module load stack-python/3.11.11
216216
module available
217217
218218
module load jedi-ufs-env

.github/workflows/ubuntu-ci-x86_64-gnu.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -218,8 +218,8 @@ jobs:
218218
219219
module use ${ENVDIR}/install/modulefiles/Core
220220
module load stack-gcc/11.4.0
221-
module load stack-openmpi/5.0.5
222-
module load stack-python/3.11.7
221+
module load stack-openmpi/5.0.6
222+
module load stack-python/3.11.11
223223
module available
224224
225225
module load jedi-ufs-env

.github/workflows/ubuntu-ci-x86_64-intel.yaml

Lines changed: 0 additions & 252 deletions
This file was deleted.

.github/workflows/ubuntu-ci-x86_64-oneapi-ifx.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ jobs:
240240
module use ${ENVDIR}/install/modulefiles/Core
241241
module load stack-oneapi/2024.2.0
242242
module load stack-intel-oneapi-mpi/2021.13
243-
module load stack-python/3.11.7
243+
module load stack-python/3.11.11
244244
module available
245245
246246
module load jedi-ufs-env

.github/workflows/ubuntu-ci-x86_64-oneapi.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ jobs:
240240
module use ${ENVDIR}/install/modulefiles/Core
241241
module load stack-oneapi/2024.2.0
242242
module load stack-intel-oneapi-mpi/2021.13
243-
module load stack-python/3.11.7
243+
module load stack-python/3.11.11
244244
module available
245245
246246
module load jedi-ufs-env

.github/workflows/unit-tests.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ on:
66

77
jobs:
88
test:
9-
runs-on: ubuntu-20.04
9+
runs-on: ubuntu-latest
1010

1111
steps:
1212
- name: checkout
13-
uses: actions/checkout@v2
13+
uses: actions/checkout@v4
1414
with:
1515
submodules: true
1616

.github/workflows/util-tests.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
os: [ubuntu-latest, macos-latest]
1313
steps:
1414
- name: checkout
15-
uses: actions/checkout@v2
15+
uses: actions/checkout@v4
1616
with:
1717
submodules: true
1818

configs/common/config.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,6 @@ config:
2828

2929
# Timeout in seconds for web requests (curl/urllib)
3030
connect_timeout: 60
31+
32+
# Install deprecated packages (need for py-werkzeug@0.15.3, DH 20250417)
33+
deprecated: true

configs/common/modules_tcl.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,6 @@ modules:
55
roots:
66
tcl: $env/install/modulefiles
77
tcl:
8-
# Core compiler is a dummy that is not used to build the stack, do not change.
9-
# Hopefully nobody is trying to build software with gcc-4.6 in 2023 ...
10-
core_compilers::
11-
- gcc@4.6
128
projections:
139
all: '{compiler.name}/{compiler.version}/{name}/{version}'
1410
^mpi: '{^mpi.name}/{^mpi.version}/{compiler.name}/{compiler.version}/{name}/{version}'

configs/common/packages.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,11 @@ packages:
120120
# Note: Uncommenting this entry will break
121121
# the container builds.
122122
#require: '@2.11.0'
123+
# https://github.com/spack/spack/issues/49358
124+
# https://github.com/spack/spack/pull/44323
125+
glib:
126+
require:
127+
- '@:2.78.3'
123128
# To avoid duplicate packages being built
124129
gmake:
125130
require:
@@ -221,7 +226,7 @@ packages:
221226
# with Intel in py-cryptography unless external curl and openssl
222227
# are removed, which itself is problematic.
223228
python:
224-
require: '@3.11.7 ~crypt'
229+
require: '@3.11.11 ~crypt'
225230
py-cartopy:
226231
require: '+plotting'
227232
# Avoid full rust dependency: version 43+ requires py-maturin

0 commit comments

Comments
 (0)