diff --git a/samples/client/petstore/python/Makefile b/samples/client/petstore/python/Makefile index b1c318aadb7..0f65e0c6ac3 100644 --- a/samples/client/petstore/python/Makefile +++ b/samples/client/petstore/python/Makefile @@ -1,4 +1,4 @@ - #!/bin/sh + #!/bin/bash REQUIREMENTS_FILE=dev-requirements.txt REQUIREMENTS_OUT=dev-requirements.txt.log @@ -8,13 +8,14 @@ VENV=.venv clean: rm -rf $(REQUIREMENTS_OUT) rm -rf $(SETUP_OUT) + rm -rf $(VENV) rm -rf .tox rm -rf .coverage find . -name "*.py[oc]" -delete find . -name "__pycache__" -delete test: clean - sh ./test.sh + bash ./test.sh test-all: clean - sh ./test-all.sh + bash ./test-all.sh diff --git a/samples/client/petstore/python/pom.xml b/samples/client/petstore/python/pom.xml index 1eca98baf76..147938617d2 100644 --- a/samples/client/petstore/python/pom.xml +++ b/samples/client/petstore/python/pom.xml @@ -26,21 +26,6 @@ exec-maven-plugin 1.2.1 - - pip-install - pre-integration-test - - exec - - - pip - - install - --user - virtualenv - - - nose-test integration-test diff --git a/samples/client/petstore/python/test-all.sh b/samples/client/petstore/python/test-all.sh index e6c2a9ff19c..03c16abd4ae 100755 --- a/samples/client/petstore/python/test-all.sh +++ b/samples/client/petstore/python/test-all.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash REQUIREMENTS_FILE=dev-requirements.txt REQUIREMENTS_OUT=dev-requirements.txt.log @@ -8,7 +8,7 @@ DEACTIVE=false ### set virtualenv if [ -z "$VIRTUAL_ENV" ]; then - virtualenv $VENV --no-site-packages + virtualenv $VENV --no-site-packages --always-copy source $VENV/bin/activate DEACTIVE=true fi diff --git a/samples/client/petstore/python/test.sh b/samples/client/petstore/python/test.sh index 580cd7d67e9..c6889895950 100755 --- a/samples/client/petstore/python/test.sh +++ b/samples/client/petstore/python/test.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash REQUIREMENTS_FILE=dev-requirements.txt REQUIREMENTS_OUT=dev-requirements.txt.log @@ -8,7 +8,7 @@ DEACTIVE=false ### set virtualenv if [ -z "$VIRTUAL_ENV" ]; then - virtualenv $VENV --no-site-packages + virtualenv $VENV --no-site-packages --always-copy source $VENV/bin/activate DEACTIVE=true fi