Skip to content

Commit

Permalink
Merge pull request #24 from ansible-ThoTeam/dev
Browse files Browse the repository at this point in the history
Merge dev to master for release v2.0
  • Loading branch information
zeitounator authored Dec 22, 2017
2 parents 5d55032 + ab08604 commit 7a97e91
Show file tree
Hide file tree
Showing 44 changed files with 1,044 additions and 363 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
.idea/
*.iml
molecule/**/.molecule/
molecule/**/__pycache__/
13 changes: 6 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,13 @@

sudo: required
language: python
cache:
pip: true
directories:
- molecule/default/.molecule/nexus-downloads/
services:
- docker
before_install:
- sudo apt-get update
- sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-ce
- sudo apt-get -y install groovy
install:
- pip install molecule
- pip install docker-py
- pip install -r requirements.txt
script:
- ./tests/run_all_tests.sh
- ./tests/test_molecule.sh
46 changes: 36 additions & 10 deletions .yamllint
Original file line number Diff line number Diff line change
@@ -1,17 +1,43 @@
---
extends: default

rules:
braces:
max-spaces-inside: 1
indentation:
spaces: 2
check-multi-line-strings: true
line-length:
max: 250
level: warning
document-start:
present: true
level: error
key-duplicates: enable
trailing-spaces: enable
hyphens:
max-spaces-after: 1
level: error
empty-lines:
max: 2
max-start: 0
max-end: 0
level: error
commas:
max-spaces-before: 0
min-spaces-after: 1
max-spaces-after: 1
level: error
colons:
max-spaces-before: 0
max-spaces-after: 1
level: error
brackets:
max-spaces-inside: 1
level: warning
line-length: disable
min-spaces-inside: 0
max-spaces-inside: 0
level: error
braces:
min-spaces-inside: 0
max-spaces-inside: 0
level: error
truthy: disable
empty-lines:
level: warning
indentation:
level: warning
indent-sequences: consistent
new-line-at-end-of-file: disable
comments-indentation: enable
Loading

0 comments on commit 7a97e91

Please sign in to comment.