Synchronise 2025.1 with upstream#519
Merged
Alex-Welsh merged 4 commits intostackhpc/2025.1from Mar 9, 2026
Merged
Conversation
This fixes various issues relating to pkg_resources being removed [1]. The requirements check has been disabled as it forbids the upper constraint on the setuptools package. [1] https://setuptools.pypa.io/en/stable/history.html#v82-0-0 Depends-On; https://review.opendev.org/c/openstack/requirements/+/976259 Change-Id: I8ef2783ec71c19982c91c2a4806b51c7280452d3 Signed-off-by: Will Szumski <will@stackhpc.com>
Heat and related deps require pkg_resources. [1] [1] https://setuptools.pypa.io/en/stable/history.html#v82-0-0 Change-Id: I72fd2ba68c9380170aefafd1a9929d535181796d Signed-off-by: Bartosz Bezak <bartosz@stackhpc.com>
Change-Id: I225ef043f05eda76941e9aeba65bbbb3a154df4d Signed-off-by: Bartosz Bezak <bartosz@stackhpc.com>
To fix arm64 valkey build. The virtual `valkey` resolves to `valkey-server` in bookworm-backports, but our global -1000 pin blocks it. Amd64 worked only because extrepo shipped it. Use valkey directly from the backports packages instead. follow up to https://review.opendev.org/c/openstack/kolla/+/932174 Change-Id: I846e4f19696ca28758cb9c0400be96c01b079daa Signed-off-by: Bartosz Bezak <bartosz@stackhpc.com> (cherry picked from commit 477f71b)
github-actions
bot
added
automated
Alex-Welsh
approved these changes
Mar 9, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR contains a snapshot of 2025.1 from upstream stable/2025.1.