Synchronise master with upstream#254
Merged
Merged
Conversation
The Service Types Authority indicates [1] that the official service type for Magnum is 'container-infrastructure-management'. While all clients are using the alias 'container-infra', and will have to continue doing so for a long time to work with older Magnum deployments, we should support the official service type along with any other aliases. [1] https://specs.openstack.org/openstack/service-types-authority/ Change-Id: I7dee4471702da513a0e6f231504b731aea94395a Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
Change-Id: I041589103552355a97ff8255a147d3895f34fb99 Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
unittest.Mock returns a tuple from call_args consisting of positional args and keyword args[1]. This update makes it clear what is being returned and removes the confusing "cluster[0]", which is actually getting the first positional arg. [1] https://docs.python.org/3/library/unittest.mock.html#unittest.mock.Mock.call_args Signed-off-by: Dale Smith <dale@catalystcloud.nz> Change-Id: I67174ded7a9e311723951bef3366a8cfa36be5ea
Change-Id: Ia271f8fbc33ec42a1ade4f53ec8b55e2f4afcf30 Signed-off-by: Jake Yip <jake.yip@ardc.edu.au>
OpenStack recently dropped python 3.9 support for global requirements[1] as it was removed from the Flamingo supported runtimes[2]. [1]https://review.opendev.org/c/openstack/requirements/+/948285 [2]https://governance.openstack.org/tc/reference/runtimes/2025.2.html#python Change-Id: Ibfe759e72c0780b3e08515d42041cee9f92048f8 Signed-off-by: Ivan Anfimov <lazekteam@gmail.com>
Change-Id: I78bc32a88b8db54d85fb143aaf7310bd7d14aba8 Signed-off-by: Ivan Anfimov <lazekteam@gmail.com>
The check has never been added to the local plugin and the built-in H904 check has been used. Change-Id: I1c65fe5868e9d48ca22134b584c2aaef073daf46 Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
The equivalent checks were already implemented in hacking. Change-Id: I7abad1aaa124e2d242fa00ec820834586ed56e46 Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
The environment variable is set automatically. cf. tox-dev/tox@be5373bab Change-Id: Ie97d07739105af3f57a268049d1e07bdc788ea00 Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
Python 2 reached its EOL long time ago and we no longer expect any user may attempt to run tox in Python 2. Removing the option allows us to remove ignore_basepython_conflict. Change-Id: Ieb6c94e6cbebbff7f63d3f8921e8a7de61de846a Co-authored-by: Takashi Kajinami <kajinamit@oss.nttdata.com> Signed-off-by: Ivan Anfimov <lazekteam@gmail.com>
github-actions
Bot
added
automated
priteau
approved these changes
Mar 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
6 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 master from upstream master.