diff --git a/conda_build/build.py b/conda_build/build.py index 934536678e..841c216fff 100644 --- a/conda_build/build.py +++ b/conda_build/build.py @@ -44,7 +44,7 @@ root_dir, url_path, ) -from .config import Config, CondaPkgFormat +from .config import CondaPkgFormat, Config from .create_test import create_all_test_files from .deprecations import deprecated from .exceptions import CondaBuildException, DependencyNeedsBuildingError @@ -1996,8 +1996,10 @@ def bundle_conda(output, metadata: MetaData, env, stats, **kw): final_outputs = [] cph_kwargs = {} ext = CondaPkgFormat.V1.ext - breakpoint() - if output.get("type") == CondaPkgFormat.V2 or metadata.config.conda_pkg_format == CondaPkgFormat.V2: + if ( + output.get("type") == CondaPkgFormat.V2 + or metadata.config.conda_pkg_format == CondaPkgFormat.V2 + ): ext = CondaPkgFormat.V2.ext cph_kwargs["compression_tuple"] = ( ".tar.zst", diff --git a/conda_build/cli/main_build.py b/conda_build/cli/main_build.py index 63caa353cc..4cd3689caa 100644 --- a/conda_build/cli/main_build.py +++ b/conda_build/cli/main_build.py @@ -18,10 +18,10 @@ from .. import api, build, source, utils from ..conda_interface import add_parser_channels, binstar_upload, cc_conda_build from ..config import ( + CondaPkgFormat, conda_pkg_format_default, get_channel_urls, get_or_merge_config, - CondaPkgFormat, zstd_compression_level_default, ) from ..utils import LoggingContext diff --git a/conda_build/config.py b/conda_build/config.py index f037cec418..7e7b6495a8 100644 --- a/conda_build/config.py +++ b/conda_build/config.py @@ -12,7 +12,7 @@ import shutil import time from collections import namedtuple -from enum import Enum, auto +from enum import Enum from os.path import abspath, expanduser, expandvars, join from typing import TYPE_CHECKING @@ -21,6 +21,7 @@ CONDA_PACKAGE_EXTENSION_V2, # noqa: F401 CONDA_PACKAGE_EXTENSIONS, # noqa: F401 ) + from .conda_interface import ( binstar_upload, cc_conda_build, @@ -76,7 +77,6 @@ def normalize(cls, input) -> CondaPkgFormat: elif input in (2, "2", "conda", ".conda", cls.V2): return cls.V2 - @staticmethod def acceptable(): return (1, "1", "tar.bz2", ".tar.bz2", 2, "2", "conda", ".conda") diff --git a/conda_build/metadata.py b/conda_build/metadata.py index c4c1de7884..66b3a9176d 100644 --- a/conda_build/metadata.py +++ b/conda_build/metadata.py @@ -19,7 +19,7 @@ from . import exceptions, utils, variants from .conda_interface import MatchSpec, envs_dirs, md5_file -from .config import Config, get_or_merge_config, CondaPkgFormat +from .config import CondaPkgFormat, Config, get_or_merge_config from .features import feature_list from .license_family import ensure_valid_license_family from .utils import (