Fix composition.exec timeout

camptocamp · May 29, 2017 · db3be1a · db3be1a
1 parent 486082b
commit db3be1a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/c2cwsgiutils/acceptance/composition.py b/c2cwsgiutils/acceptance/composition.py
@@ -88,7 +88,7 @@ def run(self, container, *command, **kwargs):
                                '--project-name', self.project_name, 'run', '--rm', container] + list(command),
                               env=Composition._get_env(), stderr=subprocess.STDOUT, **kwargs)
 
-    def exec(self, container, timeout=None, *command, **kwargs):
+    def exec(self, container, *command, **kwargs):
         subprocess.check_call(['docker-compose', '--file', self.composition,
                                '--project-name', self.project_name, 'exec', '-T', container] + list(command),
                               env=Composition._get_env(), stderr=subprocess.STDOUT, **kwargs)

diff --git a/setup.py b/setup.py
@@ -2,7 +2,7 @@
 from setuptools import setup, find_packages
 
 
-VERSION = '0.11.3'
+VERSION = '0.11.4'
 HERE = os.path.abspath(os.path.dirname(__file__))
 INSTALL_REQUIRES = open(os.path.join(HERE, 'rel_requirements.txt')).read().splitlines()