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

Fix stdlib being recognized in variant hash inputs #5195

Merged
merged 4 commits into from
Feb 28, 2024

Conversation

mbargull
Copy link
Member

@mbargull mbargull commented Feb 20, 2024

Description

Fixes gh-5190.

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?

Signed-off-by: Marcel Bargull <marcel.bargull@udo.edu>
@conda-bot conda-bot added the cla-signed [bot] added once the contributor has signed the CLA label Feb 20, 2024
Signed-off-by: Marcel Bargull <marcel.bargull@udo.edu>
@mbargull
Copy link
Member Author

tests/test_metadata.py::test_native_stdlib_metadata[linux-64-sysroot-2.12] 
[gw1] [ 43%] FAILED tests/test_metadata.py::test_native_stdlib_metadata[linux-64-sysroot-2.12] 
tests/test_metadata.py::test_native_stdlib_metadata[linux-aarch64-sysroot-2.17] 
[gw1] [ 43%] FAILED tests/test_metadata.py::test_native_stdlib_metadata[linux-aarch64-sysroot-2.17] 
tests/test_metadata.py::test_native_stdlib_metadata[osx-64-macosx_deployment_target-10.13] 
[gw1] [ 43%] FAILED tests/test_metadata.py::test_native_stdlib_metadata[osx-64-macosx_deployment_target-10.13] 
tests/test_metadata.py::test_native_stdlib_metadata[osx-arm64-macosx_deployment_target-11.0] 
[gw1] [ 43%] FAILED tests/test_metadata.py::test_native_stdlib_metadata[osx-arm64-macosx_deployment_target-11.0] 

This function is used downstream in conda-forge's conda-smithy, so let's
test against this explicitly, too.

Signed-off-by: Marcel Bargull <marcel.bargull@udo.edu>
@mbargull
Copy link
Member Author

pre-commit.ci autofix

Copy link
Contributor

@h-vetinari h-vetinari 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 very much for tackling this! 🙏

The changes LGTM.

@kenodegard kenodegard merged commit 38fdc15 into conda:main Feb 28, 2024
26 checks passed
@h-vetinari
Copy link
Contributor

Thank you all! :)

Given that this is a straightforward and well-scoped patch for functionality that isn't in use anywhere yet, and arguably a bugfix for a faulty implementation in #4999, would you consider a backport to 24.1.x?

The reason I'm asking is because a lot of work in conda-forge is backed up on this (w.r.t. moving to glibc 2.17 resp. macOS 10.13, both of which are getting more pressing every week), and so it would be great to reduce time spent waiting for procedure, and hopefully reduce the hair-on-fire likelihood later on this year by starting some very long-running things (like migrating all our compiled recipes to contain {{ stdlib("c") }} , c.f. regro/cf-scripts#2135) as soon as possible.

Independently of your choice for how to handle this in conda-build itself, I'll also propose this for backporting on the conda-forge feedstock, which would be "good enough" for unblocking work in conda-forge/conda-forge.github.io#1844, though of course a new patch version would be preferable.

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.

ENH: Improve stdlib-handling
5 participants