Replace bundled conda-index with standalone conda-index package

conda_build/build.py

@@ -2376,14 +2376,30 @@ def build(m, stats, post=None, need_source_download=True, need_reparse_in_env=Fa
                     subdir = ('noarch' if (m.noarch or m.noarch_python)
                               else m.config.host_subdir)
                     if m.is_cross:
-                        get_build_index(subdir=subdir, bldpkgs_dir=m.config.bldpkgs_dir,
-                                        output_folder=m.config.output_folder, channel_urls=m.config.channel_urls,
-                                        debug=m.config.debug, verbose=m.config.verbose, locking=m.config.locking,
-                                        timeout=m.config.timeout, clear_cache=True)
-                    get_build_index(subdir=subdir, bldpkgs_dir=m.config.bldpkgs_dir,
-                                    output_folder=m.config.output_folder, channel_urls=m.config.channel_urls,
-                                    debug=m.config.debug, verbose=m.config.verbose, locking=m.config.locking,
-                                    timeout=m.config.timeout, clear_cache=True)
+                        get_build_index(
+                            subdir,
+                            m.config.bldpkgs_dir,
+                            m.config.output_folder,
+                            channel_urls=m.config.channel_urls,
+                            debug=m.config.debug,
+                            verbose=m.config.verbose,
+                            locking=m.config.locking,
+                            timeout=m.config.timeout,
+                            clear_cache=True,
+                            omit_defaults=False,
+                        )
+                    get_build_index(
+                        subdir,
+                        m.config.bldpkgs_dir,
+                        m.config.output_folder,
+                        channel_urls=m.config.channel_urls,
+                        debug=m.config.debug,
+                        verbose=m.config.verbose,
+                        locking=m.config.locking,
+                        timeout=m.config.timeout,
+                        clear_cache=True,
+                        omit_defaults=False,
+                    )
     else:
         if not provision_only:
             print("STOPPING BUILD BEFORE POST:", m.dist())
@@ -3382,6 +3398,8 @@ def clean_build(config, folders=None):
 
 
 def is_package_built(metadata, env, include_local=True):
+    # bldpkgs_dirs is typically {'$ENVIRONMENT/conda-bld/noarch', '$ENVIRONMENT/conda-bld/osx-arm64'}
+    # could pop subdirs (last path element) and call update_index() once
     for d in metadata.config.bldpkgs_dirs:
         if not os.path.isdir(d):
             os.makedirs(d)

conda_build/cli/main_index.py

@@ -6,9 +6,9 @@
 
 from conda_build.conda_interface import ArgumentParser
 
-from conda_build import api
-from conda_build.index import MAX_THREADS_DEFAULT
-from conda_build.utils import DEFAULT_SUBDIRS
+from conda_index import api
+from conda_index.index import MAX_THREADS_DEFAULT
+from conda_index.utils import DEFAULT_SUBDIRS
 
 logging.basicConfig(level=logging.INFO)
 
@@ -77,7 +77,7 @@ def parse_args(args):
     )
     p.add_argument(
         "-f", "--file",
-        help="A file that contains a new line separated list of packages to add to repodata.",
+        help="A file that contains a new line separated list of packages to add to repodata.  Deprecated, will be removed in a future version of conda build.",
         action="store"
     )
 
@@ -90,8 +90,8 @@ def execute(args):
 
     api.update_index(args.dir, check_md5=args.check_md5, channel_name=args.channel_name,
                      threads=args.threads, subdir=args.subdir, patch_generator=args.patch_generator,
-                     verbose=args.verbose, progress=args.progress, hotfix_source_repo=args.hotfix_source_repo,
-                     current_index_versions=args.current_index_versions_file, index_file=args.file)
+                     verbose=args.verbose, progress=args.progress,
+                     current_index_versions=args.current_index_versions_file)
 
 
 def main():

conda_build/environ.py

@@ -14,33 +14,22 @@
 from glob import glob
 from os.path import join, normpath
 
-from .conda_interface import (
-    CondaError,
-    LinkError,
-    LockError,
-    NoPackagesFoundError,
-    PaddingError,
-    UnsatisfiableError,
-)
-from .conda_interface import (
-    display_actions,
-    execute_actions,
-    execute_plan,
-    install_actions,
-)
-from .conda_interface import package_cache, TemporaryDirectory
-from .conda_interface import pkgs_dirs, root_dir, create_default_packages
-from .conda_interface import reset_context
-from .conda_interface import get_version_from_git_tag
-
 from conda_build import utils
 from conda_build.exceptions import BuildLockError, DependencyNeedsBuildingError
 from conda_build.features import feature_list
 from conda_build.index import get_build_index
 from conda_build.os_utils import external
-from conda_build.utils import ensure_list, prepend_bin_path, env_var
+from conda_build.utils import ensure_list, env_var, prepend_bin_path
 from conda_build.variants import get_default_variant
 
+from .conda_interface import (CondaError, LinkError, LockError,
+                              NoPackagesFoundError, PaddingError,
+                              TemporaryDirectory, UnsatisfiableError,
+                              create_default_packages, display_actions,
+                              execute_actions, execute_plan,
+                              get_version_from_git_tag, install_actions,
+                              package_cache, pkgs_dirs, reset_context,
+                              root_dir)
 
 # these are things that we provide env vars for more explicitly.  This list disables the
 #    pass-through of variant values to env vars for these keys.