From de739a5f65380bb94ab47bcb424cca9e483991cf Mon Sep 17 00:00:00 2001 From: Andrew Hsu Date: Mon, 25 Jul 2022 19:15:49 +0000 Subject: [PATCH] updates for p 3.10 From patch supplied by Michal Maslanka --- ducktape/cluster/cluster.py | 3 +-- requirements-test.txt | 4 ++-- requirements.txt | 6 ++++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/ducktape/cluster/cluster.py b/ducktape/cluster/cluster.py index d869968f3..961808bd0 100644 --- 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 index 3c37e6fbe..0c71f1c5b 100644 --- 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 \ No newline at end of file +pytest-xdist~=2.5 diff --git a/requirements.txt b/requirements.txt index 1d17304d6..0741c2a86 100644 --- 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