Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update buildlib, buildlib_2.1, buildlib_2.2 #458

Open
wants to merge 1 commit into
base: release-1.6
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cime_config/buildlib
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"""
build blom library
"""
import os, shutil, sys, glob, imp
import os, sys

_CIMEROOT = os.environ.get("CIMEROOT")
if _CIMEROOT is None:
Expand Down
5 changes: 3 additions & 2 deletions cime_config/buildlib_2.1
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
"""
build blom library
"""
import os, shutil, sys, glob, imp
import os, shutil, sys, glob
from importlib.machinery import SourceFileLoader

_CIMEROOT = os.environ.get("CIMEROOT")
if _CIMEROOT is None:
Expand Down Expand Up @@ -32,7 +33,7 @@ def _main_func():
cmd = os.path.join(os.path.join(comp_root_dir_ocn, "cime_config", "buildcpp"))
logger.info(" ...calling blom buildcpp to set build time options")
try:
mod = imp.load_source("buildcpp", cmd)
mod = SourceFileLoader("buildcpp", cmd).load_module()
blom_cppdefs = mod.buildcpp(case)
except:
raise
Expand Down
5 changes: 3 additions & 2 deletions cime_config/buildlib_2.2
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
"""
build blom library
"""
import os, shutil, sys, glob, imp
import os, shutil, sys, glob
from importlib.machinery import SourceFileLoader

_CIMEROOT = os.environ.get("CIMEROOT")
if _CIMEROOT is None:
Expand Down Expand Up @@ -33,7 +34,7 @@ def _main_func():
cmd = os.path.join(os.path.join(comp_root_dir_ocn, "cime_config", "buildcpp"))
logger.info(" ...calling blom buildcpp to set build time options")
try:
mod = imp.load_source("buildcpp", cmd)
mod = SourceFileLoader("buildcpp", cmd).load_module()
blom_cppdefs = mod.buildcpp(case)
except:
raise
Expand Down