Finish conda_build.conda_interface deprecations

conda_build/bdist_conda.py

@@ -4,14 +4,15 @@
 import sys
 import time
 from collections import defaultdict
+from io import StringIO
 
+from conda.cli.common import spec_from_line
 from setuptools.command.install import install
 from setuptools.dist import Distribution
 from setuptools.errors import BaseError, OptionError
 
 from . import api
 from .build import handle_anaconda_upload
-from .conda_interface import StringIO, spec_from_line
 from .config import Config
 from .deprecations import deprecated
 from .metadata import MetaData

conda_build/build.py

@@ -26,23 +26,19 @@
 import yaml
 from bs4 import UnicodeDammit
 from conda import __version__ as conda_version
+from conda.auxlib.entity import EntityEncoder
+from conda.base.constants import PREFIX_PLACEHOLDER
 from conda.base.context import context, reset_context
 from conda.core.prefix_data import PrefixData
 from conda.exceptions import CondaError, NoPackagesFoundError, UnsatisfiableError
+from conda.gateways.disk.create import TemporaryDirectory
 from conda.models.channel import Channel
+from conda.models.enums import FileMode, PathType
+from conda.models.match_spec import MatchSpec
+from conda.utils import url_path
 
 from . import __version__ as conda_build_version
 from . import environ, noarch_python, source, tarcheck, utils
-from .conda_interface import (
-    EntityEncoder,
-    FileMode,
-    MatchSpec,
-    PathType,
-    TemporaryDirectory,
-    env_path_backup_var_exists,
-    prefix_placeholder,
-    url_path,
-)
 from .config import Config
 from .create_test import create_all_test_files
 from .deprecations import deprecated
