Skip to content

Commit 75f333b

Browse files
nficanonficano
committed
cleanup
1 parent a74a1ed commit 75f333b

File tree

4 files changed

+83
-33
lines changed

4 files changed

+83
-33
lines changed

‎aws_lambda/aws_lambda.py‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ def invoke(
205205
# Tweak to allow module to import local modules
206206
try:
207207
sys.path.index(src)
208-
except:
208+
except ValueError:
209209
sys.path.append(src)
210210

211211
handler = cfg.get('handler')
@@ -439,11 +439,11 @@ def get_role_name(region, account_id, role):
439439
return 'arn:{0}:iam::{1}:role/{2}'.format(prefix, account_id, role)
440440

441441

442-
def get_account_id(aws_access_key_id, aws_secret_access_key,region=None):
442+
def get_account_id(aws_access_key_id, aws_secret_access_key, region=None):
443443
"""Query STS for a users' account_id"""
444444
client = get_client(
445445
'sts', aws_access_key_id, aws_secret_access_key,
446-
region
446+
region,
447447
)
448448
return client.get_caller_identity().get('Account')
449449

@@ -467,7 +467,9 @@ def create_function(cfg, path_to_zip_file, *use_s3, **s3_file):
467467
aws_access_key_id = cfg.get('aws_access_key_id')
468468
aws_secret_access_key = cfg.get('aws_secret_access_key')
469469

470-
account_id = get_account_id(aws_access_key_id, aws_secret_access_key,cfg.get('region'))
470+
account_id = get_account_id(
471+
aws_access_key_id, aws_secret_access_key, cfg.get('region'),
472+
)
471473
role = get_role_name(
472474
cfg.get('region'), account_id,
473475
cfg.get('role', 'lambda_basic_execution'),
@@ -537,7 +539,9 @@ def update_function(cfg, path_to_zip_file, *use_s3, **s3_file):
537539
aws_access_key_id = cfg.get('aws_access_key_id')
538540
aws_secret_access_key = cfg.get('aws_secret_access_key')
539541

540-
account_id = get_account_id(aws_access_key_id, aws_secret_access_key, cfg.get('region'))
542+
account_id = get_account_id(
543+
aws_access_key_id, aws_secret_access_key, cfg.get('region'),
544+
)
541545
role = get_role_name(
542546
cfg.get('region'), account_id,
543547
cfg.get('role', 'lambda_basic_execution'),

‎scripts/lambda‎

Lines changed: 69 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@ def cli():
1919

2020
@click.command(help='Create a new function for Lambda.')
2121
@click.option(
22-
'--minimal', default=False, is_flag=True,
22+
'--minimal',
23+
default=False,
24+
is_flag=True,
2325
help='Exclude any unnecessary template files',
2426
)
2527
@click.argument(
@@ -36,14 +38,23 @@ def init(folder, minimal):
3638

3739

3840
@click.command(help='Bundles package for deployment.')
39-
@click.option('--config-file', default='config.yaml', help='Alternate config file.')
4041
@click.option(
41-
'--use-requirements', default=False, is_flag=True,
42+
'--config-file',
43+
default='config.yaml',
44+
help='Alternate config file.',
45+
)
46+
@click.option(
47+
'--use-requirements',
48+
default=False,
49+
is_flag=True,
4250
help='Install all packages defined in requirements.txt',
4351
)
4452
@click.option(
45-
'--local-package', default=None, type=click.Path(),
46-
help='Install local package as well.', multiple=True,
53+
'--local-package',
54+
default=None,
55+
type=click.Path(),
56+
help='Install local package as well.',
57+
multiple=True,
4758
)
4859
def build(use_requirements, local_package, config_file):
4960
aws_lambda.build(
@@ -55,8 +66,16 @@ def build(use_requirements, local_package, config_file):
5566

5667

5768
@click.command(help='Run a local test of your function.')
58-
@click.option('--event-file', default='event.json', help='Alternate event file.')
59-
@click.option('--config-file', default='config.yaml', help='Alternate config file.')
69+
@click.option(
70+
'--event-file',
71+
default='event.json',
72+
help='Alternate event file.',
73+
)
74+
@click.option(
75+
'--config-file',
76+
default='config.yaml',
77+
help='Alternate config file.',
78+
)
6079
@click.option('--verbose', '-v', is_flag=True)
6180
def invoke(event_file, config_file, verbose):
6281
aws_lambda.invoke(
@@ -68,14 +87,23 @@ def invoke(event_file, config_file, verbose):
6887

6988

7089
@click.command(help='Register and deploy your code to lambda.')
71-
@click.option('--config-file', default='config.yaml', help='Alternate config file.')
7290
@click.option(
73-
'--use-requirements', default=False, is_flag=True,
91+
'--config-file',
92+
default='config.yaml',
93+
help='Alternate config file.',
94+
)
95+
@click.option(
96+
'--use-requirements',
97+
default=False,
98+
is_flag=True,
7499
help='Install all packages defined in requirements.txt',
75100
)
76101
@click.option(
77-
'--local-package', default=None, type=click.Path(),
78-
help='Install local package as well.', multiple=True,
102+
'--local-package',
103+
default=None,
104+
type=click.Path(),
105+
help='Install local package as well.',
106+
multiple=True,
79107
)
80108
def deploy(use_requirements, local_package, config_file):
81109
aws_lambda.deploy(
@@ -88,27 +116,40 @@ def deploy(use_requirements, local_package, config_file):
88116

89117
@click.command(help='Upload your lambda to S3.')
90118
@click.option(
91-
'--use-requirements', default=False, is_flag=True,
119+
'--use-requirements',
120+
default=False,
121+
is_flag=True,
92122
help='Install all packages defined in requirements.txt',
93123
)
94124
@click.option(
95-
'--local-package', default=None, type=click.Path(),
96-
help='Install local package as well.', multiple=True,
125+
'--local-package',
126+
default=None,
127+
type=click.Path(),
128+
help='Install local package as well.',
129+
multiple=True,
97130
)
98131
def upload(use_requirements, local_package):
99132
aws_lambda.upload(CURRENT_DIR, use_requirements, local_package)
100133

101134

102135
@click.command(help='Deploy your lambda via S3.')
103-
@click.option('--config-file', default='config.yaml', help='Alternate config file.')
104136
@click.option(
105-
'--use-requirements', default=False, is_flag=True, help=(
106-
'Install all packages defined in requirements.txt'
107-
),
137+
'--config-file',
138+
default='config.yaml',
139+
help='Alternate config file.',
140+
)
141+
@click.option(
142+
'--use-requirements',
143+
default=False,
144+
is_flag=True,
145+
help='Install all packages defined in requirements.txt',
108146
)
109147
@click.option(
110-
'--local-package', default=None, type=click.Path(),
111-
multiple=True, help='Install local package as well.',
148+
'--local-package',
149+
default=None,
150+
type=click.Path(),
151+
multiple=True,
152+
help='Install local package as well.',
112153
)
113154
def deploy_s3(use_requirements, local_package, config_file):
114155
aws_lambda.deploy_s3(
@@ -119,11 +160,15 @@ def deploy_s3(use_requirements, local_package, config_file):
119160

120161

121162
@click.command(help='Delete old versions of your functions')
122-
@click.option('--config-file', default='config.yaml', help='Alternate config file.')
123163
@click.option(
124-
'--keep-last', type=int, prompt=(
125-
'Please enter the number of recent versions to keep'
126-
),
164+
'--config-file',
165+
default='config.yaml',
166+
help='Alternate config file.',
167+
)
168+
@click.option(
169+
'--keep-last',
170+
type=int,
171+
prompt='Please enter the number of recent versions to keep',
127172
)
128173
def cleanup(keep_last, config_file):
129174
aws_lambda.cleanup_old_versions(

‎setup.cfg‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ commit = True
33
tag = True
44
current_version = 3.0.1
55
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-(?P<release>[a-z]+))?
6-
serialize =
6+
serialize =
77
{major}.{minor}.{patch}
88

99
[bumpversion:file:setup.py]
@@ -15,4 +15,3 @@ universal = 1
1515

1616
[flake8]
1717
exclude = docs
18-

‎setup.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
#!/usr/bin/env python
22
# -*- coding: utf-8 -*-
3-
import pip
43
import sys
4+
5+
import pip
56
from setuptools import find_packages
67
from setuptools import setup
78

@@ -16,7 +17,8 @@
1617
if sys.version_info[0] == 2:
1718
pip_requirements = [str(r.req) for r in requirements]
1819
else:
19-
pip_requirements = [str(r.req) for r in requirements if 'futures' not in str(r.req)]
20+
pip_requirements = [str(r.req)
21+
for r in requirements if 'futures' not in str(r.req)]
2022

2123
test_requirements = [
2224
# TODO: put package test requirements here

0 commit comments

Comments
 (0)