Skip to content

Commit

Permalink
Update moto version to match PRs
Browse files Browse the repository at this point in the history
The following PRs fix various moto issues:
- getmoto/moto#1140
- getmoto/moto#1146
- getmoto/moto#1148
- getmoto/moto#1149
- getmoto/moto#1150
- getmoto/moto#1152

These has been merged into moto 1.1.10
  • Loading branch information
nuwang committed Sep 17, 2017
1 parent 578891b commit da66a88
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 6 deletions.
6 changes: 2 additions & 4 deletions cloudbridge/cloud/providers/aws/services.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ def __init__(self, provider, boto_conn, service, cb_iface):
self.service = getattr(self.boto_conn, service)
self.iface = cb_iface

def get(self, val, filter_name, wrapper=True):
def get(self, val, filter_name):
'''
Returns a single resource by filter
Expand All @@ -85,9 +85,7 @@ def get(self, val, filter_name, wrapper=True):
'Values': [val]
}]).limit(1))
obj = objs[0] if objs else None
if wrapper:
return self.iface(self.provider, obj) if obj else None
return obj
return self.iface(self.provider, obj) if obj else None
except ClientError:
return None

Expand Down
1 change: 0 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
git+git://github.com/spulec/moto
-e ".[dev]"
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
# httpretty is required with/for moto 1.0.0 or AWS tests fail
REQS_DEV = ([
'tox>=2.1.1',
'moto>=1.1.7',
'moto>=1.1.10',
'sphinx>=1.3.1',
'flake8>=3.3.0',
'flake8-import-order>=0.12'] + REQS_FULL
Expand Down

0 comments on commit da66a88

Please sign in to comment.