Synchronise 2025.1 with upstream#180
Merged
priteau merged 4 commits intostackhpc/2025.1from Apr 8, 2026
Merged
Conversation
This project team and all the deliverables were retired from OpenStack Depends-On: https://review.opendev.org/c/openstack/governance/+/953671 Change-Id: I913c2f6a2331cfdcffd6108a8bfec24b978d8e6a Signed-off-by: Goutham Pacha Ravi <gouthampravi@gmail.com> (cherry picked from commit 0bcf049) (cherry picked from commit c8cd9e9)
Many packages in stable branches depend on setuptools<82 at build time, because of the pkg_resources deprecation. We can't fix this by upgrading the packages like we did with the main branch, because we want to keep the branches stable. So we need to pin the setuptools version. However, it's a build-time dependency, so it's a bid more tricky. We have to force a version of pip that supports that option. Change-Id: I5cd04d37068daaccbd91401489918666cb1d61c1 Signed-off-by: Radomir Dopieralski <openstack@dopieralski.pl>
Followup after [1] which did not launch all jobs and omitted breakage in py39 job and cross jobs. Also remove check-conflicts usage from py39 that was omitted in [2]. Mark cross-keystone and cross-osc-tox-docs jobs as non voting due to failures related to pkg_resources [1]: I5cd04d37068daaccbd91401489918666cb1d61c1 [2]: Ib97eea1037fac541c8ebadc526ae9c3bb160f685 Change-Id: I807cf2e90d48b725fa5fb1f01b83ec08ff124fa0 Signed-off-by: Michal Nasiadka <mnasiadka@gmail.com>
github-actions
bot
added
automated
priteau
approved these changes
Apr 8, 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
4 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.