Merge branch 'develop' of https://github.com/digitalocean/netbox into develop

This commit is contained in:
Jeremy Stretch 2016-06-28 11:15:56 -04:00
commit 0eb8227044
3 changed files with 12 additions and 1 deletions

View File

@ -3,5 +3,6 @@ python:
- "2.7" - "2.7"
install: install:
- pip install -r requirements.txt - pip install -r requirements.txt
- pip install pep8
script: script:
- ./scripts/cibuild.sh - ./scripts/cibuild.sh

View File

@ -21,6 +21,16 @@ if [[ ! -z $SYNTAX ]]; then
EXIT=1 EXIT=1
fi fi
# Check all python source files for PEP 8 compliance, but explicitly
# ignore:
# - E501: line greater than 80 characters in length
pep8 --ignore=E501 netbox/
RC=$?
if [[ $RC != 0 ]]; then
echo -e "\n$(info) one or more PEP 8 errors detected, failing build."
EXIT=$RC
fi
# Prepare configuration file for use in CI # Prepare configuration file for use in CI
CONFIG="netbox/netbox/configuration.py" CONFIG="netbox/netbox/configuration.py"
cp netbox/netbox/configuration.example.py $CONFIG cp netbox/netbox/configuration.example.py $CONFIG