Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/24.1.x' into dist-removal
Browse files Browse the repository at this point in the history
Signed-off-by: Marcel Bargull <[email protected]>
  • Loading branch information
mbargull committed Jan 26, 2024
2 parents 57c5b8e + e4fd8d7 commit edb7be3
Show file tree
Hide file tree
Showing 31 changed files with 328 additions and 1,041 deletions.
52 changes: 52 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,58 @@
* Mark `conda_build.inspect_pkg.check_install(package)` as pending deprecation in favor of `conda_build.inspect_pkg.check_install(subdir)`. (#5033)
* Mark `conda_build.inspect_pkg.check_install(prepend)` as pending deprecation. (#5033)
* Mark `conda_build.inspect_pkg.check_install(minimal_hint)` as pending deprecation. (#5033)
* Remove `conda_build.api.update_index`. (#5151)
* Remove `conda_build.cli.main_build.main`. (#5151)
* Remove `conda_build.cli.main_convert.main`. (#5151)
* Remove `conda_build.cli.main_debug.main`. (#5151)
* Remove `conda_build.cli.main_develop.main`. (#5151)
* Remove `conda_build.cli.main_index`. (#5151)
* Remove `conda_build.cli.main_inspect.main`. (#5151)
* Remove `conda_build.cli.main_metapackage.main`. (#5151)
* Remove `conda_build.cli.main_render.main`. (#5151)
* Remove `conda_build.cli.main_skeleton.main`. (#5151)
* Remove `conda_build.conda_interface.IndexRecord`. (#5151)
* Remove `conda_build.conda_interface.CrossPlatformStLink`. (#5151)
* Remove `conda_build.conda_interface.SignatureError`. (#5151)
* Remove `conda_build.conda_interface.which_package`. (#5151)
* Remove `conda_build.conda_interface.which_prefix`. (#5151)
* Remove `conda_build.conda_interface.get_installed_version`. (#5151)
* Remove `conda_build.config.python2_fs_encode`. (#5151)
* Remove `conda_build.config._ensure_dir`. (#5151)
* Remove `conda_build.config.Config.CONDA_LUA`. (#5151)
* Remove `conda_build.config.Config.CONDA_PY`. (#5151)
* Remove `conda_build.config.Config.CONDA_NPY`. (#5151)
* Remove `conda_build.config.Config.CONDA_PERL`. (#5151)
* Remove `conda_build.config.Config.CONDA_R`. (#5151)
* Remove `conda_build.environ.clean_pkg_cache`. (#5151)
* Remove `conda_build.index.update_index`. (#5151)
* Remove `conda_build.inspect_pkg.dist_files`. (#5151)
* Remove `conda_build.inspect_pkg.which_package(avoid_canonical_channel_name)`. (#5151)
* Remove `conda_build.inspect_pkg._installed`. (#5151)
* Remove `conda_build.metadata.Metadata.name(fail_ok)`. (#5151)
* Remove `conda_build.os_utils.ldd.get_package_files`. (#5151)
* Remove `conda_build.os_utils.liefldd.is_string`. (#5151)
* Remove `conda_build.os_utils.liefldd.codefile_type_liefldd`. (#5151)
* Remove `conda_build.os_utils.liefldd.codefile_type_pyldd`. (#5151)
* Remove `conda_build.os_utils.liefldd.codefile_type`. (#5151)
* Remove `conda_build.os_utils.pyldd.mach_o_change`. (#5151)
* Remove `conda_build.os_utils.pyldd.is_codefile`. (#5151)
* Remove `conda_build.os_utils.pyldd.codefile_type`. (#5151)
* Remove `conda_build.os_utils.pyldd.inspect_rpaths`. (#5151)
* Remove `conda_build.os_utils.pyldd.get_runpaths`. (#5151)
* Remove `conda_build.os_utils.pyldd.otool_sys`. (#5151)
* Remove `conda_build.os_utils.pyldd.ldd_sys`. (#5151)
* Remove `conda_build.plugin.index`. (#5151)
* Remove `conda_build.post.determine_package_nature`. (#5151)
* Remove `conda_build.post.library_nature(subdir)`. (#5151)
* Remove `conda_build.post.library_nature(bldpkgs_dirs)`. (#5151)
* Remove `conda_build.post.library_nature(output_folder)`. (#5151)
* Remove `conda_build.post.library_nature(channel_urls)`. (#5151)
* Remove `conda_build.post.dists_from_names`. (#5151)
* Remove `conda_build.post.FakeDist`. (#5151)
* Remove `conda_build.post._get_fake_pkg_dist`. (#5151)
* Remove `conda_build.utils.relative`. (#5151)
* Remove `conda_build.utils.samefile`. (#5151)

### Docs

Expand Down
43 changes: 0 additions & 43 deletions conda_build/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
# make the Config class available in the api namespace
from .config import DEFAULT_PREFIX_LENGTH as _prefix_length
from .config import Config, get_channel_urls, get_or_merge_config
from .deprecations import deprecated
from .utils import (
CONDA_PACKAGE_EXTENSIONS,
LoggingContext,
Expand Down Expand Up @@ -523,48 +522,6 @@ def create_metapackage(
)


@deprecated("3.25.0", "24.1.0", addendum="Use standalone conda-index.")
def update_index(
dir_paths,
config=None,
force=False,
check_md5=False,
remove=False,
channel_name=None,
subdir=None,
threads=None,
patch_generator=None,
verbose=False,
progress=False,
hotfix_source_repo=None,
current_index_versions=None,
**kwargs,
):
import yaml

from .index import update_index as legacy_update_index

dir_paths = [os.path.abspath(path) for path in ensure_list(dir_paths)]

if isinstance(current_index_versions, str):
with open(current_index_versions) as f:
current_index_versions = yaml.safe_load(f)

for path in dir_paths:
legacy_update_index(
path,
check_md5=check_md5,
channel_name=channel_name,
patch_generator=patch_generator,
threads=threads,
verbose=verbose,
progress=progress,
subdirs=ensure_list(subdir),
current_index_versions=current_index_versions,
index_file=kwargs.get("index_file", None),
)


def debug(
recipe_or_package_path_or_metadata_tuples,
path=None,
Expand Down
Loading

0 comments on commit edb7be3

Please sign in to comment.