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

Make sure the solver sees the correct subdir #5350

Merged
merged 8 commits into from
Jun 4, 2024

Conversation

jaimergp
Copy link
Contributor

@jaimergp jaimergp commented May 21, 2024

Description

Should fix #5341

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?

Co-authored-by: mbargull <[email protected]>
@conda-bot conda-bot added the cla-signed [bot] added once the contributor has signed the CLA label May 21, 2024
Copy link

codspeed-hq bot commented May 21, 2024

CodSpeed Performance Report

Merging #5350 will not alter performance

Comparing jaimergp:cross-subdir (9867682) with main (01b47f4)

Summary

✅ 3 untouched benchmarks

@jaimergp jaimergp marked this pull request as ready for review May 23, 2024 08:24
@jaimergp jaimergp requested a review from a team as a code owner May 23, 2024 08:24
mbargull
mbargull previously approved these changes May 23, 2024
tests/test_api_build.py Outdated Show resolved Hide resolved
@mbargull
Copy link
Member

WDYT about the question about the target branch (main vs 24.5.x) from #5341 (comment) :

As for when/how to include this:

  1. We could include this in a 24.5.x patch release ("fixes cross-platform building with virtual packages"),
  2. or include this only in 24.7.x ("adding support for proper cross-platform building").

In principle, I'd be in favor of option 1, but am also not sure if this could be an "unexpected environment resolving change for a patch release" for some.

@kenodegard
Copy link
Contributor

Since this is a bugfix and not a regression I'm in favor of merging this into main and release with 24.7.x

isuruf
isuruf previously approved these changes May 23, 2024
Copy link
Contributor

@isuruf isuruf left a comment

Choose a reason for hiding this comment

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

Thank you everyone for helping on this issue. Let's get this in for 24.7

beeankha
beeankha previously approved these changes May 23, 2024
@isuruf isuruf added this to the 24.7.x milestone Jun 3, 2024
tests/test_api_build.py Outdated Show resolved Hide resolved
@isuruf isuruf dismissed stale reviews from beeankha, mbargull, and themself via 9867682 June 4, 2024 16:08
@kenodegard kenodegard merged commit 17c8fe6 into conda:main Jun 4, 2024
28 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
Status: 🏁 Done
Development

Successfully merging this pull request may close these issues.

Cross compiling with virtual packages
6 participants