updates for p 3.10

From patch supplied by Michal Maslanka <[email protected]>
redpanda-data · Sep 13, 2023 · de739a5 · de739a5
1 parent 3ea364b
commit de739a5
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/ducktape/cluster/cluster.py b/ducktape/cluster/cluster.py
@@ -35,7 +35,6 @@ class Cluster(object):
     This interface doesn't define any mapping of roles/services to nodes. It only interacts with some underlying
     system that can describe available resources and mediates reservations of those resources.
     """
-
     def __init__(self):
         self.max_used_nodes = 0
 
@@ -67,7 +66,7 @@ def do_alloc(self, cluster_spec):
 
     def free(self, nodes):
         """Free the given node or list of nodes"""
-        if isinstance(nodes, collections.Iterable):
+        if isinstance(nodes, collections.abc.Iterable):
             for s in nodes:
                 self.free_single(s)
         else:

diff --git a/requirements-test.txt b/requirements-test.txt
@@ -1,4 +1,4 @@
-pytest~=6.2.0
+pytest==6.1.0
 # 4.0 drops py27 support
 mock==4.0.2
 psutil==5.7.2
@@ -7,4 +7,4 @@ statistics==1.0.3.5
 requests-testadapter==0.3.0
 flake8~=4.0.0
 pytest-cov~=3.0
-pytest-xdist~=2.5
+pytest-xdist~=2.5
diff --git a/requirements.txt b/requirements.txt
@@ -5,10 +5,12 @@ MarkupSafe<2.0.0
 pyparsing<3.0.0
 zipp<2.0.0
 pywinrm==0.2.2
-requests==2.24.0
-paramiko~=2.7.2
+requests==2.31.0
+paramiko~=2.11.2
 pyzmq==19.0.2
 pycryptodome==3.9.8
+# > 5.0 drops py27 support
 more-itertools==5.0.0
+tox==3.20.0
 six==1.15.0
 PyYAML==5.3.1