1
0
Fork 1
mirror of https://github.com/thatmattlove/hyperglass.git synced 2026-01-17 08:48:05 +00:00

Merge pull request #2 from andrewimeson/adi/shell-tweaks

Thanks @andrewimeson much appreciated! I'll also delete the unused shell scripts - it was about 2am and I was tired of fighting with Travis CI and ready to go to bed :)
This commit is contained in:
Matt Love 2019-06-18 13:44:14 -07:00 committed by GitHub
commit 674a8a64bb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 22 deletions

View file

@ -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

View file

@ -5,4 +5,4 @@ git_commit() {
git push --quiet --set-upstream origin master
}
git_commit()
git_commit

View file

@ -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