Skip to content

Commit

Permalink
Merge pull request #1029 from mcrowson/pin-troposphere
Browse files Browse the repository at this point in the history
Pinning Troposphere for breaking change
  • Loading branch information
mcrowson authored Sep 10, 2021
2 parents bb5834f + 1c1ee62 commit 89e9917
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion requirements.in
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ requests>=2.20.0
six
toml
tqdm
troposphere
troposphere>=3.0
# See https://github.com/Miserlou/Zappa/issues/2036
Werkzeug<1.0
wheel
Expand Down
4 changes: 2 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# This file is autogenerated by pip-compile
# This file is autogenerated by pip-compile with python 3.8
# To update, run:
#
# pip-compile --output-file=requirements.txt requirements.in
Expand Down Expand Up @@ -74,7 +74,7 @@ toml==0.10.2
# pep517
tqdm==4.59.0
# via -r requirements.in
troposphere==2.7.0
troposphere==3.0.2
# via -r requirements.in
urllib3==1.26.4
# via
Expand Down
2 changes: 1 addition & 1 deletion zappa/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -2414,7 +2414,7 @@ def create_stack_template(

# build a fresh template
self.cf_template = troposphere.Template()
self.cf_template.add_description("Automatically generated with Zappa")
self.cf_template.set_description("Automatically generated with Zappa")
self.cf_api_resources = []
self.cf_parameters = {}

Expand Down

0 comments on commit 89e9917

Please sign in to comment.