diff options
| author |  murgatroid99 <mlumish@google.com> | 2016-02-04 13:44:41 -0800 |
|---|---|---|
| committer | murgatroid99 <mlumish@google.com> | 2016-02-04 13:44:41 -0800 |
| commit | 53f16356b2820d795bdf1ab0e32e454c6b0ce3a9 (patch) | |
| tree | 647fc41f8a250775c86c3619345e4a722fc43167 /tools/run_tests/build_artifact_python.sh | |
| parent | b781c9757dd95e416a649d21fdc8858f67ecefd2 (diff) | |
| parent | e4fdcd924263edca885b22122e9e7cf148c236fd (diff) | |
Resolved merge conflict with master
Diffstat (limited to 'tools/run_tests/build_artifact_python.sh')
| -rwxr-xr-x | tools/run_tests/build_artifact_python.sh | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/tools/run_tests/build_artifact_python.sh b/tools/run_tests/build_artifact_python.sh index 0ff6b2f8c0..48cf390f69 100755 --- a/tools/run_tests/build_artifact_python.sh +++ b/tools/run_tests/build_artifact_python.sh @@ -32,12 +32,14 @@ set -ex cd $(dirname $0)/../.. -pip install --upgrade six -pip install --upgrade setuptools +if [ "$SKIP_PIP_INSTALL" == "" ] +then + pip install --upgrade six + pip install --upgrade setuptools + pip install -rrequirements.txt +fi -pip install -rrequirements.txt - -GRPC_PYTHON_BUILD_WITH_CYTHON=1 python setup.py \ +GRPC_PYTHON_BUILD_WITH_CYTHON=1 ${SETARCH_CMD} python setup.py \ bdist_wheel \ sdist \ bdist_egg_grpc_custom |