Skip to content

Commit

Permalink
Merge pull request #54 from mvertens/feature/update_to_cime6.0.184
Browse files Browse the repository at this point in the history
update noresm to cime6.0.184
  • Loading branch information
mvdebolskiy authored Nov 8, 2023
2 parents 1364ee7 + 4bb2cf3 commit cd2dc67
Show file tree
Hide file tree
Showing 26 changed files with 3,618 additions and 576 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,4 @@ scripts/Tools/JENKINS*
components
libraries
share
test_coverage/**
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
Loading

0 comments on commit cd2dc67

Please sign in to comment.