Skip to content

Synchronise master with upstream - #231

Merged
priteau merged 40 commits into
stackhpc/masterfrom
upstream/master-2026-10-12
Oct 14, 2026
Merged

priteau merged 40 commits into
stackhpc/masterfrom
upstream/master-2026-10-12

Conversation

@github-actions

Copy link
Copy Markdown

This PR contains a snapshot of master from upstream master.

OpenStack Proposal Bot and others added 30 commits September 27, 2026 14:21
Pin versions for packages that are not ready for updating:

- pyroute2: Nova/os-vif issues
- sqlalchemy: broken compatibility with sqlalchemy-utils
- pyparsing: due to regression in 3.3.3[1]

[1] pyparsing/pyparsing#672

Co-Authored-by: Dr. Jens Harbott <harbott@osism.tech>
Co-Authored-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
Change-Id: I98b8c4c0c778dcd2cb20f2e830fb80d99351a228
Signed-off-by: OpenStack Proposal Bot <openstack-infra@lists.openstack.org>
Generated-By: openstack/project-config:playbooks/proposal/propose_update.sh
salt 3008.2 pins the packaging library to 24.0, which is not compatible
with the latest tox.

The latest tox requires the packaging.pylock module which was added in
packaging 26.0.

[1] e940761

Change-Id: Ib1eae8b3e3752bba4bc6e75ecb9c6c25b38be58b
Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
meta: version: 14.1.0
meta: team: heat
meta: diff-start: -
meta: series: independent
meta: branch: master
meta: release-type: release
meta: pypi: no
meta: first: no
meta: release:Author: Takashi Kajinami <kajinamit@oss.nttdata.com>
meta: release:Commit: Takashi Kajinami <kajinamit@oss.nttdata.com>
meta: release:Change-Id: I4c795bf48b6558aa8923a88a45c71292927cc203
meta: release:Code-Review+2: Elod Illes <elod.illes@est.tech>
meta: release:Workflow+1: Elod Illes <elod.illes@est.tech>
Change-Id: I9971d3a58676513d171c3d588426598cd2f91ad9
Signed-off-by: OpenStack Proposal Bot <openstack-infra@lists.openstack.org>
Generated-By: openstack/project-config:roles/copy-release-tools-scripts/files/release-tools/update_constraints.sh
meta: version: 14.1.0
meta: team: heat
meta: diff-start: -
meta: series: independent
meta: branch: master
meta: release-type: release
meta: pypi: no
meta: first: no
meta: release:Author: Takashi Kajinami <kajinamit@oss.nttdata.com>
meta: release:Commit: Takashi Kajinami <kajinamit@oss.nttdata.com>
meta: release:Change-Id: I4c795bf48b6558aa8923a88a45c71292927cc203
meta: release:Code-Review+2: Elod Illes <elod.illes@est.tech>
meta: release:Workflow+1: Elod Illes <elod.illes@est.tech>
Change-Id: I5d4d5089c160564274c00b8987815d61820646b8
Signed-off-by: OpenStack Proposal Bot <openstack-infra@lists.openstack.org>
Generated-By: openstack/project-config:roles/copy-release-tools-scripts/files/release-tools/update_constraints.sh
meta: version: 14.1.0
meta: team: heat
meta: diff-start: -
meta: series: independent
meta: branch: master
meta: release-type: release
meta: pypi: no
meta: first: no
meta: release:Author: Takashi Kajinami <kajinamit@oss.nttdata.com>
meta: release:Commit: Takashi Kajinami <kajinamit@oss.nttdata.com>
meta: release:Change-Id: I4c795bf48b6558aa8923a88a45c71292927cc203
meta: release:Code-Review+2: Elod Illes <elod.illes@est.tech>
meta: release:Workflow+1: Elod Illes <elod.illes@est.tech>
Change-Id: I0028e5bd22e060e70a229e792e290d0029524a49
Signed-off-by: OpenStack Proposal Bot <openstack-infra@lists.openstack.org>
Generated-By: openstack/project-config:roles/copy-release-tools-scripts/files/release-tools/update_constraints.sh
Some of the optional dependencies are quite specific to projects and
we may not want to maintain these fully in global requirements.

Change-Id: I27af77991b850249d9fef3aa60c3645b83ad6cc4
Signed-off-by: Michal Nasiadka <mnasiadka@gmail.com>
These are unused since I65fd1ae3a4c00a4fd6186f4cd915ae4095c2916f.

Change-Id: Ied6621a2e7c1702aa7f0061a6de925359735bfcf
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
Nothing is using this in- or out-of-tree.

