Synchronise master with upstream #136
Merged
Conversation
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
We stopped doing this nearly 3½ years ago [1]. We no longer use this tooling in any of our jobs either. It is therefore time to delete all this code. [1] https://governance.openstack.org/tc/resolutions/20220414-drop-lower-constraints Change-Id: I64ba0cec3eeac3f7ded1354bd768f7022d863dc4 Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
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 <stephenfin@redhat.com>
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 <stephenfin@redhat.com>
...by skipping actual installation. We only need to check if they are co-installable via metadata. We don't need to actually install them. This will make the job much easier to run in environments where bindep hasn't been run. Change-Id: Iaa7f02ec9d1e734884b1329e2b177964f54d64df Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
The writelines method doesn't include newline characters automatically, so add them to the literal strings. Change-Id: I6677b19594d101f239542e24a70935639f2d04e7 Signed-off-by: Jeremy Stanley <fungi@yuggoth.org>
Change-Id: I065ad829ef8aa05d74045a985526256f8056bb20 Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
This works around an unknown aspect of tox in that until you do
something (install packages, or run commands) tox doesn't create
.tox/{envdir}/log. This isn't a big deal except
tox_install_sibling_packages[1] relies on that existing.
If it doesn't we end up with a module failure:
Change-Id: I3824235b49b77e84e693a8a37c9ff3a1027a3acd
---
2025-10-23 21:38:45.404140 | TASK [tox : Install any sibling python packages]
2025-10-23 21:38:46.846253 | ubuntu-jammy | MODULE FAILURE:
<snip>
2025-10-23 21:38:46.847689 | ubuntu-jammy | FileNotFoundError: [Errno 2] No such file or directory: '/home/zuul/src/opendev.org/openstack/requirements/.tox/py310-check-uc/log/py310-check-uc-siblings.txt'
---
Until that module is fixed add 'setuptools' as a dependency. It will be
installed already as part of the virtualenv so is funtionally equivilent
to an empty set of deps.
This is a enhancement? to Iaa7f02ec9d1e734884b1329e2b177964f54d64df
Also updated upper-constraints.txt to ensure the check-uc* jobs run
[1] https://opendev.org/zuul/zuul-jobs/src/branch/master/roles/tox/library/tox_install_sibling_packages.py#L387
Change-Id: I7fd709d0cf0468c90593b5f63bb34d58e9c1e774
Signed-off-by: Tony Breeds <tony@bakeyournoodle.com>
meta: version: 3.2.0 meta: team: heat meta: diff-start: - meta: series: independent meta: branch: master meta: release-type: release meta: pypi: yes 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: Ia38dd74d7e5725a387e9fdcf08cd66fa7fec19f3 meta: release:Code-Review+2: Elod Illes <elod.illes@est.tech> meta: release:Workflow+1: Thierry Carrez <thierry@openstack.org> meta: release:Code-Review+2: Thierry Carrez <thierry@openstack.org> Change-Id: I86b65de76fb46f40d2b91437e866773357b1d96c 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
Starting with 1.36.0[1], boto3 implements a new security feature that may not be implemented by some S3-compatible storage backends, such as Ceph RGW. This causes glance_store users to notice failures when uploading images to such backends[2]. This might also impact other projects such as Cinder. Pinning boto3 to 1.35.99 until we come up with a proper workaround for this. Also pinning botocore to 1.35.99 as this is the only version that is compatible with boto3 1.35.99, and pinning s3transfer to 0.10.0 as this is the only version that is compatible with botocore 1.35.99. (tonyb) As this is potentially a longer term issue, include the caps in global-requirements.txt to ease constraints updates. [1] https: //github.com/boto/boto3/blob/dd74a1e97c450cf7670cabf3a9516b5127bcffb5/CHANGELOG.rst#L1882 [2] https://bugs.launchpad.net/glance/+bug/2121144 Change-Id: I311a74d6839410779f89f3bde817c221d9d8344e Signed-off-by: Cyril Roelandt <cyril@redhat.com> Signed-off-by: Tony Breeds <tony@bakeyournoodle.com>
github-actions
bot
added
automated
priteau
approved these changes
Oct 27, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.