diff --git a/.travis.yml b/.travis.yml index 7415f65..ced7b18 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,24 +1,26 @@ +--- + language: python python: -- '3.6' + - '3.6' before_install: -- sudo add-apt-repository universe -y -- sudo apt-get update -q -- sudo apt-get install -y redis-server redis-tools -- sudo systemctl start redis-server + - sudo add-apt-repository universe -y + - sudo apt-get update -q + - sudo apt-get install -y redis-server redis-tools + - sudo systemctl start redis-server install: -- pip3 install -r requirements.txt + - pip3 install -r requirements.txt before_script: -- pip3 install -r ./tests/requirements_dev.txt -- pip3 install anybadge -- git checkout master -- black hyperglass -- python3 ./manage.py pylint-badge --integer-only True -- sh ./tests/ci_git.sh -- python3 ./tests/ci_prepare.py + - pip3 install -r ./tests/requirements_dev.txt + - pip3 install anybadge + - git checkout master + - black hyperglass + - python3 ./manage.py pylint-badge --integer-only True + - ./tests/ci_git.sh + - python3 ./tests/ci_prepare.py script: -- nohup python3 ./tests/ci_dev_server.py & -- sleep 20 -- python3 ./tests/ci_test.py + - nohup python3 ./tests/ci_dev_server.py & + - sleep 20 + - python3 ./tests/ci_test.py after_success: -- git push origin master + - git push origin master diff --git a/tests/ci_commit.sh b/tests/ci_commit.sh index 865a7cd..bc1ab70 100755 --- a/tests/ci_commit.sh +++ b/tests/ci_commit.sh @@ -5,4 +5,4 @@ git_commit() { git push --quiet --set-upstream origin master } -git_commit() +git_commit diff --git a/tests/ci_git.sh b/tests/ci_git.sh index 7e6ea85..fc65577 100755 --- a/tests/ci_git.sh +++ b/tests/ci_git.sh @@ -1,7 +1,7 @@ #!/bin/sh commit_black() { - git add hyperglass/ *.py + git add hyperglass/*.py git commit --message "Black Formatting - travis $TRAVIS_BUILD_NUMBER" } @@ -19,6 +19,4 @@ setup_git commit_black commit_pylint -if [ $? -ne 0 ]; then - exit 0 -fi +exit 0