diff --git a/conda_build/conda_interface.py b/conda_build/conda_interface.py index 25ecc9cef9..3b992c9d6c 100644 --- a/conda_build/conda_interface.py +++ b/conda_build/conda_interface.py @@ -26,11 +26,9 @@ from conda.exports import ( # noqa: F401 ArgumentParser, # noqa: F401 Channel, - Completer, CondaSession, # noqa: F401 EntityEncoder, # noqa: F401 FileMode, - InstalledPackages, MatchSpec, NoPackagesFound, PathType, @@ -47,7 +45,6 @@ download, execute_actions, execute_plan, - get_index, # noqa: F401 handle_proxy_407, hashsum_file, human_bytes, @@ -66,7 +63,6 @@ spec_from_line, specs_from_args, specs_from_url, - symlink_conda, unix_path_to_win, untracked, url_path, diff --git a/conda_build/index.py b/conda_build/index.py index 690673f0c9..9ad837e950 100644 --- a/conda_build/index.py +++ b/conda_build/index.py @@ -32,11 +32,8 @@ import conda_package_handling.api import pytz import yaml - -# Lots of conda internals here. Should refactor to use exports. from conda.common.compat import ensure_binary - -# BAD BAD BAD - conda internals +from conda.core.index import get_index from conda.core.subdir_data import SubdirData from conda.models.channel import Channel from conda_index.index import update_index as _update_index @@ -58,7 +55,6 @@ TemporaryDirectory, VersionOrder, context, - get_index, human_bytes, url_path, ) diff --git a/conda_build/inspect_pkg.py b/conda_build/inspect_pkg.py index e38c5aa9e7..d2003d58bb 100644 --- a/conda_build/inspect_pkg.py +++ b/conda_build/inspect_pkg.py @@ -11,9 +11,10 @@ from operator import itemgetter from os.path import abspath, basename, dirname, exists, join, normcase +from conda.core.index import get_index + from conda_build.conda_interface import ( display_actions, - get_index, install_actions, is_linked, linked_data, diff --git a/conda_build/skeletons/cpan.py b/conda_build/skeletons/cpan.py index 7cd48e08ef..bfd60ae024 100644 --- a/conda_build/skeletons/cpan.py +++ b/conda_build/skeletons/cpan.py @@ -20,6 +20,7 @@ from os.path import basename, dirname, exists, join import requests +from conda.core.index import get_index from conda_build import environ from conda_build.conda_interface import ( @@ -29,7 +30,6 @@ Resolve, TmpDownload, download, - get_index, ) from conda_build.config import get_or_merge_config from conda_build.utils import check_call_env, on_win