Synchronise 2025.1 with upstream#172
Merged
priteau merged 1 commit intostackhpc/2025.1from Feb 23, 2026
Merged
Conversation
this is a squash of 3 commits and a cap of setuptools to < 82 in setup.py Depends-on: https://review.opendev.org/c/openstack/devstack/+/976106 Replace use of distutils.version This is gone in Python 3.12. Ordering is slightly different with release candidates now (correctly, IMO) placed ahead of general releases so we have to update a single entry. codesearch.o.o [1] suggests this shouldn't affect anyone. [1] https://codesearch.opendev.org/?q=pysaml2!%3D4.0.3 Change-Id: I4cde27f048889dd557c0473138bd8a75c1e1cc58 Signed-off-by: Stephen Finucane <[email protected]> (cherry picked from commit 2d88770) Remove check-conflicts script This script made sense back before pip had a proper dependency resolver, but since pip 20.3 [1] this is no longer the case. Our jobs to test this can simply install the dependencies and let pip complain if it cannot resolve things. [1] https://discuss.python.org/t/announcement-pip-20-3-release/5948 Change-Id: Ifc30478dfffd52f126e0ad7535468cdd0b1cd36a Signed-off-by: Stephen Finucane <[email protected]> (cherry picked from commit 63a1790) Add pyproject.toml to fix install issues After capping setuptools in setup.py, there are issues when installing our library in a venv. Add a pyproject.toml file to avoid this. Signed-off-by: Dr. Jens Harbott <[email protected]> Change-Id: Ib9b7ecde0210a3b11bcb70e96e295cf73f2e0954 (cherry picked from commit ad78d83) Replace pkg_resources This will be removed after 2025-11-30. Get ahead of that breakage. Change-Id: Ib97eea1037fac541c8ebadc526ae9c3bb160f685 Signed-off-by: Stephen Finucane <[email protected]> (cherry picked from commit 7f008f9) (cherry picked from commit ed0f971)
github-actions
bot
added
automated
priteau
approved these changes
Feb 23, 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
2 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.