diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-02-11 08:51:16 -0800 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-02-11 08:51:16 -0800 |
| commit | c0473cc8235ab94f38a9d9891e2352e76960fb96 (patch) | |
| tree | 1b7cdda11382438addf82bca4a1017bdf1da25f8 /test/distrib/python | |
| parent | cce7fe06262a1b38f4f74e127fc7dc6047763437 (diff) | |
| parent | f79366a3c99592eccd9c719c86dca2f976804d3d (diff) | |
Merge github.com:grpc/grpc into compress
Diffstat (limited to 'test/distrib/python')
| -rwxr-xr-x | test/distrib/python/run_distrib_test.sh | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/test/distrib/python/run_distrib_test.sh b/test/distrib/python/run_distrib_test.sh index a185bcbc26..8fd7ffb54c 100755 --- a/test/distrib/python/run_distrib_test.sh +++ b/test/distrib/python/run_distrib_test.sh @@ -32,27 +32,27 @@ set -ex cd $(dirname $0) -# TODO(jtattermusch): replace the version number -SDIST_ARCHIVE="$EXTERNAL_GIT_ROOT/input_artifacts/grpcio-0.12.0b8.tar.gz" +# Pick up the source dist archive whatever its version is +SDIST_ARCHIVE=$EXTERNAL_GIT_ROOT/input_artifacts/grpcio-*.tar.gz BDIST_DIR="file://$EXTERNAL_GIT_ROOT/input_artifacts" -if [ ! -f "${SDIST_ARCHIVE}" ] +if [ ! -f ${SDIST_ARCHIVE} ] then echo "Archive ${SDIST_ARCHIVE} does not exist." exit 1 fi -# TODO(jtattermusch): this shouldn't be required -pip install --upgrade six +PIP=pip2 +which $PIP || PIP=pip +PYTHON=python2 +which $PYTHON || PYTHON=python -# TODO(jtattermusch): if these don't get preinstalled, pip tries to install them -# with --use-grpc-custom-bdist option, which obviously fails. -pip install --upgrade enum34 -pip install --upgrade futures +# TODO(jtattermusch): this shouldn't be required +$PIP install --upgrade six GRPC_PYTHON_BINARIES_REPOSITORY="${BDIST_DIR}" \ - pip install \ - "${SDIST_ARCHIVE}" \ - --install-option="--use-grpc-custom-bdist" + $PIP install \ + ${SDIST_ARCHIVE} + +$PYTHON distribtest.py -python distribtest.py |