Switch back to formal version of invoke and fabric

since those two PR were merged by Jeff: * pyinvoke/invoke#645 * fabric/fabric#1989
fruch · Aug 7, 2019 · a09eb74 · a09eb74
1 parent 229f59e
commit a09eb74
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 10 deletions.
diff --git a/docker/env/version b/docker/env/version
@@ -1 +1 @@
-0.40
+0.41
diff --git a/requirements-python.txt b/requirements-python.txt
@@ -1,12 +1,7 @@
 PyYAML==5.1
 libvirt-python==4.9.0
-# fabric==2.4.0
-# temporary install fabric from fruch private branch
-# at least until those get merged:
-# - https://github.com/pyinvoke/invoke/pull/645
-# - https://github.com/fabric/fabric/pull/1989
-https://github.com/fruch/invoke/tarball/scylla_timeout_v1
-https://github.com/fruch/fabric/tarball/scylla_timeout_v1
+fabric==2.5.0
+invoke==1.3.0
 unittest-xml-reporting==2.5.1
 boto3==1.6.5
 botocore==1.9.5

diff --git a/sdcm/remote.py b/sdcm/remote.py
@@ -148,7 +148,7 @@ def run(self, cmd, ignore_status=False, sudo=False, verbose=True, timeout=300):
                                            encoding='utf-8',
                                            hide=True,
                                            watchers=watchers,
-                                           command_timeout=timeout,
+                                           timeout=timeout,
                                            env=os.environ, replace_env=True)
 
         except (Failure, UnexpectedExit) as details:
@@ -224,7 +224,7 @@ def run(self, cmd, timeout=None, ignore_status=False,
 
                 result = self.connection.run(cmd, warn=ignore_status,
                                              encoding='utf-8', hide=True,
-                                             watchers=watchers, command_timeout=timeout)
+                                             watchers=watchers, timeout=timeout)
 
                 setattr(result, 'duration', time.time() - start_time)
                 setattr(result, 'exit_status', result.exited)