Merge pull request #148 from remind101/fix_dependencies

Fixes troposphere dependency conflicts w/ stacker

Author: phobologic

setup.py

@@ -4,13 +4,15 @@
 src_dir = os.path.dirname(__file__)
 
 install_requires = [
-    "stacker~=1.0.1",
-    "troposphere~=1.9.5",
+    "stacker>=1.0.1",
+    "troposphere>=1.9.5",
+    "awacs>=0.6.0",
 ]
 
 tests_require = [
-    "nose~=1.0",
+    "nose",
     "mock~=2.0.0",
+    "stacker>=1.1.1",
 ]
 
 

stacker_blueprints/rds/base.py

@@ -33,9 +33,8 @@ def validate_db_instance_identifier(value, allow_empty=True):
     if not value and allow_empty:
         # Empty value will pick up default from stackname
         return value
-    l = len(value)
     pattern = r"^[a-zA-Z][a-zA-Z0-9-]*$"
-    if not (0 < l < 64):
+    if not (0 < len(value) < 64):
         raise ValueError("Must be between 1 and 63 characters in length.")
     if not re.match(pattern, value):
         raise ValueError("Must match pattern: %s" % pattern)

tests/test_aws_lambda.py

@@ -1,6 +1,7 @@
 from types import MethodType
 
 from stacker.context import Context
+from stacker.config import Config
 from stacker.variables import Variable
 from stacker_blueprints.aws_lambda import Function, FunctionScheduler
 from stacker.blueprints.testutil import BlueprintTestCase
@@ -25,7 +26,7 @@ def setUp(self):
             "Runtime": "python2.7",
             "Timeout": 3,
         }
-        self.ctx = Context({'namespace': 'test', 'environment': 'test'})
+        self.ctx = Context(config=Config({'namespace': 'test'}))
 
     def create_blueprint(self, name):
         return Function(name, self.ctx)

tests/test_cloudwatch_logs.py

@@ -2,6 +2,7 @@
 
 from stacker.blueprints.testutil import BlueprintTestCase
 from stacker.context import Context
+from stacker.config import Config
 from stacker.variables import Variable
 
 from stacker_blueprints.cloudwatch_logs import SubscriptionFilters
@@ -11,7 +12,7 @@
 
 class TestSubscriptionFilters(BlueprintTestCase):
     def setUp(self):
-        self.ctx = Context({'namespace': 'test'})
+        self.ctx = Context(config=Config({'namespace': 'test'}))
 
     def test_create_template(self):
         blueprint = SubscriptionFilters(

tests/test_generic.py

@@ -2,17 +2,20 @@
 
 from stacker.blueprints.testutil import BlueprintTestCase
 from stacker.context import Context
+from stacker.config import Config
 from stacker.variables import Variable
 
 from stacker_blueprints.generic import GenericResourceCreator
 
 
 class TestGenericResourceCreator(BlueprintTestCase):
     def setUp(self):
-        self.ctx = Context({'namespace': 'test'})
+        self.ctx = Context(config=Config({'namespace': 'test'}))
 
     def test_create_template(self):
-        blueprint = GenericResourceCreator('test_generic_GenericResourceCreator', self.ctx)
+        blueprint = GenericResourceCreator(
+            'test_generic_GenericResourceCreator', self.ctx
+        )
         blueprint.resolve_variables(
             [
                 Variable('Class', 'ec2.Volume'),

tests/test_kms.py

@@ -1,4 +1,5 @@
 from stacker.context import Context
+from stacker.config import Config
 from stacker.variables import Variable
 
 from stacker_blueprints.kms import Key
@@ -8,7 +9,7 @@
 
 class TestKmsKey(BlueprintTestCase):
     def setUp(self):
-        self.ctx = Context({'namespace': 'test'})
+        self.ctx = Context(config=Config({'namespace': 'test'}))
 
     def test_kms_key(self):
         blueprint = Key('kms_key_a', self.ctx)
@@ -31,7 +32,7 @@ def test_kms_key_alias_not_in_keyalias(self):
         )
         blueprint.create_template()
         self.assertRenderedBlueprint(blueprint)
-    
+
     def test_kms_key_without_properties(self):
         blueprint = Key('kms_key_c', self.ctx)
         blueprint.resolve_variables(
@@ -52,7 +53,3 @@ def test_kms_key_attributes_is_deprecated(self):
         )
         with self.assertRaises(DeprecationWarning):
             blueprint.create_template()
-
-
-if __name__ == '__main__':
-    unittest.main()

tests/test_route53.py

@@ -1,4 +1,5 @@
 from stacker.context import Context
+from stacker.config import Config
 from stacker.variables import Variable
 
 from stacker_blueprints.route53 import (
@@ -8,9 +9,10 @@
 
 from stacker.blueprints.testutil import BlueprintTestCase
 
+
 class TestRoute53(BlueprintTestCase):
     def setUp(self):
-        self.ctx = Context({'namespace': 'test'})
+        self.ctx = Context(config=Config({'namespace': 'test'}))
 
     def test_create_template_hosted_zone_id(self):
         blueprint = DNSRecords('route53_dnsrecords', self.ctx)
@@ -92,10 +94,12 @@ def test_cloudfront_alias_adds_hosted_zone_id(self):
             ]
         )
         record_sets = blueprint.create_template()
-        self.assertEqual(record_sets[0].AliasTarget.HostedZoneId, "Z2FDTNDATAQYW2")
+        self.assertEqual(record_sets[0].AliasTarget.HostedZoneId,
+                         "Z2FDTNDATAQYW2")
 
     def test_elb_alias_proper_hosted_zone_id(self):
-        blueprint = DNSRecords('test_route53_elb_alias_hosted_zone_id', self.ctx)
+        blueprint = DNSRecords('test_route53_elb_alias_hosted_zone_id',
+                               self.ctx)
         blueprint.resolve_variables(
             [
                 Variable(
@@ -105,7 +109,7 @@ def test_elb_alias_proper_hosted_zone_id(self):
                             "Name": "host.testdomain.com.",
                             "Type": "A",
                             "AliasTarget": {
-                                "DNSName": "myelb-1234567890-abcdef.us-east-2.elb.amazonaws.com.",
+                                "DNSName": "myelb-1234567890-abcdef.us-east-2.elb.amazonaws.com.",  # noqa
                             },
                         },
                     ]