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(py3-conda-libmamba-solver): Cherrypick upstream commits to add support for libmamba 2.0 #34145

Merged

Conversation

philroche
Copy link
Member

@philroche philroche commented Nov 14, 2024

We have already released packages updates to libmamba and subpackages which is a major version jump from 1.5 to 2.0.

This caused failures in the conda packages and images due to py3-conda-libmamba-solver not yet supporting libmamba 2.0.

There is not yet an upstream release of conda-libmamba-solver with mamba 2.0 support but there is a release candidate
branch @ https://github.com/conda/conda-libmamba-solver/tree/24.11.0rc awaiting release.

We have broken dependent packages so we cannot wait for upstream to release.

As such I have cherrypicked the relevant 2.0 support commits from the 24.11.0rc branch.

This resolves the issues seen with conda and libmamba.

Full diff for conda-libmamba-solver @ conda/conda-libmamba-solver@24.9.0...24.11.0rc

mamba-org/mamba#3506 was the most helpful in finding the work to support libmamba 2.0
Signed-off-by: philroche phil.roche@chainguard.dev

…pport for libmamba 2.0

We have already released packages updates to libmamba and subpackages which is a major version jump from 1.5 to 2.0.

This caused failures in the conda packages and images due to py3-conda-libmamba-solver not yet supporting libmamba 2.0.

There is not yet an upstream release of conda-libmamba-solver with mamba 2.0 support for there is a release candidate
branch @ https://github.com/conda/conda-libmamba-solver/tree/24.11.0rc awaiting release.

We have broken dependent packages so we cannot wait for upstream to release.

As such I have cherrypicked the relevant 2.0 support commits from the 24.11.0rc branch.

This resolves the issues seen with conda and libmamba.

Full diff for conda-libmamba-solver @  conda/conda-libmamba-solver@24.9.0...24.11.0rc

mamba-org/mamba#3506 was the most helpful in finding the work to support libmamba 2.0
Signed-off-by: philroche <phil.roche@chainguard.dev>
@philroche philroche marked this pull request as ready for review November 14, 2024 12:19
@philroche philroche enabled auto-merge (squash) November 14, 2024 18:33
Copy link
Member

@jamonation jamonation left a comment

Choose a reason for hiding this comment

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

Discussed this with @philroche and we decided that while these are rc cherry picks, they unbreak existing use of the package, so +1 to merge

@philroche philroche merged commit d68acd7 into wolfi-dev:main Nov 14, 2024
24 checks passed
dannf pushed a commit to dannf/os that referenced this pull request Nov 15, 2024
…pport for libmamba 2.0 (wolfi-dev#34145)

We have already released packages updates to libmamba and subpackages
which is a major version jump from 1.5 to 2.0.

This caused failures in the conda packages and images due to
py3-conda-libmamba-solver not yet supporting libmamba 2.0.

There is not yet an upstream release of conda-libmamba-solver with mamba
2.0 support but there is a release candidate
branch @ https://github.com/conda/conda-libmamba-solver/tree/24.11.0rc
awaiting release.

We have broken dependent packages so we cannot wait for upstream to
release.

As such I have cherrypicked the relevant 2.0 support commits from the
24.11.0rc branch.

This resolves the issues seen with conda and libmamba.

Full diff for conda-libmamba-solver @
conda/conda-libmamba-solver@24.9.0...24.11.0rc

mamba-org/mamba#3506 was the most helpful in
finding the work to support libmamba 2.0
Signed-off-by: philroche <phil.roche@chainguard.dev>

Signed-off-by: philroche <phil.roche@chainguard.dev>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants