Skip to content

Commit

Permalink
Stop using deprecated stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
kenodegard committed Oct 6, 2023
1 parent 0844e23 commit 915e4ad
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 11 deletions.
4 changes: 0 additions & 4 deletions conda_build/conda_interface.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -47,7 +45,6 @@
download,
execute_actions,
execute_plan,
get_index, # noqa: F401
handle_proxy_407,
hashsum_file,
human_bytes,
Expand All @@ -66,7 +63,6 @@
spec_from_line,
specs_from_args,
specs_from_url,
symlink_conda,
unix_path_to_win,
untracked,
url_path,
Expand Down
6 changes: 1 addition & 5 deletions conda_build/index.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -58,7 +55,6 @@
TemporaryDirectory,
VersionOrder,
context,
get_index,
human_bytes,
url_path,
)
Expand Down
3 changes: 2 additions & 1 deletion conda_build/inspect_pkg.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion conda_build/skeletons/cpan.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand All @@ -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
Expand Down

0 comments on commit 915e4ad

Please sign in to comment.