Skip to content

Commit

Permalink
main_build: Construct config via get_or_merge_config
Browse files Browse the repository at this point in the history
Helps tests with default_testing_config monkeypatch.

Signed-off-by: Marcel Bargull <[email protected]>
  • Loading branch information
mbargull committed Nov 10, 2023
1 parent 1d481d5 commit 95f8085
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions conda_build/cli/main_build.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

from .. import api, build, source, utils
from ..conda_interface import add_parser_channels, binstar_upload, cc_conda_build
from ..config import Config, get_channel_urls, zstd_compression_level_default
from ..config import get_channel_urls, get_or_merge_config, zstd_compression_level_default
from ..deprecations import deprecated
from ..utils import LoggingContext
from .actions import KeyValueAction
Expand Down Expand Up @@ -514,7 +514,7 @@ def check_action(recipe, config):

def execute(args):
_parser, args = parse_args(args)
config = Config(**args.__dict__)
config = get_or_merge_config(None, **args.__dict__)
build.check_external()

# change globals in build module, see comment there as well
Expand Down

0 comments on commit 95f8085

Please sign in to comment.