From e0f2f0d6bb10f6b86ad7bd59e1b5a86b7e865129 Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Wed, 10 Dec 2025 17:04:43 +0000 Subject: [PATCH 1/2] Don't include type stub packages in upper-constraints We don't need to version these as they don't affect runtime. Heck, in most cases they shouldn't be included in the requirements.txt files, though we still need to denylist them here if we want to include them in e.g. a typing extra. We also remove 'typing' from global-requirements since this is a stdlib package, not a third-party one [1]. typing-extensions is kept since this is third-party as is used at runtime (though we correct the name used in upper-constraints). [1] https://docs.python.org/3/library/typing.html Change-Id: I01dc6aa8e6389fc927d03c4997052d237639b9fe Signed-off-by: Stephen Finucane --- denylist.txt | 12 ++++++++++++ global-requirements.txt | 6 ------ upper-constraints.txt | 8 +------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/denylist.txt b/denylist.txt index e21435a6e..247cb099f 100644 --- a/denylist.txt +++ b/denylist.txt @@ -20,6 +20,18 @@ pycodestyle pylint yamllint +# type stub packages - these do not affect runtime and are effectively only +# for linting +types-Jinja2 +types-jsonschema +types-paramiko +types-python-dateutil +types-PyYAML +types-requests +types-setuptools +types-simplejson +types-urllib3 + # The following Neutron libraries need to be denylisted # as they do not use cycle-with-intermediary. The only time they # would be updated is at release time. diff --git a/global-requirements.txt b/global-requirements.txt index 63f664163..217b6ca0d 100644 --- a/global-requirements.txt +++ b/global-requirements.txt @@ -272,12 +272,6 @@ testrepository # Apache-2.0/BSD testresources # Apache-2.0/BSD testscenarios # Apache-2.0/BSD testtools # MIT -types-paramiko # Apache-2.0 -types-python-dateutil # Apache-2.0 -types-requests # Apache-2.0 -types-setuptools # Apache-2.0 -types-simplejson # Apache-2.0 -typing # PSF typing-extensions # PSF tzdata # MIT valkey # MIT diff --git a/upper-constraints.txt b/upper-constraints.txt index 08744b98c..ab6d0cc68 100644 --- a/upper-constraints.txt +++ b/upper-constraints.txt @@ -91,13 +91,11 @@ psycopg2===2.9.11 networkx===3.4.2 cheroot===11.0.0 XStatic-Angular===1.8.2.2 -types-requests===2.31.0.6 zuul-sphinx===0.7.0 ply===3.11 google-api-core===2.27.0 requests-toolbelt===1.0.0 simplejson===3.20.2 -types-paramiko===4.0.0.20250822 python-swiftclient===4.9.0 pyOpenSSL===24.2.1 typing-inspection===0.4.2 @@ -119,7 +117,6 @@ horizon===25.5.1 octavia-lib===3.10.0 python-watcherclient===4.9.0 MarkupSafe===3.0.3 -types-python-dateutil===2.9.0.20251008 ruamel.yaml.clib===0.2.14 doc8===2.0.0 pymongo===4.15.3 @@ -158,7 +155,7 @@ openstack-doc-tools===4.0.1 oslo.messaging===17.1.0 jira===3.10.5 PyJWT===2.10.1 -typing_extensions===4.15.0 +typing-extensions===4.15.0 XStatic-lodash===4.16.4.2 zVMCloudConnector===1.6.3 paramiko===4.0.0 @@ -305,7 +302,6 @@ oslo.serialization===5.8.0 warlock===2.1.0 exabgp===4.2.25 aiomysql===0.3.2 -types-simplejson===3.20.0.20250822 sphinxcontrib-httpdomain===1.8.1 metalsmith===2.5.0 s3transfer===0.10.0 @@ -318,7 +314,6 @@ gitdb===4.0.12 python-monascaclient===2.8.0 opentelemetry-api===1.38.0 automaton===3.3.0 -types-urllib3===1.26.25.14 os-service-types===1.8.2 keyring===25.6.0 elementpath===4.8.0 @@ -360,7 +355,6 @@ yamlloader===1.5.2 protobuf===6.33.0 sushy===5.9.0 python-neutronclient===11.6.0 -types-setuptools===80.9.0.20250822 pika===1.3.2 oslo.cache===4.0.0 WebTest===3.0.7 From dfcad1d7fe24ad7a6f664eef2fe787a8c990fc83 Mon Sep 17 00:00:00 2001 From: Gregory Thiemonge Date: Tue, 6 Jan 2026 09:41:17 +0100 Subject: [PATCH 2/2] Bump diskimage-builder to latest version diskimage-builder 3.40.1 adds support for centos 10 stream which is required by Octavia Change-Id: I65314bd7747a55c8fffc65b25cf1edf5053f77f5 Signed-off-by: Gregory Thiemonge --- upper-constraints.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/upper-constraints.txt b/upper-constraints.txt index c0d291621..1b4270727 100644 --- a/upper-constraints.txt +++ b/upper-constraints.txt @@ -496,7 +496,7 @@ keystoneauth1===5.12.0 statsd===4.0.1 proto-plus===1.26.1 python-keystoneclient===5.7.0 -diskimage-builder===3.39.0 +diskimage-builder===3.40.1 heat-translator===3.3.0 python-magnumclient===4.9.0 docker===7.1.0