@@ -195,7 +191,7 @@ def have_prefix_files(files, prefix):
     """
 
     prefix_bytes = prefix.encode(utils.codec)
-    prefix_placeholder_bytes = prefix_placeholder.encode(utils.codec)
+    prefix_placeholder_bytes = PREFIX_PLACEHOLDER.encode(utils.codec)
     searches = {prefix: prefix_bytes}
     if utils.on_win:
         # some windows libraries use unix-style path separators
@@ -206,7 +202,7 @@ def have_prefix_files(files, prefix):
         double_backslash_prefix = prefix.replace("\\", "\\\\")
         double_backslash_prefix_bytes = double_backslash_prefix.encode(utils.codec)
         searches[double_backslash_prefix] = double_backslash_prefix_bytes
-    searches[prefix_placeholder] = prefix_placeholder_bytes
+    searches[PREFIX_PLACEHOLDER] = prefix_placeholder_bytes
     min_prefix = min(len(k) for k, _ in searches.items())
 
     # mm.find is incredibly slow, so ripgrep is used to pre-filter the list.
@@ -1149,13 +1145,13 @@ def get_files_with_prefix(m, replacements, files_in, prefix):
             prefix[0].upper() + prefix[1:],
             prefix[0].lower() + prefix[1:],
             prefix_u,
-            prefix_placeholder.replace("\\", "'"),
-            prefix_placeholder.replace("/", "\\"),
+            PREFIX_PLACEHOLDER.replace("\\", "'"),
+            PREFIX_PLACEHOLDER.replace("/", "\\"),
         ]
         # some python/json files store an escaped version of prefix
         pfx_variants.extend([pfx.replace("\\", "\\\\") for pfx in pfx_variants])
     else:
-        pfx_variants = (prefix, prefix_placeholder)
+        pfx_variants = (prefix, PREFIX_PLACEHOLDER)
     # replacing \ with \\ here is for regex escaping
     re_test = (
         b"("
@@ -2351,8 +2347,6 @@ def create_build_envs(m: MetaData, notest):
             )
     except DependencyNeedsBuildingError as e:
         # subpackages are not actually missing.  We just haven't built them yet.
-        from .conda_interface import MatchSpec
-
         other_outputs = (
             m.other_outputs.values()
             if hasattr(m, "other_outputs")
@@ -2416,8 +2410,6 @@ def build(
     with utils.path_prepended(m.config.build_prefix):
         env = environ.get_dict(m=m)
     env["CONDA_BUILD_STATE"] = "BUILD"
-    if env_path_backup_var_exists:
-        env["CONDA_PATH_BACKUP"] = os.environ["CONDA_PATH_BACKUP"]
 
     # this should be a no-op if source is already here
     if m.needs_source_for_render:
@@ -3447,8 +3439,6 @@ def test(
         env.update(environ.get_dict(m=metadata, prefix=config.test_prefix))
         env["CONDA_BUILD_STATE"] = "TEST"
         env["CONDA_BUILD"] = "1"
-        if env_path_backup_var_exists:
-            env["CONDA_PATH_BACKUP"] = os.environ["CONDA_PATH_BACKUP"]
 
     if not metadata.config.activate or metadata.name() == "conda":
         # prepend bin (or Scripts) directory
@@ -3531,8 +3521,6 @@ def test(
         env = dict(os.environ.copy())
         env.update(environ.get_dict(m=metadata, prefix=metadata.config.test_prefix))
         env["CONDA_BUILD_STATE"] = "TEST"
-        if env_path_backup_var_exists:
-            env["CONDA_PATH_BACKUP"] = os.environ["CONDA_PATH_BACKUP"]
 
     if config.test_run_post:
         from .utils import get_installed_packages

conda_build/cli/main_build.py

@@ -17,7 +17,6 @@
 from conda.common.io import dashlist
 
 from .. import api, build, source, utils
-from ..conda_interface import add_parser_channels, cc_conda_build
 from ..config import (
     get_channel_urls,
     get_or_merge_config,
@@ -27,12 +26,16 @@
 from .actions import KeyValueAction
 from .main_render import get_render_parser
 
+try:
+    from conda.cli.helpers import add_parser_channels
+except ImportError:
+    # conda<23.11
+    from conda.cli.conda_argparse import add_parser_channels
+
 if TYPE_CHECKING:
-    from argparse import Namespace
+    from argparse import ArgumentParser, Namespace
     from typing import Sequence
 
-    from ..conda_interface import ArgumentParser
-
 
 def parse_args(args: Sequence[str] | None) -> tuple[ArgumentParser, Namespace]:
     parser = get_render_parser()
@@ -70,7 +73,7 @@ def parse_args(args: Sequence[str] | None) -> tuple[ArgumentParser, Namespace]:
         action="store_false",
         help="Don't include the recipe inside the built package.",
         dest="include_recipe",
-        default=cc_conda_build.get("include_recipe", "true").lower() == "true",
+        default=context.conda_build.get("include_recipe", "true").lower() == "true",
     )
     parser.add_argument(
         "-s",
@@ -125,7 +128,7 @@ def parse_args(args: Sequence[str] | None) -> tuple[ArgumentParser, Namespace]:
             "Skip recipes for which there already exists an existing build "
             "(locally or in the channels)."
         ),
-        default=cc_conda_build.get("skip_existing", "false").lower() == "true",
+        default=context.conda_build.get("skip_existing", "false").lower() == "true",
     )
     parser.add_argument(
         "--keep-old-work",
@@ -145,7 +148,7 @@ def parse_args(args: Sequence[str] | None) -> tuple[ArgumentParser, Namespace]:
         "--quiet",
         action="store_true",
         help="do not display progress bar",
-        default=cc_conda_build.get("quiet", "false").lower() == "true",
+        default=context.conda_build.get("quiet", "false").lower() == "true",
     )
     parser.add_argument(
         "--debug",
@@ -155,12 +158,12 @@ def parse_args(args: Sequence[str] | None) -> tuple[ArgumentParser, Namespace]:
     parser.add_argument(
         "--token",
         help="Token to pass through to anaconda upload",
-        default=cc_conda_build.get("anaconda_token"),
+        default=context.conda_build.get("anaconda_token"),
     )
     parser.add_argument(
         "--user",
         help="User/organization to upload packages to on anaconda.org or pypi",
-        default=cc_conda_build.get("user"),
+        default=context.conda_build.get("user"),
     )
     parser.add_argument(
         "--label",
@@ -185,7 +188,7 @@ def parse_args(args: Sequence[str] | None) -> tuple[ArgumentParser, Namespace]:
         ),
         type=int,
         choices=range(1, 23),
-        default=cc_conda_build.get(
+        default=context.conda_build.get(
             "zstd_compression_level", zstd_compression_level_default
         ),
     )
@@ -210,23 +213,23 @@ def parse_args(args: Sequence[str] | None) -> tuple[ArgumentParser, Namespace]:
         "--config-file",
         help="path to .pypirc file to use when uploading to pypi",
         default=(
-            abspath(expanduser(expandvars(cc_conda_build.get("pypirc"))))
-            if cc_conda_build.get("pypirc")
-            else cc_conda_build.get("pypirc")
+            abspath(expanduser(expandvars(pypirc)))
+            if (pypirc := context.conda_build.get("pypirc"))
+            else None
         ),
     )
     pypi_grp.add_argument(
         "--repository",
         "-r",
         help="PyPI repository to upload to",
-        default=cc_conda_build.get("pypi_repository", "pypitest"),
+        default=context.conda_build.get("pypi_repository", "pypitest"),
     )
     parser.add_argument(
         "--no-activate",
         action="store_false",
         help="do not activate the build and test envs; just prepend to PATH",
         dest="activate",
-        default=cc_conda_build.get("activate", "true").lower() == "true",
+        default=context.conda_build.get("activate", "true").lower() == "true",
     )
     parser.add_argument(
         "--no-build-id",
@@ -237,7 +240,7 @@ def parse_args(args: Sequence[str] | None) -> tuple[ArgumentParser, Namespace]:
         ),
         dest="set_build_id",
         # note: inverted - dest stores positive logic
-        default=cc_conda_build.get("set_build_id", "true").lower() == "true",
+        default=context.conda_build.get("set_build_id", "true").lower() == "true",
     )
     parser.add_argument(
         "--build-id-pat",
@@ -246,7 +249,7 @@ def parse_args(args: Sequence[str] | None) -> tuple[ArgumentParser, Namespace]:
             "paths being too long."
         ),
         dest="build_id_pat",
-        default=cc_conda_build.get("build_id_pat", "{n}_{t}"),
+        default=context.conda_build.get("build_id_pat", "{n}_{t}"),
     )
     parser.add_argument(
         "--croot",
@@ -259,29 +262,30 @@ def parse_args(args: Sequence[str] | None) -> tuple[ArgumentParser, Namespace]:
         "--verify",
         action="store_true",
         help="run verification on recipes or packages when building",
-        default=cc_conda_build.get("verify", "true").lower() == "true",
+        default=context.conda_build.get("verify", "true").lower() == "true",
     )
     parser.add_argument(
         "--no-verify",
         action="store_false",
         dest="verify",
         help="do not run verification on recipes or packages when building",
-        default=cc_conda_build.get("verify", "true").lower() == "true",
+        default=context.conda_build.get("verify", "true").lower() == "true",
     )
     parser.add_argument(
         "--strict-verify",
         action="store_true",
         dest="exit_on_verify_error",
         help="Exit if any conda-verify check fail, instead of only printing them",
-        default=cc_conda_build.get("exit_on_verify_error", "false").lower() == "true",
+        default=context.conda_build.get("exit_on_verify_error", "false").lower()
+        == "true",
     )
     parser.add_argument(
         "--output-folder",
         help=(
             "folder to dump output package to.  Package are moved here if build or test succeeds."
             "  Destination folder must exist prior to using this."
         ),
-        default=cc_conda_build.get("output_folder"),
+        default=context.conda_build.get("output_folder"),
     )
     parser.add_argument(
         "--no-prefix-length-fallback",
@@ -350,7 +354,7 @@ def parse_args(args: Sequence[str] | None) -> tuple[ArgumentParser, Namespace]:
             "linked to any executables or shared libraries in built packages.  This is disabled "
             "by default, but will be enabled by default in conda-build 4.0."
         ),
-        default=cc_conda_build.get("error_overlinking", "false").lower() == "true",
+        default=context.conda_build.get("error_overlinking", "false").lower() == "true",
     )
     parser.add_argument(
         "--no-error-overlinking",
@@ -361,7 +365,7 @@ def parse_args(args: Sequence[str] | None) -> tuple[ArgumentParser, Namespace]:
             "linked to any executables or shared libraries in built packages.  This is currently "
             "the default behavior, but will change in conda-build 4.0."
         ),
-        default=cc_conda_build.get("error_overlinking", "false").lower() == "true",
+        default=context.conda_build.get("error_overlinking", "false").lower() == "true",
     )
     parser.add_argument(
         "--error-overdepending",
@@ -372,7 +376,8 @@ def parse_args(args: Sequence[str] | None) -> tuple[ArgumentParser, Namespace]:
             "`run_exports` are not auto-loaded by the OSes DSO loading mechanism by "
             "any of the files in this package."
         ),
-        default=cc_conda_build.get("error_overdepending", "false").lower() == "true",
+        default=context.conda_build.get("error_overdepending", "false").lower()
+        == "true",
     )
     parser.add_argument(
         "--no-error-overdepending",
@@ -383,7 +388,8 @@ def parse_args(args: Sequence[str] | None) -> tuple[ArgumentParser, Namespace]:
             "`run_exports` are not auto-loaded by the OSes DSO loading mechanism by "
             "any of the files in this package."
         ),
-        default=cc_conda_build.get("error_overdepending", "false").lower() == "true",
+        default=context.conda_build.get("error_overdepending", "false").lower()
+        == "true",
     )
     parser.add_argument(
         "--long-test-prefix",
@@ -393,7 +399,7 @@ def parse_args(args: Sequence[str] | None) -> tuple[ArgumentParser, Namespace]:
             "Linux and Mac.  Prefix length matches the --prefix-length flag.  This is on by "
             "default in conda-build 3.0+"
         ),
-        default=cc_conda_build.get("long_test_prefix", "true").lower() == "true",
+        default=context.conda_build.get("long_test_prefix", "true").lower() == "true",
     )
     parser.add_argument(
         "--no-long-test-prefix",
@@ -403,7 +409,7 @@ def parse_args(args: Sequence[str] | None) -> tuple[ArgumentParser, Namespace]:
             "Do not use a long prefix for the test prefix, as well as the build prefix."
             "  Affects only Linux and Mac.  Prefix length matches the --prefix-length flag.  "
         ),
-        default=cc_conda_build.get("long_test_prefix", "true").lower() == "true",
+        default=context.conda_build.get("long_test_prefix", "true").lower() == "true",
     )
     parser.add_argument(
         "--keep-going",
@@ -420,16 +426,17 @@ def parse_args(args: Sequence[str] | None) -> tuple[ArgumentParser, Namespace]:
             "Path to store the source files (archives, git clones, etc.) during the build."
         ),
         default=(
-            abspath(expanduser(expandvars(cc_conda_build.get("cache_dir"))))
-            if cc_conda_build.get("cache_dir")
-            else cc_conda_build.get("cache_dir")
+            abspath(expanduser(expandvars(cache_dir)))
+            if (cache_dir := context.conda_build.get("cache_dir"))
+            else None
         ),
     )
     parser.add_argument(
         "--no-copy-test-source-files",
         dest="copy_test_source_files",
         action="store_false",
-        default=cc_conda_build.get("copy_test_source_files", "true").lower() == "true",
+        default=context.conda_build.get("copy_test_source_files", "true").lower()
+        == "true",
         help=(
             "Disables copying the files necessary for testing the package into "
             "the info/test folder.  Passing this argument means it may not be possible "
@@ -445,7 +452,7 @@ def parse_args(args: Sequence[str] | None) -> tuple[ArgumentParser, Namespace]:
             "Merge the build and host directories, even when host section or compiler "
             "jinja2 is present"
         ),
-        default=cc_conda_build.get("merge_build_host", "false").lower() == "true",
+        default=context.conda_build.get("merge_build_host", "false").lower() == "true",
     )
     parser.add_argument(
         "--stats-file",

conda_build/cli/main_convert.py

@@ -7,10 +7,9 @@
 from typing import TYPE_CHECKING
 
 from .. import api
-from ..conda_interface import ArgumentParser
 
 if TYPE_CHECKING:
-    from argparse import Namespace
+    from argparse import ArgumentParser, Namespace
     from typing import Sequence
 
 logging.basicConfig(level=logging.INFO)
@@ -41,6 +40,8 @@
 
 
 def parse_args(args: Sequence[str] | None) -> tuple[ArgumentParser, Namespace]:
+    from conda.cli.conda_argparse import ArgumentParser
+
     parser = ArgumentParser(
         prog="conda convert",
         description="""