Skip to content

Commit

Permalink
Pinning PyYAML to 3.13 to deal with cfn-flip pin (cloudtools#684)
Browse files Browse the repository at this point in the history
* Pinning PyYAML to 3.13 to deal with cfn-flip pin

awslabs/aws-cfn-template-flip#54

YAML was pinned in the cfn-flip package that troposphere depends on, and
without this we have issues with building.

* yay, they removed the pinning!

awslabs/aws-cfn-template-flip#58

* Ugh, have to go back to pinning moto.

getmoto/moto#1924
getmoto/moto#1941
  • Loading branch information
phobologic authored Dec 3, 2018
1 parent f5100d1 commit 6518375
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 5 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ lint:
flake8 --require-code --min-version=2.7 --ignore FI50,FI51,FI53,FI14,E402,N802,W605 stacker/tests # ignore setUp naming

test-unit: clean
AWS_DEFAULT_REGION=us-east-1 python setup.py nosetests
AWS_ACCESS_KEY_ID=x AWS_SECRET_ACCESS_KEY=x AWS_DEFAULT_REGION=us-east-1 python setup.py nosetests

test-unit3: clean
AWS_DEFAULT_REGION=us-east-1 python3 setup.py nosetests
AWS_ACCESS_KEY_ID=x AWS_SECRET_ACCESS_KEY=x AWS_DEFAULT_REGION=us-east-1 python3 setup.py nosetests

clean:
rm -rf .egg stacker.egg-info
Expand Down
11 changes: 8 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,11 @@
install_requires = [
"future",
"troposphere>=1.9.0",
"botocore>=1.6.0",
"boto3>=1.3.1",
"PyYAML>=3.12",
# pinning needed till https://github.com/spulec/moto/issues/1924 is
# resolved
"botocore<1.11.0",
"boto3>=1.7.0,<1.8.0",
"PyYAML>=3.13b1",
"awacs>=0.6.0",
"gitpython>=2.0,<3.0",
"schematics>=2.0.1,<2.1.0",
Expand All @@ -20,6 +22,9 @@
]

tests_require = [
# pinning needed till https://github.com/spulec/moto/issues/1924 is
# resolved
"aws-xray-sdk==1.1.2",
"mock~=2.0.0",
"moto~=1.1.24",
"testfixtures~=4.10.0",
Expand Down

0 comments on commit 6518375

Please sign in to comment.