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.5.x back into main #5358

Merged
merged 3 commits into from
May 24, 2024
Merged

Merge 24.5.x back into main #5358

merged 3 commits into from
May 24, 2024

Conversation

beeankha
Copy link
Contributor

Xref #5319

Warning

DO NOT SQUASH MERGE!

mbargull and others added 3 commits May 22, 2024 12:56
* Fix excessive memory use in inspect_linkages_lief
introduced in gh-5228 which replaced binary.name with str(file).
The former returns the path to the binary whereas the latter returns the
contents of the parsed binary, naturally causing high memory usage.
That semantic change was unintended (misread upstream changes).
Since binary's path is no longer part of the object, pass it separately.

* Use consistent var name in inspect_linkages_lief to avoid variable shadowing.

* Remove redundant get_uniqueness_key call

---------

Signed-off-by: Marcel Bargull <marcel.bargull@udo.edu>
* Revise toposort to avoid returning frozendict which may potentially need to be modified when `outputs/files` are defined.
* Add minimal reproducing test.
* Add type annotations.
* Deprecate conda_build.metadata.toposort in favor of conda_build.metadata._toposort_outputs.
* Deprecate conda_build.metadata.check_circular_dependencies in favor of conda_build.metadata._check_circular_dependencies.
* Update .authors.yml

* Update news

* Updated authorship for 24.5.1

* Updated CHANGELOG for 24.5.1

* Update CHANGELOG.md
@beeankha beeankha requested a review from a team as a code owner May 24, 2024 01:52
@conda-bot conda-bot added the cla-signed [bot] added once the contributor has signed the CLA label May 24, 2024
@beeankha beeankha mentioned this pull request May 24, 2024
31 tasks
@kenodegard kenodegard merged commit d9edc57 into main May 24, 2024
57 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cla-signed [bot] added once the contributor has signed the CLA
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

None yet

4 participants