Merge branch 'develop' into issue_form_oct2023

AlexanderRichert-NOAA · Oct 18, 2023 · e1fd5ab · e1fd5ab
2 parents 637a4da + 5bf4c8e
commit e1fd5ab
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 21 deletions.
diff --git a/.github/workflows/ubuntu-ci-containers-x86_64.yaml b/.github/workflows/ubuntu-ci-containers-x86_64.yaml
@@ -1,9 +1,9 @@
 name: ubuntu-ci-container-x86_64-build
 on:
-  pull_request:
-    # pull request to develop with label
-    branches: [develop]
-    types: [labeled]
+  #pull_request:
+  #  # pull request to develop with label
+  #  branches: [develop]
+  #  types: [labeled]
   schedule:
     - cron: '0 8 * * *'
   workflow_dispatch:
@@ -23,7 +23,7 @@ defaults:
 jobs:
   ubuntu-ci-container-x86_64-build:
     # For PRs only if label matches, and for workflow_dispatch and schedule events
-    if: ${{ github.event.label.name == 'container-ci' }} || ${{ github.event_name == 'workflow_dispatch' }} || ${{ github.event_name == 'schedule' }}
+    #if: ${{ github.event.label.name == 'container-ci' }} || ${{ github.event_name == 'workflow_dispatch' }} || ${{ github.event_name == 'schedule' }}
     runs-on: [ubuntu-ci-x86_64]
 
     steps:
@@ -64,7 +64,7 @@ jobs:
           else
             # Day 7: The Sabbath of rest
             echo "Pruning all docker images"
-            docker system prune -a
+            docker system prune -a -f
             exit 0
           fi
 

diff --git a/configs/common/packages.yaml b/configs/common/packages.yaml
@@ -54,7 +54,7 @@
       variants: +fckit +ectrans +tesselation +fftw
     ectrans:
       version: ['1.2.0']
-      variants: ~enable_mkl +fftw
+      variants: ~mkl +fftw
     eigen:
       version: ['3.4.0']
     # Attention - when updating the version also check the common modules.yaml
@@ -80,7 +80,7 @@
     fms:
       #version: ['2023.01']
       #variants: precision=32,64 +quad_precision +gfs_phys +openmp +pic constants=GFS build_type=Release
-      version: ['2023.02']
+      version: ['2023.02.01']
       variants: precision=32,64 +quad_precision +gfs_phys +openmp +pic constants=GFS build_type=Release +use_fmsio
     fontconfig:
       variants: +pic
@@ -236,8 +236,8 @@
     py-numpy:
       version: ['1.22.3']
       variants: +blas +lapack
-    py-openpyxl:
-      version: ['3.0.3']
+    py-pandas:
+      variants: +excel
     # 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.

diff --git a/configs/containers/docker-ubuntu-intel-impi.yaml b/configs/containers/docker-ubuntu-intel-impi.yaml
@@ -44,11 +44,12 @@ spack:
       externals:
       - spec: [email protected]
         prefix: /opt/intel/oneapi
-    intel-oneapi-mkl:
-      buildable: false
-      externals:
-      - spec: [email protected]
-        prefix: /opt/intel/oneapi
+    # Comment out for now so that fftw-api uses fftw and not mkl
+    #intel-oneapi-mkl:
+    #  buildable: false
+    #  externals:
+    #  - spec: [email protected]
+    #    prefix: /opt/intel/oneapi
     gmake:
       buildable: false
       externals:

diff --git a/configs/containers/specs/jedi-ci.yaml b/configs/containers/specs/jedi-ci.yaml
@@ -1,5 +1,5 @@
   ### spack-stack-1.5.0 / skylab-6.0.0 containers for fv3-jedi and mpas-jedi (but not for ufs-jedi)
-  specs: [[email protected], [email protected] ~fftw, [email protected], [email protected],
+  specs: [[email protected], [email protected], [email protected], [email protected],
     [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], ecflow@5,
     [email protected], [email protected] +fckit +ectrans +tesselation +fftw, [email protected], [email protected] +fftw,
     [email protected], [email protected], fms@release-jcsda, [email protected], [email protected], [email protected],

diff --git a/configs/sites/acorn/packages.yaml b/configs/sites/acorn/packages.yaml
@@ -10,8 +10,6 @@
         - libfabric
         - craype-network-ofi
         - cray-mpich/8.1.9
-    esmf:
-      variants: esmf_os=Linux esmf_comm=mpich3
     git:
       buildable: false
       externals:

diff --git a/doc/source/KnownIssues.rst b/doc/source/KnownIssues.rst
@@ -7,9 +7,9 @@ Known Issues
 General
 ==============================
 
-1. ``gcc@13`` (``gcc``, ``g++``, ``gfortran``) not yet supported
+1. ``gcc@13`` (``gcc``, ``g++``, ``gfortran``) and ``apple-clang@15`` (``clang``, ``clang++``) not yet supported
 
-   Our software stack doesn't build with ``gcc@13`` yet. This is also true when combining the LLVM or Apple ``clang`` compiler with ``gfortran@13``.
+   Our software stack doesn't build with ``gcc@13`` yet. This is also true when combining the LLVM or Apple ``clang`` compiler with ``gfortran@13``. We also don't support the latest release of ``apple-clang@15`` yet.
 
 2. Build errors for ``mapl@2.35.2`` with ``mpich@4.1.1``
 

diff --git a/spack b/spack
+3 −1		var/spack/repos/builtin/packages/ectrans/package.py
+3 −0		var/spack/repos/builtin/packages/fms/package.py
+10 −1		var/spack/repos/builtin/packages/proj/package.py
+1 −1		var/spack/repos/builtin/packages/py-awscrt/package.py
+18 −0		var/spack/repos/builtin/packages/py-odfpy/package.py
+1 −0		var/spack/repos/builtin/packages/py-openpyxl/package.py
+22 −0		var/spack/repos/builtin/packages/py-pandas/package.py
+19 −0		var/spack/repos/builtin/packages/py-pyxlsb/package.py
+4 −0		var/spack/repos/builtin/packages/py-xlsxwriter/package.py
+7 −6		var/spack/repos/builtin/packages/texinfo/package.py
+1 −1		var/spack/repos/jcsda-emc-bundles/packages/jedi-tools-env/package.py
+1 −1		var/spack/repos/jcsda-emc-bundles/packages/ufs-weather-model-env/package.py