Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge 24.1.x into main #5163

Merged
merged 7 commits into from
Feb 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 12 additions & 9 deletions .authors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@
alternate_emails:
- msarahan@continuum.io
- msarahan@gmail.com
- msarahan@nvidia.com
aliases:
- Mike Sarahan
- Michael Sarahan
num_commits: 2000
num_commits: 2001
first_commit: 2015-09-04 21:31:08
- name: Jonathan J. Helmus
email: jjhelmus@gmail.com
Expand Down Expand Up @@ -1201,7 +1202,7 @@
alternate_emails:
- clee@anaconda.com
- name: Ken Odegard
num_commits: 159
num_commits: 164
email: kodegard@anaconda.com
first_commit: 2020-09-08 19:53:41
github: kenodegard
Expand All @@ -1224,7 +1225,7 @@
first_commit: 2020-11-19 10:46:41
- name: Jannis Leidel
email: jannis@leidel.info
num_commits: 30
num_commits: 33
github: jezdez
first_commit: 2020-11-19 10:46:41
- name: Christof Kaufmann
Expand All @@ -1239,7 +1240,7 @@
github: pre-commit-ci[bot]
aliases:
- pre-commit-ci[bot]
num_commits: 56
num_commits: 61
first_commit: 2021-11-20 01:47:17
- name: Jacob Walls
email: jacobtylerwalls@gmail.com
Expand All @@ -1261,7 +1262,7 @@
alternate_emails:
- ad-team+condabot@anaconda.com
- 18747875+conda-bot@users.noreply.github.com
num_commits: 42
num_commits: 44
first_commit: 2022-01-17 18:09:22
- name: Uwe L. Korn
email: xhochy@users.noreply.github.com
Expand All @@ -1270,7 +1271,7 @@
- name: Daniel Holth
email: dholth@anaconda.com
github: dholth
num_commits: 13
num_commits: 14
first_commit: 2022-04-28 05:22:14
- name: Rylan Chord
email: rchord@users.noreply.github.com
Expand All @@ -1280,7 +1281,7 @@
- name: Travis Hathaway
email: travis.j.hathaway@gmail.com
github: travishathaway
num_commits: 5
num_commits: 6
first_commit: 2022-05-12 05:53:02
- name: Kyle Leaders
email: remkade@users.noreply.github.com
Expand Down Expand Up @@ -1326,7 +1327,7 @@
- name: Jaime Rodríguez-Guerra
email: jaimergp@users.noreply.github.com
github: jaimergp
num_commits: 8
num_commits: 10
first_commit: 2022-11-02 19:34:51
- name: Dave Clements
email: tnabtaf@gmail.com
Expand Down Expand Up @@ -1365,7 +1366,9 @@
github: peetw
- name: Johnny
email: johnnync13@gmail.com
num_commits: 1
alternate_emails:
- johnnynuca14@gmail.com
num_commits: 2
first_commit: 2023-03-22 00:34:22
github: johnnynunez
- name: Ryan Keith
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ on:
- main
- feature/**
- '[0-9].*.x' # e.g., 3.24.x
- '[0-9][0-9].*.x' # e.g., 23.3.x

# https://docs.github.com/en/webhooks-and-events/webhooks/webhook-events-and-payloads#pull_request
pull_request:
Expand Down
4 changes: 3 additions & 1 deletion .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ John Kirkham <jakirkham@gmail.com> jakirkham <jakirkham@gmail.com>
John Kirkham <jakirkham@gmail.com> John Kirkham <kirkhamj@janelia.hhmi.org>
John Kirkham <jakirkham@gmail.com> John Kirkham <jakirkham@gmail.com>
John Omotani <john.omotani@ukaea.uk>
Johnny <johnnync13@gmail.com>
Johnny <johnnync13@gmail.com> Johnny <johnnynuca14@gmail.com>
Jonathan J. Helmus <jjhelmus@gmail.com> Jonathan Helmus <jjhelmus@gmail.com>
Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Joseph Crail <jbcrail@gmail.com>
Expand Down Expand Up @@ -183,8 +183,10 @@ Michael Cormier <u1138933@kingspeak23.wasatch.peaks>
Michael Maltese <mike@mikemaltese.com>
Michael Sarahan <msarahan@continuum.io> Mike Sarahan <msarahan@continuum.io>
Michael Sarahan <msarahan@continuum.io> Mike Sarahan <msarahan@gmail.com>
Michael Sarahan <msarahan@continuum.io> Mike Sarahan <msarahan@nvidia.com>
Michael Sarahan <msarahan@continuum.io> Michael Sarahan <msarahan@continuum.io>
Michael Sarahan <msarahan@continuum.io> Michael Sarahan <msarahan@gmail.com>
Michael Sarahan <msarahan@continuum.io> Michael Sarahan <msarahan@nvidia.com>
Min RK <benjaminrk@gmail.com> MinRK <benjaminrk@gmail.com>
Morten Enemark Lund <mel@anybodytech.com> mel <mel@anybodytech.com>
Morten Lund <melund@gmail.com>
Expand Down
139 changes: 139 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,144 @@
[//]: # (current developments)

## 24.1.0 (2024-01-25)

### Enhancements

* Update `conda inspect channels` to use updated solver/transaction logic. (#5033)
* Relax `script_env` error in outputs when variable referenced in `script_env` is not defined.
This unifies current behavior with the top-level build. (#5105)
* Add support for Python 3.12. (#4997 via #4998)
* Adopt calender versioning (CalVer) per CEP-8 for consistency with conda. (#4975)
* Adopt expedited CEP-9 deprecation policy. (#5064)

### Deprecations

* Mark `conda inspect channels --test-installable` as pending deprecation. (#5033)
* 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)
* Mark `conda_build.conda_interface.Dist` as pending deprecation. (#5074)
* Mark `conda_build.conda_interface.display_actions` as pending deprecation. (#5074)
* Mark `conda_build.conda_interface.execute_actions` as pending deprecation. (#5074)
* Mark `conda_build.conda_interface.execute_plan` as pending deprecation. (#5074)
* Mark `conda_build.conda_interface.get_index` as pending deprecation. (#5074)
* Mark `conda_build.conda_interface.install_actions` as pending deprecation. (#5074)
* Mark `conda_build.conda_interface.linked` as pending deprecation. (#5074)
* Mark `conda_build.conda_interface.linked_data` as pending deprecation. (#5074)
* Mark `conda_build.utils.linked_data_no_multichannels` as pending deprecation. (#5074)
* Mark `conda_build.environ.get_install_actions` as pending deprecation in favor of `conda_build.environ.get_package_records`. (#5152)
* Mark `conda_build.environ.create_env(specs_or_actions)` as pending deprecation in favor of `conda_build.environ.create_env(specs_or_precs)`. (#5152)
* Mark `conda_build.index.channel_data` as pending deprecation. (#5152)
* Mark `conda_build.index._determine_namespace` as pending deprecation. (#5152)
* Mark `conda_build.index._make_seconds` as pending deprecation. (#5152)
* Mark `conda_build.index.REPODATA_VERSION` as pending deprecation. (#5152)
* Mark `conda_build.index.CHANNELDATA_VERSION` as pending deprecation. (#5152)
* Mark `conda_build.index.REPODATA_JSON_FN` as pending deprecation. (#5152)
* Mark `conda_build.index.REPODATA_FROM_PKGS_JSON_FN` as pending deprecation. (#5152)
* Mark `conda_build.index.CHANNELDATA_FIELDS` as pending deprecation. (#5152)
* Mark `conda_build.index._clear_newline_chars` as pending deprecation. (#5152)
* Mark `conda_build.index._apply_instructions` as pending deprecation. (#5152)
* Mark `conda_build.index._get_jinja2_environment` as pending deprecation. (#5152)
* Mark `conda_build.index._maybe_write` as pending deprecation. (#5152)
* Mark `conda_build.index._maybe_build_string` as pending deprecation. (#5152)
* Mark `conda_build.index._warn_on_missing_dependencies` as pending deprecation. (#5152)
* Mark `conda_build.index._cache_post_install_details` as pending deprecation. (#5152)
* Mark `conda_build.index._cache_recipe` as pending deprecation. (#5152)
* Mark `conda_build.index._cache_run_exports` as pending deprecation. (#5152)
* Mark `conda_build.index._cache_icon` as pending deprecation. (#5152)
* Mark `conda_build.index._make_subdir_index_html` as pending deprecation. (#5152)
* Mark `conda_build.index._make_channeldata_index_html` as pending deprecation. (#5152)
* Mark `conda_build.index._get_source_repo_git_info` as pending deprecation. (#5152)
* Mark `conda_build.index._cache_info_file` as pending deprecation. (#5152)
* Mark `conda_build.index._alternate_file_extension` as pending deprecation. (#5152)
* Mark `conda_build.index._get_resolve_object` as pending deprecation. (#5152)
* Mark `conda_build.index._get_newest_versions` as pending deprecation. (#5152)
* Mark `conda_build.index._add_missing_deps` as pending deprecation. (#5152)
* Mark `conda_build.index._add_prev_ver_for_features` as pending deprecation. (#5152)
* Mark `conda_build.index._shard_newest_packages` as pending deprecation. (#5152)
* Mark `conda_build.index._build_current_repodata` as pending deprecation. (#5152)
* Mark `conda_build.index.ChannelIndex` as pending deprecation. (#5152)
* Mark `conda_build.render.actions_to_pins` as pending deprecation. (#5152)
* Mark `conda_build.render.execute_download_actions(actions)` as pending deprecation in favor of `conda_build.render.execute_download_actions(precs)`. (#5152)
* Mark `conda_build.render.get_upstream_pins(actions)` as pending deprecation in favor of `conda_build.render.get_upstream_pins(precs)`. (#5152)
* 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

* Add GoatCounter (https://www.goatcounter.com/) as an analytics tool. (#5093)

### Other

* Remove unused Allure test report collection. (#5113)
* Remove dependency on `conda.plan`. (#5074)
* Remove almost all dependency on `conda.models.dist`. (#5074)
* Replace usage of legacy `conda.models.dist.Dist` with `conda.models.records.PackageRecord`. (#5074)

### Contributors

* @conda-bot
* @dholth
* @jaimergp
* @jezdez
* @johnnynunez
* @kenodegard
* @msarahan
* @travishathaway
* @pre-commit-ci[bot]



## 3.28.4 (2024-01-17)

### Bug fixes
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
Loading