From b394102886eefe02eb40b09c4fbd01877a1eafbc Mon Sep 17 00:00:00 2001
From: Guillaume Boutry <guillaume.boutry@canonical.com>
Date: Tue, 9 Jan 2024 10:54:10 +0100
Subject: [PATCH 1/3] Remove paramiko upper-bound

Remove paramiko upper-bound to allow using paramiko version >3.0.
---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index afe2513b2..4813d2f48 100644
--- a/setup.py
+++ b/setup.py
@@ -28,7 +28,7 @@
         'websockets>=8.1,<9.0 ; python_version=="3.8"',
         'websockets>=9.0,<10.0 ; python_version=="3.9"',
         'websockets>=10.0; python_version>"3.9"',
-        'paramiko>=2.4.0,<3.0.0',
+        'paramiko>=2.4.0',
         'pyasn1>=0.4.4',
         'toposort>=1.5,<2',
         'typing_inspect>=0.6.0',

From aea5b58bd7cbe5e54217ef2e502e298a41278fa8 Mon Sep 17 00:00:00 2001
From: Guillaume Boutry <guillaume.boutry@canonical.com>
Date: Wed, 10 Jan 2024 00:12:15 +0100
Subject: [PATCH 2/3] Remove urllib3 from tox envs

PyLXD needs a specific urllib3 version range, remove urllib3
installation and let pick choose a version compatible with PyLXD.
---
 tox.ini | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/tox.ini b/tox.ini
index 5827260d6..b559f2a0d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -19,8 +19,6 @@ filterwarnings =
 [testenv]
 usedevelop=True
 commands =
-    # These need to be installed in a specific order
-    pip install urllib3
     pip install pylxd
     python -m pytest --tb native -ra -v -s -n auto -k 'not integration' -m 'not serial' {posargs}
 passenv =
@@ -60,16 +58,12 @@ deps =
 [testenv:integration]
 envdir = {toxworkdir}/py3
 commands =
-    # These need to be installed in a specific order
-    pip install urllib3
     pip install pylxd
     python -m pytest --tb native -ra -v -n auto -k 'integration' -m 'not serial' {posargs}
 
 [testenv:unit]
 envdir = {toxworkdir}/py3
 commands =
-    # These need to be installed in a specific order
-    pip install urllib3
     pip install pylxd
     python -m pytest --tb native -ra -v -n auto {toxinidir}/tests/unit {posargs}
 
@@ -77,8 +71,6 @@ commands =
 # tests that can't be run in parallel
 envdir = {toxworkdir}/py3
 commands =
-    # These need to be installed in a specific order
-    pip install urllib3
     pip install pylxd
     python -m pytest --tb native -ra -v -s {posargs:-m 'serial'}
 

From e61bb7ad3e26cf0073d3d3a3f1d4ed0951864f57 Mon Sep 17 00:00:00 2001
From: Caner Derici <caner.derici@canonical.com>
Date: Wed, 10 Jan 2024 10:36:09 -0700
Subject: [PATCH 3/3] Put a ceiling for urllib3 in tests (<2)

---
 tox.ini | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tox.ini b/tox.ini
index b559f2a0d..132b804f1 100644
--- a/tox.ini
+++ b/tox.ini
@@ -19,6 +19,7 @@ filterwarnings =
 [testenv]
 usedevelop=True
 commands =
+    pip install urllib3<2
     pip install pylxd
     python -m pytest --tb native -ra -v -s -n auto -k 'not integration' -m 'not serial' {posargs}
 passenv =
@@ -58,12 +59,14 @@ deps =
 [testenv:integration]
 envdir = {toxworkdir}/py3
 commands =
+    pip install urllib3<2
     pip install pylxd
     python -m pytest --tb native -ra -v -n auto -k 'integration' -m 'not serial' {posargs}
 
 [testenv:unit]
 envdir = {toxworkdir}/py3
 commands =
+    pip install urllib3<2
     pip install pylxd
     python -m pytest --tb native -ra -v -n auto {toxinidir}/tests/unit {posargs}
 
@@ -71,6 +74,7 @@ commands =
 # tests that can't be run in parallel
 envdir = {toxworkdir}/py3
 commands =
+    pip install urllib3<2
     pip install pylxd
     python -m pytest --tb native -ra -v -s {posargs:-m 'serial'}