Skip to content

Commit

Permalink
Merge 24.7.x into main (#5419)
Browse files Browse the repository at this point in the history
  • Loading branch information
kenodegard authored Jul 22, 2024
2 parents 33e255d + 0ab6288 commit 9480525
Show file tree
Hide file tree
Showing 20 changed files with 159 additions and 329 deletions.
35 changes: 25 additions & 10 deletions .authors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
email: isuruf@gmail.com
alternate_emails:
- isuru.11@cse.mrt.ac.lk
num_commits: 84
num_commits: 86
first_commit: 2017-06-16 15:14:34
github: isuruf
- name: Dan Blanchard
Expand Down Expand Up @@ -162,7 +162,7 @@
aliases:
- MinRK
github: minrk
num_commits: 16
num_commits: 17
first_commit: 2014-02-13 19:43:59
- name: Matty G
email: meawoppl@gmail.com
Expand Down Expand Up @@ -1121,7 +1121,7 @@
alternate_emails:
- becker.mr@gmail.com
- beckermr@users.noreply.github.com
num_commits: 19
num_commits: 21
first_commit: 2019-10-17 23:05:16
github: beckermr
- name: Jinzhe Zeng
Expand Down Expand Up @@ -1202,7 +1202,7 @@
alternate_emails:
- clee@anaconda.com
- name: Ken Odegard
num_commits: 204
num_commits: 212
email: kodegard@anaconda.com
first_commit: 2020-09-08 19:53:41
github: kenodegard
Expand Down Expand Up @@ -1240,7 +1240,7 @@
github: pre-commit-ci[bot]
aliases:
- pre-commit-ci[bot]
num_commits: 71
num_commits: 79
first_commit: 2021-11-20 01:47:17
- name: Jacob Walls
email: jacobtylerwalls@gmail.com
Expand All @@ -1251,7 +1251,7 @@
github: beeankha
alternate_emails:
- beeankha@gmail.com
num_commits: 27
num_commits: 36
first_commit: 2022-01-19 16:40:06
- name: Conda Bot
email: 18747875+conda-bot@users.noreply.github.com
Expand All @@ -1262,7 +1262,7 @@
alternate_emails:
- ad-team+condabot@anaconda.com
- 18747875+conda-bot@users.noreply.github.com
num_commits: 53
num_commits: 58
first_commit: 2022-01-17 18:09:22
- name: Uwe L. Korn
email: xhochy@users.noreply.github.com
Expand All @@ -1271,7 +1271,7 @@
- name: Daniel Holth
email: dholth@anaconda.com
github: dholth
num_commits: 15
num_commits: 16
first_commit: 2022-04-28 05:22:14
- name: Rylan Chord
email: rchord@users.noreply.github.com
Expand Down Expand Up @@ -1310,7 +1310,7 @@
- name: dependabot[bot]
email: 49699333+dependabot[bot]@users.noreply.github.com
github: dependabot[bot]
num_commits: 19
num_commits: 34
first_commit: 2022-05-31 04:34:40
- name: Serhii Kupriienko
email: 79282962+skupr-anaconda@users.noreply.github.com
Expand All @@ -1327,7 +1327,7 @@
- name: Jaime Rodríguez-Guerra
email: jaimergp@users.noreply.github.com
github: jaimergp
num_commits: 13
num_commits: 17
first_commit: 2022-11-02 19:34:51
- name: Dave Clements
email: tnabtaf@gmail.com
Expand Down Expand Up @@ -1454,3 +1454,18 @@
num_commits: 5
first_commit: 2024-03-19 18:09:38
github: ytausch
- name: Tim Paine
email: 3105306+timkpaine@users.noreply.github.com
num_commits: 1
first_commit: 2024-06-10 11:17:05
github: timkpaine
- name: Klaus Zimmermann
email: klaus.zimmermann@quansight.com
num_commits: 2
first_commit: 2024-06-07 10:02:14
github: zklaus
- name: Daniel Ching
email: carterbox@users.noreply.github.com
num_commits: 1
first_commit: 2024-06-07 11:14:31
github: carterbox
3 changes: 3 additions & 0 deletions .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ Dan Blanchard <dan.blanchard@gmail.com> Dan Blanchard <dblanchard@ets.org>
Dan Blanchard <dan.blanchard@gmail.com> Dan Blanchard <dan@parsely.com>
Dan Lovell <dlovell@gmail.com> dlovell <dlovell@gmail.com>
Daniel Bast <2790401+dbast@users.noreply.github.com>
Daniel Ching <carterbox@users.noreply.github.com>
Daniel Damiani <ddamiani@slac.stanford.edu>
Daniel Holth <dholth@anaconda.com>
Daniel Petry <dpetry@anaconda.com> danpetry <dpetry@anaconda.com>
Expand Down Expand Up @@ -148,6 +149,7 @@ Kai Tietz <ktietz@anaconda.com> Kai Tietz <47363620+katietz@users.noreply.github
Kale Franz <kfranz@continuum.io> Kale Franz <kalefranz@users.noreply.github.com>
Katherine Kinnaman <kkinnaman@anaconda.com>
Ken Odegard <kodegard@anaconda.com> Ken Odegard <ken.odegard@gmail.com>
Klaus Zimmermann <klaus.zimmermann@quansight.com>
Korijn van Golen <korijn@gmail.com>
Kurt Schelfthout <kurt.schelfthout@gmail.com>
Kyle Leaders <remkade@users.noreply.github.com>
Expand Down Expand Up @@ -259,6 +261,7 @@ Teake Nutma <teake.nutma@gmail.com> Teake Nutma <t.a.nutma@rug.nl>
Thomas A Caswell <tcaswell@gmail.com> Thomas A Caswell <tcaswell@bnl.gov>
Thomas Holder <thomas.holder@schrodinger.com>
Thomas Kluyver <takowl@gmail.com>
Tim Paine <3105306+timkpaine@users.noreply.github.com>
Tim Snyder <snyder.tim@gmail.com>
Tobias Fischer <info@tobiasfischer.info>
Todd Tomashek <todd.m.tomashek@intel.com> tomashek <todd.m.tomashek@intel.com>
Expand Down
3 changes: 3 additions & 0 deletions AUTHORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ Authors are sorted alphabetically.
* Dan Blanchard
* Dan Lovell
* Daniel Bast
* Daniel Ching
* Daniel Damiani
* Daniel Holth
* Daniel Petry
Expand Down Expand Up @@ -127,6 +128,7 @@ Authors are sorted alphabetically.
* Kale Franz
* Katherine Kinnaman
* Ken Odegard
* Klaus Zimmermann
* Korijn van Golen
* Kurt Schelfthout
* Kyle Leaders
Expand Down Expand Up @@ -217,6 +219,7 @@ Authors are sorted alphabetically.
* Thomas A Caswell
* Thomas Holder
* Thomas Kluyver
* Tim Paine
* Tim Snyder
* Tobias Fischer
* Todd Tomashek
Expand Down
128 changes: 128 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,133 @@
[//]: # (current developments)

## 24.7.0 (2024-07-18)

### Enhancements

* Skip generating `repodata.json.bz2` for local index; generate `repodata.json`
only; require `conda-package-handling >=2.2.0` matching conda. (#5231)
* Add new include/exclude sections for glob expressions in multi-output `outputs/files`. (#4196 via #5216)
* Increase performance by using `pickle` instead of `copy.deepcopy`. (#5281)
* Report fully rendered recipe to stdout before the build process starts. (#3798 via #5344)
* Validate `run_constrained` dependencies to prevent faulty specs reaching final repodata. (#5047 via #5359)
* `PIP_*` env variables are set when building outputs in multi-output recipes. (#3993 via #5368)
* Reduce performance overhead of logging. (#5384)

### Bug fixes

* Include file path in addition to the content when generating the file hash to avoid unwanted caching during linkage analysis. (#4821)
* Error handling when `LIEF` fails is now consistent with `patchelf`. (#5176)
* Ensure cross-building recipes select the correct noarch package variants. (#5341 via #5350)
* On Linux platforms, prefer the sysroot matching the target_platform when cross-compiling (#5403).

### Deprecations

* Mark `conda_build.build._construct_metadata_for_test_from_recipe` as deprecated. Test built packages instead, not recipes (e.g., `conda build --test package` instead of `conda build --test recipe/`). (#3192 via #5352)
* Mark `conda_build.build.check_external` for deprecation. `patchelf` is an explicit conda-build dependency on Linux so it will always be installed. (#5355)
* Remove the following deprecations:
* `conda_build.config.Config.override_channels` (use `conda.base.context.context.channels` instead). (#5333)
* `conda_build.config.noarch_python_build_age_default`. (#5333)
* `conda_build.conda_interface.add_parser_channels` (use `conda.cli.helpers.add_parser_channels` instead). (#5333)
* `conda_build.conda_interface.add_parser_prefix` (use `conda.cli.helpers.add_parser_prefix` instead). (#5333)
* `conda_build.conda_interface.ArgumentParser` (use `conda.cli.conda_argparse.ArgumentParser` instead). (#5333)
* `conda_build.conda_interface.binstar_upload` (use `conda.base.context.context.binstar_upload` instead). (#5333)
* `conda_build.conda_interface.cc_conda_build` (use `conda.base.context.context.conda_build` instead). (#5333)
* `conda_build.conda_interface.cc_platform` (use `conda.base.context.context.platform` instead). (#5333)
* `conda_build.conda_interface.Channel` (use `conda.models.channel.Channel` instead). (#5333)
* `conda_build.conda_interface.Completer`. (#5333)
* `conda_build.conda_interface.configparser` (use `configparser` instead). (#5333)
* `conda_build.conda_interface.CondaError` (use `conda.exceptions.CondaError` instead). (#5333)
* `conda_build.conda_interface.CondaHTTPError` (use `conda.exceptions.CondaHTTPError` instead). (#5333)
* `conda_build.conda_interface.CondaSession` (use `conda.gateways.connection.session.CondaSession` instead). (#5333)
* `conda_build.conda_interface.CONDA_VERSION` (use `conda.__version__` instead). (#5333)
* `conda_build.conda_interface.context` (use `conda.base.context.context` instead). (#5333)
* `conda_build.conda_interface.create_default_packages` (use `conda.base.context.context.create_default_packages` instead). (#5333)
* `conda_build.conda_interface.default_python` (use `conda.base.context.context.default_python` instead). (#5333)
* `conda_build.conda_interface.determine_target_prefix` (use `conda.base.context.determine_target_prefix` instead). (#5333)
* `conda_build.conda_interface.download` (use `conda.gateways.connection.download.download` instead). (#5333)
* `conda_build.conda_interface.env_path_backup_var_exists`. (#5333)
* `conda_build.conda_interface.envs_dirs` (use `conda.base.context.context.envs_dirs` instead). (#5333)
* `conda_build.conda_interface.EntityEncoder` (use `conda.auxlib.entity.EntityEncoder` instead). (#5333)
* `conda_build.conda_interface.FileMode` (use `conda.models.enums.FileMode` instead). (#5333)
* `conda_build.conda_interface.get_conda_build_local_url` (use `conda.models.channel.get_conda_build_local_url` instead). (#5333)
* `conda_build.conda_interface.get_conda_channel` (use `conda.models.channel.Channel.from_value` instead). (#5333)
* `conda_build.conda_interface.get_prefix` (use `conda.base.context.context.target_prefix` instead). (#5333)
* `conda_build.conda_interface.get_rc_urls` (use `conda.base.context.context.channels` instead). (#5333)
* `conda_build.conda_interface.human_bytes` (use `conda.utils.human_bytes` instead). (#5333)
* `conda_build.conda_interface.import_module` (use `importlib.import_module` instead). (#5333)
* `conda_build.conda_interface.input` (use `input` instead). (#5333)
* `conda_build.conda_interface.InstalledPackages`. (#5333)
* `conda_build.conda_interface.lchmod` (use `conda.gateways.disk.link.lchmod` instead). (#5333)
* `conda_build.conda_interface.LinkError` (use `conda.exceptions.LinkError` instead). (#5333)
* `conda_build.conda_interface.LockError` (use `conda.exceptions.LockError` instead). (#5333)
* `conda_build.conda_interface.MatchSpec` (use `conda.models.match_spec.MatchSpec` instead). (#5333)
* `conda_build.conda_interface.non_x86_linux_machines` (use `conda.base.context.non_x86_machines` instead). (#5333)
* `conda_build.conda_interface.NoPackagesFound` (use `conda.exceptions.ResolvePackageNotFound` instead). (#5333)
* `conda_build.conda_interface.NoPackagesFoundError` (use `conda.exceptions.NoPackagesFoundError` instead). (#5333)
* `conda_build.conda_interface.normalized_version` (use `conda.models.version.normalized_version` instead). (#5333)
* `conda_build.conda_interface.os` (use `os` instead). (#5333)
* `conda_build.conda_interface.PackageRecord` (use `conda.models.records.PackageRecord` instead). (#5333)
* `conda_build.conda_interface.PaddingError` (use `conda.exceptions.PaddingError` instead). (#5333)
* `conda_build.conda_interface.partial` (use `functools.partial` instead). (#5333)
* `conda_build.conda_interface.PathType` (use `conda.models.enums.PathType` instead). (#5333)
* `conda_build.conda_interface.pkgs_dirs` (use `conda.base.context.context.pkgs_dirs` instead). (#5333)
* `conda_build.conda_interface.prefix_placeholder` (use `conda.base.constants.PREFIX_PLACEHOLDER` instead). (#5333)
* `conda_build.conda_interface.ProgressiveFetchExtract` (use `conda.core.package_cache_data.ProgressiveFetchExtract` instead). (#5333)
* `conda_build.conda_interface.reset_context` (use `conda.base.context.reset_context` instead). (#5333)
* `conda_build.conda_interface.Resolve` (use `conda.resolve.Resolve` instead). (#5333)
* `conda_build.conda_interface.rm_rf` (use `conda_build.utils.rm_rf` instead). (#5333)
* `conda_build.conda_interface.root_dir` (use `conda.base.context.context.root_prefix` instead). (#5333)
* `conda_build.conda_interface.root_writable` (use `conda.base.context.context.root_writable` instead). (#5333)
* `conda_build.conda_interface.spec_from_line` (use `conda.cli.common.spec_from_line` instead). (#5333)
* `conda_build.conda_interface.specs_from_args` (use `conda.cli.common.specs_from_args` instead). (#5333)
* `conda_build.conda_interface.specs_from_url` (use `conda.cli.common.specs_from_url` instead). (#5333)
* `conda_build.conda_interface.StringIO` (use `io.StringIO` instead). (#5333)
* `conda_build.conda_interface.subdir` (use `conda.base.context.context.subdir` instead). (#5333)
* `conda_build.conda_interface.symlink_conda`. (#5333)
* `conda_build.conda_interface.TemporaryDirectory` (use `conda.gateways.disk.create.TemporaryDirectory` instead). (#5333)
* `conda_build.conda_interface.TmpDownload` (use `conda.gateways.connection.download.TmpDownload` instead). (#5333)
* `conda_build.conda_interface._toposort` (use `conda.common.toposort._toposort` instead). (#5333)
* `conda_build.conda_interface.unix_path_to_win` (use `conda.utils.unix_path_to_win` instead). (#5333)
* `conda_build.conda_interface.untracked` (use `conda.misc.untracked` instead). (#5333)
* `conda_build.conda_interface.Unsatisfiable` (use `conda.exceptions.UnsatisfiableError` instead). (#5333)
* `conda_build.conda_interface.UnsatisfiableError` (use `conda.exceptions.UnsatisfiableError` instead). (#5333)
* `conda_build.conda_interface.url_path` (use `conda.utils.url_path` instead). (#5333)
* `conda_build.conda_interface.VersionOrder` (use `conda.models.version.VersionOrder` instead). (#5333)
* `conda_build.conda_interface.walk_prefix` (use `conda.misc.walk_prefix` instead). (#5333)
* `conda_build.conda_interface.win_path_to_unix` (use `conda.common.path.win_path_to_unix` instead). (#5333)
* `conda_build.index.channel_data`; `conda_build.index.get_build_index` return value for `channel_data` is now always `None`. (#5333)
* `conda_build.metadata.check_circular_dependencies` (use `conda_build.metadata._check_circular_dependencies` instead). (#5406)
* `conda_build.metadata.toposort` (use `conda_build.metadata.toposort_outputs` instead). (#5406)
* `conda_build.utils._convert_lists_to_sets` (use `frozendict.deepfreeze` instead). (#5333)
* `conda_build.utils.HashableDict` (use `frozendict.deepfreeze` instead). (#5333)
* `conda_build.utils.represent_hashabledict` (use `frozendict.deepfreeze` instead). (#5333)
* `conda_build.utils.rm_rf(config)`. (#5333)
* `conda_build.variants.get_vars(loop_only)`. (#5333)

### Other

* Do not generate conda error reports for common exceptions. (#5264)
* Add `CondaBuildUserError` exception to replace `sys.exit` calls. (#5353)
* Updated the CI to download the MacOSX 10.15 SDK. (#5387)

### Contributors

* @beeankha
* @conda-bot
* @carterbox made their first contribution in https://github.com/conda/conda-build/pull/5216
* @dholth
* @isuruf
* @jaimergp
* @kenodegard
* @zklaus made their first contribution in https://github.com/conda/conda-build/pull/5364
* @beckermr
* @minrk
* @timkpaine made their first contribution in https://github.com/conda/conda-build/pull/4821
* @dependabot[bot]
* @pre-commit-ci[bot]



## 24.5.1 (2024-05-23)

### Bug fixes
Expand Down
19 changes: 0 additions & 19 deletions news/3192-deprecate-testing-recipes

This file was deleted.

19 changes: 0 additions & 19 deletions news/4821-include-file-hash

This file was deleted.

3 changes: 0 additions & 3 deletions news/5176-lief-fail

This file was deleted.

20 changes: 0 additions & 20 deletions news/5205-repodata-json-only

This file was deleted.

19 changes: 0 additions & 19 deletions news/5216-files-exclude

This file was deleted.

3 changes: 0 additions & 3 deletions news/5281-perf-deepcopy

This file was deleted.

Loading

0 comments on commit 9480525

Please sign in to comment.