Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add testing #1

Merged
merged 3 commits into from
Apr 16, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions buildspec_merge.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
version: 0.2
phases:
build:
commands:
- docker run -i --rm -v "${PWD}:/cfnlint" -w /cfnlint python:2.7-alpine3.7 sh -c "pip install tox;tox -e py27"
- docker run -i --rm -v "${PWD}:/cfnlint" -w /cfnlint python:3.6-alpine3.7 sh -c "pip install tox;tox -e py36,pylint"
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
]},
packages=find_packages('src'),
zip_safe=False,
install_requires=['pyyaml', 'six'],
install_requires=['pyyaml', 'six', 'requests'],
entry_points={
'console_scripts': [
'cfn-lint = cfnlint.__main__:main'
Expand Down
2 changes: 1 addition & 1 deletion src/cfnlint/helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
import glob
import imp
import logging
import requests
import pkg_resources
import requests

LOGGER = logging.getLogger(__name__)

Expand Down
1 change: 0 additions & 1 deletion test/templates/quickstart/openshift.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -795,7 +795,6 @@ Resources:
StackId:
Ref: AWS::StackId
Type: Custom::GenerateKeys
Version: '1.0'
KeyGen:
Properties:
Code:
Expand Down
10 changes: 7 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,14 @@ envlist = py27,py36,pylint
[testenv]
changedir = test
commands = discover
deps = discover
deps =
discover
requests

[testenv:pylint]
changedir =
basepython=python3.6
deps=pylint
basepython = python3.6
deps =
pylint
requests
commands=pylint src/cfnlint