Change-Id: I49ab4d38f3357e4af6bcfaa272f89fb6f4219df4
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
Commit a968919 (July 2022) and its follow-up commits 5d31764 (July
2022) and 8412994 (October 2022) allowed "backport" packages to have
arbitrary python_version markers. The idea was that projects would be
able to specify a different python_version marker for backport packages
depending on which equivalent Python stdlib version they wanted
compatibility with.

Commit 28af2ea (November 2023) later added the ability to allow *any*
package to specify a local python_version marker when said marker did
not exist in global-requirements.txt. This was specifically called out
for packages like pytz and tzdata, which are not backports but are
simply no longer necessary on recent Python versions. This complemented
an existing check which allowed the inverse, where
global-requirements.txt specified a python_version marker but one was
not specified locally.

There is a lot of overlap between these checks. The backport check
happens after the other two checks, which means the only case where this
will trigger is if both global and local requirements specify a
python_version marker *and* there is a mismatch *and* the package is in
the list of backports. However, our backports.txt file still only
contains a single entry - importlib-metadata - and there is no marker
specified for this in global-requirements.txt.

As a result, the best course of action here is to drop the file and
supporting logic entirely. The local-only marker logic added in 28af2ea
is sufficient for our use case.

Change-Id: I5e9fba2320975053b46524876ec13c0a43121177
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
OpenStack no longer supports Windows. Additionally, pbr has a bug with
setuptools >= 83.0.0 where it silently drops dependencies that carry PEP
508 environment markers like sys_platform!='win32' [1]. Ultimately the
fix here exists in pbr, but there's no reason we shouldn't let projects
drop these specifiers anyway, given we no longer care about Windows.

[1] https://bugs.launchpad.net/pbr/+bug/2162730

Change-Id: Id6ddc9d85a27f3bc40b4a680b020a61c29aeb15e
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
This is not required since the addition of TestCase.subTest in Python
3.4 [1].

[1] https://docs.python.org/3/library/unittest.html#distinguishing-test-iterations-using-subtests

Change-Id: Ia81ebd808b135300b3a37f22e21aafddc90b9228
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
We only support Python 3.11+ now so we can depend on the stdlib tomllib.

Change-Id: Iec4bd48cb007521055178657daaa68c042a129fb
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
meta: version: 8.6.0
meta: team: Release Management
meta: diff-start: -
meta: series: indri
meta: branch: master
meta: release-type: release
meta: pypi: no
meta: first: yes
meta: release:Author: Elod Illes <elod.illes@est.tech>
meta: release:Commit: Elod Illes <elod.illes@est.tech>
meta: release:Change-Id: I5fc84f01b9d9ceedb87169b9aa0ae4e2b3734074
meta: release:Code-Review+2: Jeremy Stanley <fungi@yuggoth.org>
meta: release:Workflow+1: Jeremy Stanley <fungi@yuggoth.org>
Change-Id: I9f087b780279ad1be4119b8376556d82e6c12cc2
Signed-off-by: OpenStack Proposal Bot <openstack-infra@lists.openstack.org>
Generated-By: openstack/project-config:roles/copy-release-tools-scripts/files/release-tools/update_constraints.sh
We were not checking the result of the ruff commands, which meant it
could make changes but we wouldn't see failures in CI. Fix this by
adding the missing arguments to ensure this happens and address issues
that have crept in in the interim.

Change-Id: Ide5b9a452255a9f36ccb7057be833901271e89fe
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
The E5 rules included E501 (line too long) and E502 (backslash is
redundant between brackets) rules. The former is important since it
catches cases of too long strings, which ruff won't automatically rewrap
for us (doing so would be an AST change). This contrasts with function
calls, which ruff has handled all along (due to tool.ruff.line-length
being set in pyproject.toml).

Enable these rules and manually fix the issues that they highlight. In
most cases this just means splitting string across lines, but we also
tweak how some print statements are handled.

Change-Id: I7574f7f8f13412f6d819e6f719d0d199c8449c2d
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
The only reference to this dependency that we can find is in Tacker,
where there is a release note from July 2021 indicating that it is no
longer used [1]. The library itself has not seen a release since April
2023 [2].

[1] https://opendev.org/openstack/tacker/src/branch/master/releasenotes/notes/drop-sqlalchemy-filters-7ba7a03a309654bc.yaml
[2] https://pypi.org/project/sqlalchemy-filters/

