Skip to content

Commit

Permalink
pre-commit appeasement
Browse files Browse the repository at this point in the history
  • Loading branch information
ryanskeith committed Mar 2, 2024
1 parent 27c613d commit 6fff2c9
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 7 deletions.
8 changes: 5 additions & 3 deletions conda_build/build.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion conda_build/cli/main_build.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions conda_build/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -21,6 +21,7 @@
CONDA_PACKAGE_EXTENSION_V2, # noqa: F401
CONDA_PACKAGE_EXTENSIONS, # noqa: F401
)

from .conda_interface import (
binstar_upload,
cc_conda_build,
Expand Down Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion conda_build/metadata.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down

0 comments on commit 6fff2c9

Please sign in to comment.