Skip to content

Commit

Permalink
Merge pull request #4500 from nusbaume/paramgen_py12
Browse files Browse the repository at this point in the history
Remove deprecated 'distutils' package from ParamGen.
  • Loading branch information
jedwards4b authored Oct 18, 2023
2 parents 88255d5 + b5ea392 commit 0a9126e
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions CIME/ParamGen/paramgen.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down

0 comments on commit 0a9126e

Please sign in to comment.