Skip to content

Fix transitive subpackage dependency resolution #5603

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 5 commits into from
Jan 28, 2025
Merged

Fix transitive subpackage dependency resolution #5603

merged 5 commits into from
Jan 28, 2025

Conversation

isuruf
Copy link
Contributor

@isuruf isuruf commented Jan 27, 2025 •
edited
Loading

Description

Checklist - did you ...

  • Add a file to the news directory (using the template) for the next release's release notes?
  • Add / update necessary tests?
  • Add / update outdated documentation?

Fixes #3308

@isuruf isuruf requested a review from a team as a code owner January 27, 2025 18:42
@conda-bot conda-bot added the cla-signed [bot] added once the contributor has signed the CLA label Jan 27, 2025
@codspeed-hq CodSpeed HQ
Copy link

codspeed-hq bot commented Jan 27, 2025 •
edited
Loading

CodSpeed Performance Report

Merging #5603 will not alter performance

Comparing isuruf:transitive-subpackage (aa8a2e9) with main (cf35214)

Summary

✅ 5 untouched benchmarks

beckermr
beckermr reviewed Jan 27, 2025
View reviewed changes
Copy link
Contributor

@beckermr beckermr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I need to read in more detail, but should we add a specific test for which transitive deps get picked up into the envs?

Right now the tests only ensure that the recipe from the issue builds.

beckermr
beckermr requested changes Jan 27, 2025
View reviewed changes
Copy link
Contributor

@beckermr beckermr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The logic looks correct, but I am fuzzy on the various m.is_cross branches. We should a test that specifically looks at the resolved envs for the recipe to ensure it has the right packages.

@isuruf
Copy link
Contributor Author

isuruf commented Jan 27, 2025

We should a test that specifically looks at the resolved envs for the recipe to ensure it has the right packages.

I'm not sure what you mean here. The test that I added fails to build with the current main branch.

@beckermr
Copy link
Contributor

What I mean is that in the original issue, the output of conda render was shown. This demonstrated that the various envs made during the build did not have the right packages in them.

I am saying that in addition to ensuring the recipe from the issue builds, we should explicitly verify that the envs made during the build have the correct transitive packages in them.

This will help future maintainers debug any test failures.

@isuruf
Copy link
Contributor Author

isuruf commented Jan 28, 2025

pre-commit.ci autofix

@isuruf isuruf requested a review from beckermr January 28, 2025 09:00
@isuruf isuruf mentioned this pull request Jan 28, 2025
Merged
5 tasks
@beckermr beckermr enabled auto-merge (squash) January 28, 2025 11:58
@wolfv
Copy link
Contributor

wolfv commented Jan 28, 2025

I am not sure this is relevant, but in rattler-build we actually create variants for each exact=true so that the tree is unfolded correctly :)

@isuruf
Copy link
Contributor Author

isuruf commented Jan 28, 2025

I am not sure this is relevant, but in rattler-build we actually create variants for each exact=true so that the tree is unfolded correctly :)

That's a different issue. Or rather the second comment in the same issue. See #3308 (comment)

@beckermr beckermr merged commit 49872a5 into conda:main Jan 28, 2025
28 checks passed
@isuruf isuruf deleted the transitive-subpackage branch January 29, 2025 04:49
@kenodegard kenodegard mentioned this pull request Mar 17, 2025
Closed
59 tasks
This was referenced Mar 20, 2025
Closed
Closed
jaimergp added a commit that referenced this pull request Mar 21, 2025
@jaimergp
Revert "Fix transitive subpackage dependency resolution (#5603)"
ddd7e6f 
This reverts commit 49872a5.
jaimergp added a commit that referenced this pull request Mar 21, 2025
@jaimergp
Revert "Fix transitive subpackage dependency resolution (#5603)"
a519df2 
This reverts commit 49872a5, but keeping tests
@beckermr beckermr mentioned this pull request Mar 21, 2025
Merged
4 tasks
beckermr pushed a commit that referenced this pull request Mar 23, 2025
@jaimergp
Revert "Fix transitive subpackage dependency resolution (#5603)" (#5647)
19251f4
isuruf added a commit to isuruf/conda-build that referenced this pull request Mar 24, 2025
@isuruf
Reapply "Fix transitive subpackage dependency resolution (conda#5603)" (
fee8777 
conda#5647)

This reverts commit 19251f4.
isuruf pushed a commit that referenced this pull request Mar 24, 2025
@beckermr @pre-commit-ci
@kenodegard @jaimergp
test: regression tests for bugs in 5645 and 5644 (#5648)
70e79f2 
* [pre-commit.ci] pre-commit autoupdate (#5641)

updates:
- [github.com/astral-sh/ruff-pre-commit: v0.9.10 → v0.11.0](astral-sh/ruff-pre-commit@v0.9.10...v0.11.0)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

* Revert "Fix transitive subpackage dependency resolution (#5603)"

This reverts commit 49872a5, but keeping tests

* add news

* xfail test

* pre-commit

* test: add test for grpc regression

* fix: need to limit to linux

* fix: specify conda-forge

* test: add 5644 test

* test: try osx-arm64 recipe

* test: ensure cross-compiles

* fix: skip message is wrong

* Xfail recipe

* style: pre-the-commit

* doc: add news

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Ken Odegard <[email protected]>
Co-authored-by: jaimergp <[email protected]>
kenodegard added a commit that referenced this pull request Mar 24, 2025
@kenodegard @jaimergp @beckermr
Merge commit from fork
d246e49 
* Downgrade necessary permissions for build script

* Use atomic moves to minimize attack window

* add news

* minimize windows further

* use opener

* Provide new helper context manager to handle atomic writes and permission setting

* pre-commit

* clarify need for umask reset

* use secrets.token_urlsafe with 64 characters

* Revert "Fix transitive subpackage dependency resolution (#5603)" (#5647)

* Update conda_build/utils.py

Co-authored-by: Ken Odegard <[email protected]>

* Update conda_build/utils.py

---------

Co-authored-by: jaimergp <[email protected]>
Co-authored-by: Matthew R. Becker <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@beckermr beckermr beckermr approved these changes

Assignees
No one assigned
Labels
cla-signed [bot] added once the contributor has signed the CLA
Projects
🔎 Review
Archived in project
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Transitive constraints are not properly considered in multiple output recipes
4 participants
@isuruf @beckermr @wolfv @conda-bot