Merge pull request #1858 from climbfuji/feature/merge_rel20_to_develop

Merge release/2.0 to develop

Author: climbfuji

.gitmodules

@@ -2,10 +2,6 @@
   path = spack
   url = https://github.com/jcsda/spack
   branch = spack-stack-dev
-[submodule "doc/CMakeModules"]
-  path = doc/CMakeModules
-  url = https://github.com/noaa-emc/cmakemodules
-  branch = v1.3.0
 [submodule "repos/builtin"]
   path = repos/builtin
   url = https://github.com/jcsda/spack-packages

configs/common/modules_lmod.yaml

@@ -266,6 +266,12 @@ modules:
           set:
             'UPP_INC': '{prefix}/include'
             'UPP_LIB': '{prefix}/lib/libupp.a'
+      # NOTE: This will be fixed upstream in udunits Spack package
+      # Once this is done, remove this section
+      udunits:
+        environment:
+          set:
+            'UDUNITS2_XML_PATH': '{prefix}/share/udunits/udunits2.xml'
 
       hierarchy:
       - mpi

configs/common/modules_tcl.yaml

@@ -285,3 +285,9 @@ modules:
           set:
             'UPP_INC': '{prefix}/include'
             'UPP_LIB': '{prefix}/lib/libupp.a'
+      # NOTE: This will be fixed upstream in udunits Spack package
+      # Once this is done, remove this section
+      udunits:
+        environment:
+          set:
+            'UDUNITS2_XML_PATH': '{prefix}/share/udunits/udunits2.xml'

configs/common/packages.yaml

@@ -161,6 +161,10 @@ packages:
     #gsl-lite:
     #  require:
     #  - '@0.37.0'
+    harfbuzz:
+      # cmake-based harfbuzz fails during build
+      require:
+      - one_of: ['build_system=meson', 'build_system=autotools']
     hdf:
       require:
       - '@4.2.15'

configs/common/packages_clang.yaml

@@ -13,6 +13,3 @@ packages:
     ectrans:
       require:
       - +fftw
-    ip:
-      require:
-      - '~openmp'

configs/common/packages_oneapi.yaml

@@ -43,6 +43,9 @@ packages:
     py-maturin:
       require:
       - '%gcc'
+    py-scipy:
+      require:
+      - 'cxxflags="-O1"'
     qt:
       require:
       - '%gcc'