Merge pull request #336 from backtick-se/v0430

Version 0.4.30

cowait/cli/app/task.py

@@ -163,7 +163,7 @@ def run(
               default=False)
 @click.option('--capture',
               help='toggle pytest output capture',
-              type=bool,
+              type=bool, is_flag=True,
               default=True)
 @click.pass_context
 def test(
@@ -207,6 +207,7 @@ def ps(ctx, cluster: str):
 def kill(ctx, cluster: str, task: str):
     cowait.cli.kill(ctx.obj, task, cluster_name=cluster)
 
+
 @click.command(help='deploy cowait agent')
 @click.option('-c', '--cluster',
               default=None,

cowait/engine/docker/utils.py

@@ -11,7 +11,7 @@ def create_ports(taskdef):
 
 def create_env(cluster, taskdef):
     env = base_environment(cluster, taskdef)
-    
+
     # check total length of environment data
     length = 0
     for key, value in env.items():
@@ -20,6 +20,8 @@ def create_env(cluster, taskdef):
             # try to inherit the setting from the host
             if key in os.environ:
                 value = os.environ[key]
+            elif 'fallback' in value:
+                value = value['fallback']
             else:
                 source = value.get('source', '<unset>')
                 print(f'Warning: unset environment variable {key} with source "{source}"')

cowait/types/utils.py

@@ -86,9 +86,14 @@ def typed_return(func: callable, result: object) -> object:
         result_type = guess_type(result)
 
     # serialize & validate
-    data = result_type.serialize(result)
-    result_type.validate(data, 'Return')
-    return data, result_type
+    try:
+        data = result_type.serialize(result)
+        result_type.validate(data, 'Return')
+        return data, result_type
+    except TypeError:
+        expect = type(result_type)
+        got = type(result)
+        raise TypeError(f'Expected task to return value of type {expect}, got {got}')
 
 
 async def typed_call(func: callable, args: dict) -> object:

cowait/version.py

@@ -1 +1 @@
-version = "0.4.29"
+version = "0.4.30"