Merge branch 'master' of github.com:LeafSoftware/python-lambder

LeafSoftware · Feb 10, 2016 · 0994648 · 0994648
2 parents 17aa204 + 3646667
commit 0994648
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/lambder/lambder.py b/lambder/lambder.py
@@ -288,7 +288,6 @@ def _update_lambda(self, name, bucket, key, timeout, memory, description):
       Description=description
     )
 
-  # TODO: allow user to set timeout and memory
   def _create_lambda(self, name, bucket, key, role_arn, timeout, memory, description):
     awslambda = boto3.client('lambda')
     resp = awslambda.create_function(
@@ -352,11 +351,12 @@ def deploy_function(self, name, bucket, timeout, memory, description):
     self._put_role_policy(role, policy_name, policy_doc)
 
     # create or update the lambda function
+    timeout_i = int(timeout)
     if self._lambda_exists(name):
-      self._update_lambda(name, bucket, s3_key, timeout, memory, description)
+      self._update_lambda(name, bucket, s3_key, timeout_i, memory, description)
     else:
       time.sleep(5) # wait for role to be created
-      self._create_lambda(name, bucket, s3_key, role.arn, timeout, memory, description)
+      self._create_lambda(name, bucket, s3_key, role.arn, timeout_i, memory, description)
 
   # List only the lambder functions, i.e. ones starting with 'Lambder-'
   def list_functions(self):

diff --git a/setup.py b/setup.py
@@ -12,7 +12,7 @@
 
 setup(
     name='lambder',
-    version='1.1.0',
+    version='1.1.1',
     url='https://github.com/LeafSoftware/python-lambder',
     license='MIT',
     author='Chris Chalfant',