From d80c5e716269dc24a8c25972c6c9b3795d87c272 Mon Sep 17 00:00:00 2001 From: jaimergp Date: Fri, 9 Feb 2024 15:55:58 +0100 Subject: [PATCH] fix: use update_index from conda-index directly (#393) --- boa/cli/mambabuild.py | 2 +- boa/core/build.py | 2 +- boa/core/run_build.py | 2 +- boa/core/test.py | 2 +- tests/env.yml | 1 + 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/boa/cli/mambabuild.py b/boa/cli/mambabuild.py index 68b7d3fb..65aaa4e5 100644 --- a/boa/cli/mambabuild.py +++ b/boa/cli/mambabuild.py @@ -13,8 +13,8 @@ from conda_build import api from conda_build.config import Config, get_channel_urls from conda_build.cli.main_build import parse_args -from conda_build.index import update_index from conda_build.exceptions import DependencyNeedsBuildingError +from conda_index.index import update_index from conda.base.context import context diff --git a/boa/core/build.py b/boa/core/build.py index 26ee620a..33c43d81 100644 --- a/boa/core/build.py +++ b/boa/core/build.py @@ -29,13 +29,13 @@ from conda_build.utils import tmp_chdir from conda_build import source, utils -from conda_build.index import update_index from conda_build.post import ( post_process, post_build, fix_permissions, get_build_metadata, ) +from conda_index.index import update_index from conda_build.exceptions import indent diff --git a/boa/core/run_build.py b/boa/core/run_build.py index b80691dc..d5d3aebf 100644 --- a/boa/core/run_build.py +++ b/boa/core/run_build.py @@ -34,7 +34,7 @@ from conda.gateways.disk.create import mkdir_p from conda_build import config as conda_build_config from conda_build.utils import on_win -from conda_build.index import update_index +from conda_index.index import update_index console = boa_config.console diff --git a/boa/core/test.py b/boa/core/test.py index afd391cd..525a13a4 100644 --- a/boa/core/test.py +++ b/boa/core/test.py @@ -31,11 +31,11 @@ pkgs_dirs, ) from conda_build.create_test import create_all_test_files -from conda_build.index import update_index from conda_build.post import post_build from conda_build.render import bldpkg_path, try_download from conda_build.utils import shutil_move_more_retrying from conda_build.variants import set_language_env_vars +from conda_index.index import update_index from conda_build import utils from conda_build.environ import clean_pkg_cache diff --git a/tests/env.yml b/tests/env.yml index 5aac3682..cb9dfb5c 100644 --- a/tests/env.yml +++ b/tests/env.yml @@ -8,6 +8,7 @@ dependencies: - libmambapy >=1.5,<1.6 - pytest - "conda-build>=3.20" + - conda-index - ruamel - ruamel.yaml - rich