diff options
| -rw-r--r-- | tools/coding-checks.sh | 2 | ||||
| -rw-r--r-- | tox.ini | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/coding-checks.sh b/tools/coding-checks.sh index 6a12a1e99..615f2c3de 100644 --- a/tools/coding-checks.sh +++ b/tools/coding-checks.sh @@ -40,7 +40,7 @@ run_pylint () { fi # make Jenkins output parseable because Jenkins doesn't handle color # enventually we should use the Jenkins Pylint plugin or other tools - if [ -n "${JENKINS_HOME:-}" ] ; then + if [ -n "${BRANCH:-}" ] ; then output_format="--output-format=parseable" fi echo "Running pylint..." @@ -5,7 +5,7 @@ envlist = py{27,3},pep8,functional{,-py3},coverage [testenv] usedevelop=True -passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY +passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY BRANCH deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt |