Skip to content

Commit 94be808

Browse files
Add uwtools for global-workflow-env, build openssl in the stack (#1736)
Add uwtools for global-workflow-env. Note: newer versions of uwtools will be available when [email protected] is available; see: Update uwtools versions and add py-python-dateutils dependency #1 Remove system openssl from configs/sites/tier1/orion/packages.yaml, as py-crytpography will not build against it; this breaks CI/CD weekly build / test automation for spack-stack@develop on orion / oneapi.
1 parent 588e167 commit 94be808

File tree

6 files changed

+7
-8
lines changed

6 files changed

+7
-8
lines changed

configs/common/packages.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -308,6 +308,8 @@ packages:
308308
# Note - we can remove upp from stack at some point?
309309
upp:
310310
require: '@10.0.10'
311+
uwtools:
312+
require: '@2.7.2'
311313
# Need extradeps for grib-utils, which ties us to w3ecm@:2.11
312314
w3emc:
313315
require:

configs/common/packages_oneapi.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@ packages:
3030
parallel-netcdf:
3131
require:
3232
- '+shared-intel'
33+
py-maturin:
34+
require:
35+
- '%gcc'
3336
qt:
3437
require:
3538
- '%gcc'

configs/sites/tier1/orion/packages.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,6 @@ packages:
9191
externals:
9292
9393
prefix: /usr
94-
openssl:
95-
externals:
96-
97-
prefix: /usr
9894
perl:
9995
externals:
10096
- spec: [email protected]~cpanm+opcode+open+shared+threads

configs/sites/tier1/orion/packages_oneapi.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,6 @@ packages:
3939
gsibec:
4040
require::
4141
- '@1.2.1 ~mkl'
42-
py-maturin:
43-
require:
44-
- '%gcc'
4542
py-numpy:
4643
require::
4744
- '@1.26'

spack-ext/repos/spack-stack/packages/global-workflow-env/package.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,5 +45,6 @@ class GlobalWorkflowEnv(BundlePackage):
4545
depends_on("gsi-ncdiag")
4646
depends_on("crtm")
4747
depends_on("py-wxflow", when="+python")
48+
depends_on("uwtools")
4849

4950
# There is no need for install() since there is no code.

0 commit comments

Comments
 (0)