Merge tag 'cime6.0.184' into noresm

cime6.0.184

.github/workflows/docs.yml

@@ -91,7 +91,9 @@ jobs:
           user_name: 'github-actions[bot]'
           user_email: 'github-actions[bot]@users.noreply.github.com'
       - name: Comment about previewing documentation
-        if: ${{ github.event_name == 'pull_request' }}
+        if: |
+          github.event_name == 'pull_request' &&
+          github.event.pull_request.head.repo.full_name == github.repository
         uses: actions/github-script@v6
         with:
           script: |

.github/workflows/testing.yml

@@ -89,7 +89,7 @@ jobs:
 
           init_cime
 
-          pytest -vvv --machine docker --no-fortran-run CIME/tests/test_unit*
+          pytest -vvv --cov=CIME --machine docker --no-fortran-run CIME/tests/test_unit*
 
   # Run system tests
   system-testing:
@@ -145,7 +145,7 @@ jobs:
 
           conda activate base
 
-          pytest -vvv --machine docker --no-fortran-run --no-teardown CIME/tests/test_sys*
+          pytest -vvv --cov=CIME --machine docker --no-fortran-run --no-teardown CIME/tests/test_sys*
       - name: Create testing log archive
         if: ${{ failure() }}
         shell: bash

.gitignore

@@ -26,3 +26,4 @@ scripts/Tools/JENKINS*
 components
 libraries
 share
+test_coverage/**

CIME/ParamGen/paramgen.py

@@ -4,6 +4,7 @@
 from copy import deepcopy
 import logging
 import subprocess
+import shutil
 
 try:
     from paramgen_utils import is_logical_expr, is_formula, has_unexpanded_var
@@ -136,9 +137,7 @@ def from_xml_nml(cls, input_path, match="last", no_duplicates=False):
         """
 
         # First check whether the given xml file conforms to the entry_id_pg.xsd schema
-        from distutils.spawn import find_executable
-
-        xmllint = find_executable("xmllint")
+        xmllint = shutil.which("xmllint")
         if xmllint is None:
             logger.warning("Couldn't find xmllint. Skipping schema check")
         else: