From 658e39456d2237b851496982d9c125ac35c8ee44 Mon Sep 17 00:00:00 2001 From: checktheroads Date: Mon, 17 Jun 2019 01:14:29 -0700 Subject: [PATCH] ci updates --- .travis.yml | 5 ++--- tests/check_code.sh | 7 ++----- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8de9d66..64e4ac4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,11 +6,10 @@ before_install: - sudo apt-get update -q - sudo apt-get install -y redis-server redis-tools - sudo systemctl start redis-server -- pip3 install -r ./tests/requirements_dev.txt install: - pip3 install -r requirements.txt before_script: -# - git remote add origin git@github.com/checktheroads/hyperglass.git > /dev/null 2>&1 +- pip3 install -r ./tests/requirements_dev.txt - pip3 install anybadge - sh ./tests/check_code.sh - python3 ./tests/ci_prepare.py @@ -19,4 +18,4 @@ script: - sleep 20 - python3 ./tests/ci_test.py after_success: -- git push --quiet --set-upstream origin master +- git push origin master diff --git a/tests/check_code.sh b/tests/check_code.sh index 4adbd05..4e5e00b 100755 --- a/tests/check_code.sh +++ b/tests/check_code.sh @@ -12,12 +12,8 @@ check_format() { echo "Completed Black Formatting" } -run_pylint() { - echo $(python3 manage.py pylint-badge --integer-only True) -} - check_pylint() { - PYLINT_SCORE=$(run_pylint) + PYLINT_SCORE=$(python3 manage.py pylint-badge --integer-only True) echo "Pylint score: $PYLINT_SCORE" if [ "$PYLINT_SCORE" == "10.00" ] then @@ -27,5 +23,6 @@ check_pylint() { fi } +setup_git check_format check_pylint