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', diff --git a/tox.ini b/tox.ini index 5827260d6..132b804f1 100644 --- a/tox.ini +++ b/tox.ini @@ -19,8 +19,7 @@ filterwarnings = [testenv] usedevelop=True commands = - # These need to be installed in a specific order - pip install urllib3 + 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 = @@ -60,16 +59,14 @@ deps = [testenv:integration] envdir = {toxworkdir}/py3 commands = - # These need to be installed in a specific order - pip install urllib3 + 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 = - # These need to be installed in a specific order - pip install urllib3 + pip install urllib3<2 pip install pylxd python -m pytest --tb native -ra -v -n auto {toxinidir}/tests/unit {posargs} @@ -77,8 +74,7 @@ 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 urllib3<2 pip install pylxd python -m pytest --tb native -ra -v -s {posargs:-m 'serial'}