Skip to content

Commit

Permalink
Force bare env execution on travis
Browse files Browse the repository at this point in the history
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
  • Loading branch information
gsemet committed Jun 3, 2017
1 parent 067e0b2 commit 89b30a9
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ install:
- ./install.sh system-dev

script:
- ./check-style.sh
- ./test-local.sh
- ./check-style.sh bare
- ./test-local.sh bare
# - ./test-docker.sh

after_success:
Expand Down
12 changes: 9 additions & 3 deletions check-style.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,13 @@ set -e

cd $(dirname $0)

pipenv run python setup.py sdist
pipenv run python setup.py flake8
PIPENV_EXEC="pipenv run "

if [[ $1 == "bare" ]]; then
PIPENV_EXEC=""
fi

${PIPENV_EXEC}python setup.py sdist
${PIPENV_EXEC}python setup.py flake8
echo "Running pylint"
pipenv run pylint --rcfile=setup.cfg subdlsrv
${PIPENV_EXEC}pylint --rcfile=setup.cfg subdlsrv
9 changes: 7 additions & 2 deletions test-local.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,10 @@ set -e
cd $(dirname $0)

echo "Test local build"
pipenv run python setup.py sdist
pipenv run pytest subdlsrv

if [[ $1 == "bare" ]]; then
PIPENV_EXEC=""
fi

${PIPENV_EXEC}python setup.py sdist
${PIPENV_EXEC}pytest subdlsrv

0 comments on commit 89b30a9

Please sign in to comment.