Change-Id: I3ff9dee88314118e6bdb45d479ea6a7825585e98
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
meta: version: 5.14.0
meta: team: ironic
meta: diff-start: -
meta: series: indri
meta: branch: master
meta: release-type: release
meta: pypi: no
meta: first: yes
meta: release:Author: Riccardo Pittau <elfosardo@gmail.com>
meta: release:Commit: Riccardo Pittau <elfosardo@gmail.com>
meta: release:Change-Id: I26472a549c8f0b97e63071009b30877c62b07af9
meta: release:Workflow+1: Elod Illes <elod.illes@est.tech>
meta: release:Code-Review+2: Elod Illes <elod.illes@est.tech>
meta: release:Code-Review+1: Iury Gregory Melo Ferreira <iurygregory@gmail.com>
Change-Id: Ib2c1fde7021b3fd733f5d557ff7e4e1baa179603
Signed-off-by: OpenStack Proposal Bot <openstack-infra@lists.openstack.org>
Generated-By: openstack/project-config:roles/copy-release-tools-scripts/files/release-tools/update_constraints.sh
meta: version: 7.1.3
meta: team: oslo
meta: diff-start: -
meta: series: independent
meta: branch: master
meta: release-type: release
meta: pypi: yes
meta: first: no
meta: release:Author: Stephen Finucane <stephenfin@redhat.com>
meta: release:Commit: Stephen Finucane <stephenfin@redhat.com>
meta: release:Change-Id: I5709bbf28ef444087eb260c08a453f4b1ccefb61
meta: release:Code-Review+2: Elod Illes <elod.illes@est.tech>
meta: release:Workflow+1: Elod Illes <elod.illes@est.tech>
meta: release:Code-Review+2: Jeremy Stanley <fungi@yuggoth.org>
meta: release:Code-Review+1: Rodolfo Alonso <ralonsoh@redhat.com>
Change-Id: I70970b945294b6b5eaa554daef5bc901806ead56
Signed-off-by: OpenStack Proposal Bot <openstack-infra@lists.openstack.org>
Generated-By: openstack/project-config:roles/copy-release-tools-scripts/files/release-tools/update_constraints.sh
meta: version: 10.2.0
meta: team: ironic
meta: diff-start: -
meta: series: indri
meta: branch: master
meta: release-type: release
meta: pypi: yes
meta: first: yes
meta: release:Author: Riccardo Pittau <elfosardo@gmail.com>
meta: release:Commit: Riccardo Pittau <elfosardo@gmail.com>
meta: release:Change-Id: I8111610d1dc4477414a1491f239546870b97f9b0
meta: release:Code-Review+2: Elod Illes <elod.illes@est.tech>
meta: release:Workflow+1: Elod Illes <elod.illes@est.tech>
Change-Id: I890fef1e0246b21d4c808a5976d0b00a0b232aa0
Signed-off-by: OpenStack Proposal Bot <openstack-infra@lists.openstack.org>
Generated-By: openstack/project-config:roles/copy-release-tools-scripts/files/release-tools/update_constraints.sh
meta: version: 4.21.0
meta: team: OpenStackSDK
meta: diff-start: -
meta: series: indri
meta: branch: master
meta: release-type: release
meta: pypi: yes
meta: first: yes
meta: release:Author: Stephen Finucane <stephenfin@redhat.com>
meta: release:Commit: Stephen Finucane <stephenfin@redhat.com>
meta: release:Change-Id: I0c3294c67f8a13c61bd018365ea1ae7c89e8056b
meta: release:Code-Review+2: Elod Illes <elod.illes@est.tech>
meta: release:Workflow+1: Elod Illes <elod.illes@est.tech>
Change-Id: I5803e1efcd0396cda690879696ba64f9de090f99
Signed-off-by: OpenStack Proposal Bot <openstack-infra@lists.openstack.org>
Generated-By: openstack/project-config:roles/copy-release-tools-scripts/files/release-tools/update_constraints.sh
meta: version: 5.18.0
meta: team: OpenStackSDK
meta: diff-start: -
meta: series: indri
meta: branch: master
meta: release-type: release
meta: pypi: yes
meta: first: yes
meta: release:Author: Stephen Finucane <stephenfin@redhat.com>
meta: release:Commit: Stephen Finucane <stephenfin@redhat.com>
meta: release:d9510af pre-commit: Add codespell
meta: release:5d398c4 Default OIDC device authorization polling interval to 5s
meta: release:Change-Id: I18297e7d48c0eed059e034f6f4a94a74d933dcbd
meta: release:Workflow+1: Elod Illes <elod.illes@est.tech>
meta: release:Code-Review+2: Elod Illes <elod.illes@est.tech>
Change-Id: I5bd5110c7932440122521b286975170fa49df68c
Signed-off-by: OpenStack Proposal Bot <openstack-infra@lists.openstack.org>
Generated-By: openstack/project-config:roles/copy-release-tools-scripts/files/release-tools/update_constraints.sh
meta: version: 6.5.0
meta: team: oslo
meta: diff-start: -
meta: series: indri
meta: branch: master
meta: release-type: release
meta: pypi: yes
meta: first: yes
meta: release:Author: Stephen Finucane <stephenfin@redhat.com>
meta: release:Commit: Stephen Finucane <stephenfin@redhat.com>
meta: release:as noted in that commit:
meta: release:f0d789a1 pre-commit: Bump versions
meta: release:Change-Id: I7fa725280b4bb236ecda6919caf46b4c9761d84b
meta: release:Code-Review+2: Elod Illes <elod.illes@est.tech>
meta: release:Workflow+1: Elod Illes <elod.illes@est.tech>
Change-Id: Ifa824aeddbe22c12e227cd9e14812eddb9baf0eb
Signed-off-by: OpenStack Proposal Bot <openstack-infra@lists.openstack.org>
Generated-By: openstack/project-config:roles/copy-release-tools-scripts/files/release-tools/update_constraints.sh
Zuul and others added 10 commits October 8, 2026 08:02
meta: version: 5.3.0
meta: team: nova
meta: diff-start: -
meta: series: indri
meta: branch: master
meta: release-type: release
meta: pypi: yes
meta: first: yes
meta: release:Author: Rodolfo Alonso Hernandez <ralonsoh@redhat.com>
meta: release:Commit: Rodolfo Alonso Hernandez <ralonsoh@redhat.com>
meta: release:Change-Id: I7e7d215fba5ea179bdf9e240cbeaa7b0132f266e
meta: release:Workflow+1: Elod Illes <elod.illes@est.tech>
meta: release:Code-Review+2: Elod Illes <elod.illes@est.tech>
meta: release:Code-Review+1: yatin <ykarel@redhat.com>
meta: release:Code-Review+1: ribaudr <rene.ribaud@gmail.com>
Change-Id: I72e890bf3dd206866b13c47725e8579a721c3288
Signed-off-by: OpenStack Proposal Bot <openstack-infra@lists.openstack.org>
Generated-By: openstack/project-config:roles/copy-release-tools-scripts/files/release-tools/update_constraints.sh
meta: version: 10.4.0
meta: team: OpenStackSDK
meta: diff-start: -
meta: series: indri
meta: branch: master
meta: release-type: release
meta: pypi: yes
meta: first: yes
meta: release:Author: Stephen Finucane <stephenfin@redhat.com>
meta: release:Commit: Stephen Finucane <stephenfin@redhat.com>
meta: release:Change-Id: I280cbd599e0616e82af8d077fa23738889422432
meta: release:Workflow+1: Elod Illes <elod.illes@est.tech>
meta: release:Code-Review+2: Elod Illes <elod.illes@est.tech>
Change-Id: Id7263caa2e0c0cee5bdc2abf0f89c828e9cd2137
Signed-off-by: OpenStack Proposal Bot <openstack-infra@lists.openstack.org>
Generated-By: openstack/project-config:roles/copy-release-tools-scripts/files/release-tools/update_constraints.sh
Fixes applied to automated upper-constraints.txt update:

Pin versions for packages that are not ready for updating:

- pyroute2: Nova/os-vif issues
- sqlalchemy: broken compatibility with sqlalchemy-utils
- pyparsing: due to regression in 3.3.3[1]
- Pin salt to 3008.0 to avoid the packaging pin

[1] pyparsing/pyparsing#672

Co-Authored-by: Dr. Jens Harbott <harbott@osism.tech>
Co-Authored-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
Change-Id: I9512485505b705d7f5cc77f8be2a539476421b32
Signed-off-by: OpenStack Proposal Bot <openstack-infra@lists.openstack.org>
Generated-By: openstack/project-config:playbooks/proposal/propose_update.sh
@github-actions
github-actions Bot requested a review from a team as a code owner October 12, 2026 06:59
@github-actions github-actions Bot added automated Automated action performed by GitHub Actions synchronisation labels Oct 12, 2026
@priteau
priteau enabled auto-merge October 14, 2026 11:37
@priteau
priteau merged commit c959112 into stackhpc/master Oct 14, 2026
3 checks passed
@priteau
priteau deleted the upstream/master-2026-10-12 branch October 14, 2026 11:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

automated Automated action performed by GitHub Actions synchronisation

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants