From 679f7249162535c872de1ef56182bbcca73ecc27 Mon Sep 17 00:00:00 2001 From: Fredrik Hindersson Date: Mon, 4 May 2026 12:03:19 +0200 Subject: [PATCH 01/10] Update lxml version for python 3.12 --- upper-constraints.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/upper-constraints.txt b/upper-constraints.txt index d506ed202..70ef78b20 100644 --- a/upper-constraints.txt +++ b/upper-constraints.txt @@ -29,7 +29,8 @@ osprofiler===3.4.2 os-resource-classes===1.1.0 tabulate===0.8.9 python-ironic-inspector-client===4.7.1 -lxml===4.8.0 +lxml===4.8.0;python_version<'3.12' +lxml===4.9.3;python_version>='3.12' vintage===0.4.1 ntc-templates===3.0.0 rst2txt===1.1.0 From 52ef15ef1e77ffbd7fb93e1d1765355342c15f3b Mon Sep 17 00:00:00 2001 From: Fredrik Hindersson Date: Mon, 4 May 2026 12:26:10 +0200 Subject: [PATCH 02/10] More updates for py3.12 --- upper-constraints.txt | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/upper-constraints.txt b/upper-constraints.txt index 70ef78b20..74b3ee80d 100644 --- a/upper-constraints.txt +++ b/upper-constraints.txt @@ -162,7 +162,8 @@ arrow===1.2.2 semantic-version===2.9.0 virtualbmc===2.2.1 deprecation===2.1.0 -SQLAlchemy===1.4.31 +SQLAlchemy===1.4.31;python_version<'3.12' +SQLAlchemy===1.4.44;python_version>='3.12' pyroute2===0.6.6 google-auth===2.6.0 kazoo===2.8.0 @@ -193,7 +194,8 @@ python-subunit===1.4.0 tornado===6.1 pycparser===2.21 mock===4.0.3 -PyYAML===6.0 +PyYAML===6.0;python_version<'3.12' +PyYAML===6.0.1;python_version>='3.12' beautifulsoup4===4.10.0 cached-property===1.5.2;python_version=='3.6' os-net-config===15.1.0 @@ -365,7 +367,8 @@ infinisdk===185.1.1 packaging===21.3 XStatic-Dagre-D3===0.4.17.0 nose-exclude===0.5.0 -psutil===5.9.0 +psutil===5.9.0;python_version<'3.12' +psutil===5.9.4;python_version>='3.12' py===1.11.0 txaio===22.2.1 elasticsearch===2.4.1 @@ -599,7 +602,8 @@ Babel===2.9.1 logutils===0.3.5 zipp===3.6.0;python_version=='3.6' zipp===3.7.0;python_version=='3.8' -greenlet===1.1.2 +greenlet===1.1.2;python_version<'3.12' +greenlet===2.0.0;python_version>='3.12' XStatic-Angular-Vis===4.16.0.0 iniconfig===1.1.1 confluent-kafka===1.8.2 From d3234f14cd936f3372c0b7ba56844f484800b0c1 Mon Sep 17 00:00:00 2001 From: Fredrik Hindersson Date: Mon, 4 May 2026 12:48:19 +0200 Subject: [PATCH 03/10] More py3.12 pins based on the 2024.2 branch --- upper-constraints.txt | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/upper-constraints.txt b/upper-constraints.txt index 74b3ee80d..0add257d0 100644 --- a/upper-constraints.txt +++ b/upper-constraints.txt @@ -30,7 +30,7 @@ os-resource-classes===1.1.0 tabulate===0.8.9 python-ironic-inspector-client===4.7.1 lxml===4.8.0;python_version<'3.12' -lxml===4.9.3;python_version>='3.12' +lxml===5.3.0;python_version>='3.12' vintage===0.4.1 ntc-templates===3.0.0 rst2txt===1.1.0 @@ -171,7 +171,8 @@ pyspnego===0.5.0 pyroute2.ethtool===0.6.6 XStatic-roboto-fontface===0.5.0.0 pyudev===0.23.2 -eventlet===0.33.0 +eventlet===0.33.0;python_version<'3.12' +eventlet===0.36.1;python_version>='3.12' openstack-doc-tools===3.3.0 oslo.messaging===12.13.3 jira===3.1.1 @@ -195,7 +196,7 @@ tornado===6.1 pycparser===2.21 mock===4.0.3 PyYAML===6.0;python_version<'3.12' -PyYAML===6.0.1;python_version>='3.12' +PyYAML===6.0.2;python_version>='3.12' beautifulsoup4===4.10.0 cached-property===1.5.2;python_version=='3.6' os-net-config===15.1.0 @@ -368,7 +369,7 @@ packaging===21.3 XStatic-Dagre-D3===0.4.17.0 nose-exclude===0.5.0 psutil===5.9.0;python_version<'3.12' -psutil===5.9.4;python_version>='3.12' +psutil===6.0.0;python_version>='3.12' py===1.11.0 txaio===22.2.1 elasticsearch===2.4.1 @@ -584,7 +585,8 @@ icalendar===4.0.9 decorator===4.4.2;python_version=='3.6' decorator===5.1.1;python_version=='3.8' DateTimeRange===1.2.0 -cffi===1.15.0 +cffi===1.15.0;python_version<'3.12' +cffi===1.17.0;python_version>='3.12' python-cyborgclient===1.7.0 futurist===2.4.0 jsonschema===3.2.0 @@ -603,7 +605,7 @@ logutils===0.3.5 zipp===3.6.0;python_version=='3.6' zipp===3.7.0;python_version=='3.8' greenlet===1.1.2;python_version<'3.12' -greenlet===2.0.0;python_version>='3.12' +greenlet===3.0.3;python_version>='3.12' XStatic-Angular-Vis===4.16.0.0 iniconfig===1.1.1 confluent-kafka===1.8.2 @@ -648,3 +650,4 @@ scikit-learn===0.24.2;python_version=='3.6' scikit-learn===1.0.2;python_version=='3.8' setuptools===59.6.0;python_version=='3.6' setuptools===60.9.3;python_version=='3.8' +Yappi===1.6.0;python_version>='3.12' From 228eca73c64a21e8e5b67464bb588e42d827f589 Mon Sep 17 00:00:00 2001 From: Fredrik Hindersson Date: Mon, 4 May 2026 12:59:02 +0200 Subject: [PATCH 04/10] Fix yappi deps --- upper-constraints.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/upper-constraints.txt b/upper-constraints.txt index 0add257d0..6c092bd05 100644 --- a/upper-constraints.txt +++ b/upper-constraints.txt @@ -516,7 +516,8 @@ nocaselist===1.0.4 oslo.db===11.2.0 simplegeneric===0.8.1 python-pcre===0.7 -yappi===1.3.3 +yappi===1.3.3;python_version<'3.12' +Yappi===1.6.0;python_version>='3.12' mbstrdecoder===1.1.0 dataclasses===0.8;python_version=='3.6' abclient===0.2.3 @@ -650,4 +651,3 @@ scikit-learn===0.24.2;python_version=='3.6' scikit-learn===1.0.2;python_version=='3.8' setuptools===59.6.0;python_version=='3.6' setuptools===60.9.3;python_version=='3.8' -Yappi===1.6.0;python_version>='3.12' From 6f6ff09101d84b04f208436fc794547e10653e4a Mon Sep 17 00:00:00 2001 From: Fredrik Hindersson Date: Mon, 4 May 2026 13:19:12 +0200 Subject: [PATCH 05/10] More 3.12 overrides --- upper-constraints.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/upper-constraints.txt b/upper-constraints.txt index 6c092bd05..f0e484aed 100644 --- a/upper-constraints.txt +++ b/upper-constraints.txt @@ -522,7 +522,8 @@ mbstrdecoder===1.1.0 dataclasses===0.8;python_version=='3.6' abclient===0.2.3 pymemcache===3.5.1 -wrapt===1.13.3 +wrapt===1.13.3;python_version<'3.12' +wrapt===1.16.0;python_version>='3.12' oslo.privsep===2.7.0 sphinxcontrib-apidoc===0.3.0 oslo.policy===3.11.0 From b27313e0eab9968bb57d1191ac4971a5ae8aacd4 Mon Sep 17 00:00:00 2001 From: Fredrik Hindersson Date: Mon, 4 May 2026 13:41:54 +0200 Subject: [PATCH 06/10] More overrides --- upper-constraints.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/upper-constraints.txt b/upper-constraints.txt index f0e484aed..9e5a45af4 100644 --- a/upper-constraints.txt +++ b/upper-constraints.txt @@ -6,7 +6,8 @@ rsa===4.8 restructuredtext-lint===1.4.0 netmiko===3.4.0 sshtunnel===0.4.0 -PasteDeploy===2.1.1 +PasteDeploy===2.1.1;python_version<'3.12' +PasteDeploy===3.1.0;python_version>='3.12' typing===3.7.4.3 python-saharaclient===3.5.0 Routes===2.5.1 @@ -541,7 +542,8 @@ pyroute2.core===0.6.6 python-designateclient===4.5.1 pyroute2.ipdb===0.6.6 future===0.18.2 -Paste===3.5.0 +Paste===3.5.0;python_version<'3.12' +Paste===3.10.1;python_version>='3.12' pytest-django===4.5.2 jaeger-client===4.6.1;python_version=='3.6' jaeger-client===4.8.0;python_version=='3.8' From f96ac792d9fae4d156cd6edc1d6a61772f46210b Mon Sep 17 00:00:00 2001 From: Fredrik Hindersson Date: Mon, 4 May 2026 13:53:27 +0200 Subject: [PATCH 07/10] Even more! --- upper-constraints.txt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/upper-constraints.txt b/upper-constraints.txt index 9e5a45af4..1254bebf9 100644 --- a/upper-constraints.txt +++ b/upper-constraints.txt @@ -155,7 +155,8 @@ jsonpath-rw===1.4.0 prettytable===2.5.0;python_version=='3.6' prettytable===3.1.1;python_version=='3.8' prettytable===3.3.0;python_version=='3.9' -vine===5.0.0 +vine===5.0.0;python_version<'3.12' +vine===5.1.0;python_version>='3.12' pyroute2.nftables===0.6.6 taskflow===4.6.4 traceback2===1.4.0 @@ -246,7 +247,8 @@ XStatic-Bootstrap-SCSS===3.4.1.0 pyzabbix===1.0.0 ptyprocess===0.7.0 threadloop===1.0.2 -amqp===5.0.9 +amqp===5.0.9;python_version<'3.12' +amqp===5.2.0;python_version>='3.12' ruamel.yaml===0.17.21 websockify===0.10.0 gssapi===1.7.3 @@ -497,6 +499,7 @@ dfs-sdk===1.2.27 sentinels===1.0.0 kombu===5.1.0;python_version=='3.6' kombu===5.2.3;python_version=='3.8' +kombu===5.4.0;python_version>='3.12' pyroute2.ndb===0.6.6 distro===1.7.0 zstd===1.5.1.0 From 999adc325e82ae509efab565636ad9eab7624553 Mon Sep 17 00:00:00 2001 From: Fredrik Hindersson Date: Mon, 4 May 2026 14:03:39 +0200 Subject: [PATCH 08/10] override pyroute2 --- upper-constraints.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/upper-constraints.txt b/upper-constraints.txt index 1254bebf9..f811ad0b6 100644 --- a/upper-constraints.txt +++ b/upper-constraints.txt @@ -500,7 +500,8 @@ sentinels===1.0.0 kombu===5.1.0;python_version=='3.6' kombu===5.2.3;python_version=='3.8' kombu===5.4.0;python_version>='3.12' -pyroute2.ndb===0.6.6 +pyroute2===0.6.6;python_version<'3.12' +pyroute2===0.7.12;python_version>='3.12' distro===1.7.0 zstd===1.5.1.0 yaql===2.0.0 From 95986693c190447495e99d398af13e2e70b373ab Mon Sep 17 00:00:00 2001 From: Fredrik Hindersson Date: Mon, 4 May 2026 15:06:46 +0200 Subject: [PATCH 09/10] Maybe change the correct value --- upper-constraints.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/upper-constraints.txt b/upper-constraints.txt index f811ad0b6..5d8eac36f 100644 --- a/upper-constraints.txt +++ b/upper-constraints.txt @@ -166,7 +166,8 @@ virtualbmc===2.2.1 deprecation===2.1.0 SQLAlchemy===1.4.31;python_version<'3.12' SQLAlchemy===1.4.44;python_version>='3.12' -pyroute2===0.6.6 +pyroute2===0.6.6;python_version<'3.12' +pyroute2===0.7.12;python_version>='3.12' google-auth===2.6.0 kazoo===2.8.0 pyspnego===0.5.0 @@ -500,8 +501,7 @@ sentinels===1.0.0 kombu===5.1.0;python_version=='3.6' kombu===5.2.3;python_version=='3.8' kombu===5.4.0;python_version>='3.12' -pyroute2===0.6.6;python_version<'3.12' -pyroute2===0.7.12;python_version>='3.12' +pyroute2.ndb===0.6.6 distro===1.7.0 zstd===1.5.1.0 yaql===2.0.0 From 73089bf9e466af86cea4c1d764e29695a6a494ce Mon Sep 17 00:00:00 2001 From: Fredrik Hindersson Date: Tue, 5 May 2026 10:36:48 +0200 Subject: [PATCH 10/10] More pyroute2 overrides --- upper-constraints.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/upper-constraints.txt b/upper-constraints.txt index 5d8eac36f..6b163558e 100644 --- a/upper-constraints.txt +++ b/upper-constraints.txt @@ -157,7 +157,7 @@ prettytable===3.1.1;python_version=='3.8' prettytable===3.3.0;python_version=='3.9' vine===5.0.0;python_version<'3.12' vine===5.1.0;python_version>='3.12' -pyroute2.nftables===0.6.6 +pyroute2.nftables===0.6.6;python_version<'3.12' taskflow===4.6.4 traceback2===1.4.0 arrow===1.2.2 @@ -171,7 +171,7 @@ pyroute2===0.7.12;python_version>='3.12' google-auth===2.6.0 kazoo===2.8.0 pyspnego===0.5.0 -pyroute2.ethtool===0.6.6 +pyroute2.ethtool===0.6.6;python_version<'3.12' XStatic-roboto-fontface===0.5.0.0 pyudev===0.23.2 eventlet===0.33.0;python_version<'3.12' @@ -472,7 +472,7 @@ xmltodict===0.12.0 pyasn1===0.4.8 directord===0.12.0 oslo.rootwrap===6.3.1 -pyroute2.nslink===0.6.6 +pyroute2.nslink===0.6.6;python_version<'3.12' Django===3.2.12 pexpect===4.8.0 contextvars===2.4 @@ -501,7 +501,7 @@ sentinels===1.0.0 kombu===5.1.0;python_version=='3.6' kombu===5.2.3;python_version=='3.8' kombu===5.4.0;python_version>='3.12' -pyroute2.ndb===0.6.6 +pyroute2.ndb===0.6.6;python_version<'3.12' distro===1.7.0 zstd===1.5.1.0 yaql===2.0.0 @@ -542,9 +542,9 @@ pyrsistent===0.18.1;python_version=='3.8' repoze.lru===0.7 rfc3986===1.5.0 tenacity===6.3.1 -pyroute2.core===0.6.6 +pyroute2.core===0.6.6;python_version<'3.12' python-designateclient===4.5.1 -pyroute2.ipdb===0.6.6 +pyroute2.ipdb===0.6.6;python_version<'3.12' future===0.18.2 Paste===3.5.0;python_version<'3.12' Paste===3.10.1;python_version>='3.12' @@ -552,7 +552,7 @@ pytest-django===4.5.2 jaeger-client===4.6.1;python_version=='3.6' jaeger-client===4.8.0;python_version=='3.8' XStatic-Json2yaml===0.1.1.0 -pyroute2.ipset===0.6.6 +pyroute2.ipset===0.6.6;python_version<'3.12' boto===2.49.0 os-vif===2.7.2 hyperlink===21.0.0