From 382beea8fbc908bf8eb7da4d4de0b89fbef7019b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 4 Jun 2026 00:21:10 +0000
Subject: [PATCH] Bump aiohttp from 3.13.5 to 3.14.0

---
updated-dependencies:
- dependency-name: aiohttp
  dependency-version: 3.14.0
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 merged-requirements-py312.txt | 28 +++++++++++++---------------
 test-requirements-py312.txt   | 20 ++++++++++++++------
 2 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/merged-requirements-py312.txt b/merged-requirements-py312.txt
index 24cdef5..a29d4b8 100644
--- a/merged-requirements-py312.txt
+++ b/merged-requirements-py312.txt
@@ -6,7 +6,7 @@
 #
 aiohappyeyeballs==2.6.2
     # via aiohttp
-aiohttp==3.13.5
+aiohttp==3.14.0
     # via
     #   python-libmaas
     #   zaza
@@ -87,7 +87,6 @@ croniter==6.2.2
     # via -r test-requirements.in
 cryptography==3.3.2
     # via
-    #   -r requirements.in
     #   openstacksdk
     #   paramiko
     #   pyopenssl
@@ -123,7 +122,6 @@ distlib==0.4.0
     # via virtualenv
 dnspython==2.8.0
     # via
-    #   -r requirements.in
     #   pymongo
     #   zaza-openstack
 dogpile-cache==1.5.0
@@ -186,7 +184,6 @@ jeepney==0.9.0
     #   secretstorage
 jinja2==3.1.6
     # via
-    #   -r requirements.in
     #   zaza
     #   zaza-openstack
 jmespath==1.1.0
@@ -211,6 +208,8 @@ jsonschema==4.17.3
     #   python-ironicclient
     #   tempest
     #   warlock
+juju==3.6.1.3
+    # via zaza
 juju-wait==2.8.4
     # via zaza
 jujubundlelib==0.5.7
@@ -238,6 +237,8 @@ keystoneauth1==5.14.0
     #   python-octaviaclient
     #   python-openstackclient
     #   python-watcherclient
+kubernetes==30.1.0
+    # via juju
 lxml==6.1.1
     # via zaza-openstack
 macaroonbakery==1.3.4
@@ -261,7 +262,6 @@ mypy-extensions==1.1.0
     # via typing-inspect
 netaddr==0.7.20
     # via
-    #   -r requirements.in
     #   oslo-config
     #   oslo-utils
     #   osprofiler
@@ -269,7 +269,6 @@ netaddr==0.7.20
     #   tempest
 netifaces==0.11.0
     # via
-    #   -r requirements.in
     #   oslo-utils
     #   python-octaviaclient
 oauthlib==3.3.1
@@ -409,7 +408,6 @@ pathspec==0.10.3
     # via charm-tools
 pbr==5.6.0
     # via
-    #   -r requirements.in
     #   aodhclient
     #   cliff
     #   futurist
@@ -442,8 +440,6 @@ pbr==5.6.0
     #   tempest
 pika==1.4.0
     # via zaza-openstack
-pip==26.1.1
-    # via charm-tools
 platformdirs==4.9.6
     # via
     #   openstacksdk
@@ -472,7 +468,6 @@ protobuf==7.35.0
     # via macaroonbakery
 psutil==5.9.8
     # via
-    #   -r requirements.in
     #   -r test-requirements.in
     #   openstacksdk
 pyasn1==0.6.3
@@ -646,14 +641,12 @@ secretstorage==3.3.3
     #   keyring
 simplejson==4.1.1
     # via
-    #   -r requirements.in
     #   osc-lib
     #   python-manilaclient
     #   python-neutronclient
     #   python-novaclient
 six==1.17.0
     # via
-    #   -r requirements.in
     #   blessings
     #   cliff
     #   cmd2
@@ -724,6 +717,7 @@ types-setuptools==82.0.0.20260518
     # via requirements-parser
 typing-extensions==4.15.0
     # via
+    #   aiohttp
     #   aiosignal
     #   juju
     #   keystoneauth1
@@ -771,6 +765,10 @@ zaza-openstack @ git+https://github.com/openstack-charmers/zaza-openstack-tests.
     # via -r test-requirements.in
 
 # The following packages are considered to be unsafe in a requirements file:
-# juju
-# kubernetes
-# setuptools
+pip==26.1.1
+    # via charm-tools
+setuptools==81.0.0
+    # via
+    #   -r test-requirements.in
+    #   charm-tools
+    #   colander
diff --git a/test-requirements-py312.txt b/test-requirements-py312.txt
index e5ebf79..5a2bd39 100644
--- a/test-requirements-py312.txt
+++ b/test-requirements-py312.txt
@@ -6,7 +6,7 @@
 #
 aiohappyeyeballs==2.6.2
     # via aiohttp
-aiohttp==3.13.5
+aiohttp==3.14.0
     # via
     #   python-libmaas
     #   zaza
@@ -208,6 +208,8 @@ jsonschema==4.17.3
     #   python-ironicclient
     #   tempest
     #   warlock
+juju==3.6.1.3
+    # via zaza
 juju-wait==2.8.4
     # via zaza
 jujubundlelib==0.5.7
@@ -235,6 +237,8 @@ keystoneauth1==5.14.0
     #   python-octaviaclient
     #   python-openstackclient
     #   python-watcherclient
+kubernetes==30.1.0
+    # via juju
 lxml==6.1.1
     # via zaza-openstack
 macaroonbakery==1.3.4
@@ -435,8 +439,6 @@ pbr==7.0.3
     #   tempest
 pika==1.4.0
     # via zaza-openstack
-pip==26.1.1
-    # via charm-tools
 platformdirs==4.9.6
     # via
     #   openstacksdk
@@ -715,6 +717,7 @@ types-setuptools==82.0.0.20260518
     # via requirements-parser
 typing-extensions==4.15.0
     # via
+    #   aiohttp
     #   aiosignal
     #   juju
     #   keystoneauth1
@@ -760,6 +763,11 @@ zaza-openstack @ git+https://github.com/openstack-charmers/zaza-openstack-tests.
     # via -r test-requirements.in
 
 # The following packages are considered to be unsafe in a requirements file:
-# juju
-# kubernetes
-# setuptools
+pip==26.1.1
+    # via charm-tools
+setuptools==81.0.0
+    # via
+    #   -r test-requirements.in
+    #   charm-tools
+    #   colander
+    #   pbr