diff options
| author |  Nathaniel Manista <nathaniel@google.com> | 2017-01-23 17:32:15 +0000 |
|---|---|---|
| committer | Nathaniel Manista <nathaniel@google.com> | 2017-01-23 17:32:15 +0000 |
| commit | 9ff26dc693b548acf65696369079b9ad01af5693 (patch) | |
| tree | b8bc44741faeb614bce8158e827da1511c425d4c /tools/run_tests | |
| parent | ba9aa59bdfc107054dd6083f36b3527a9bc85d72 (diff) | |
| parent | c8fa4cfcffdcca960eb6b7a4352dae868c20c6ef (diff) | |
v1.0.x → master upmerge
Manual resolution:
- Force use of local distributions in Python-building in
tools/run_tests/helper_scripts/build_python.sh.
Diffstat (limited to 'tools/run_tests')
| -rwxr-xr-x | tools/run_tests/helper_scripts/build_python.sh | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/tools/run_tests/helper_scripts/build_python.sh b/tools/run_tests/helper_scripts/build_python.sh index 0e88e96765..5647d9c2fc 100755 --- a/tools/run_tests/helper_scripts/build_python.sh +++ b/tools/run_tests/helper_scripts/build_python.sh @@ -163,22 +163,18 @@ pip_install_dir() { PWD=`pwd` cd $1 ($VENV_PYTHON setup.py build_ext -c $TOOLCHAIN || true) - # install the dependencies - $VENV_PYTHON -m pip install --upgrade . - # ensure that we've reinstalled the test packages - $VENV_PYTHON -m pip install --upgrade --force-reinstall --no-deps . + $VENV_PYTHON -m pip install --no-deps . cd $PWD } $VENV_PYTHON -m pip install --upgrade pip $VENV_PYTHON -m pip install setuptools $VENV_PYTHON -m pip install cython +$VENV_PYTHON -m pip install six enum34 protobuf futures pip_install_dir $ROOT + $VENV_PYTHON $ROOT/tools/distrib/python/make_grpcio_tools.py pip_install_dir $ROOT/tools/distrib/python/grpcio_tools -# TODO(atash) figure out namespace packages and grpcio-tools and auditwheel -# etc... -pip_install_dir $ROOT # Build/install health checking $VENV_PYTHON $ROOT/src/python/grpcio_health_checking/setup.py preprocess @@ -191,6 +187,7 @@ $VENV_PYTHON $ROOT/src/python/grpcio_reflection/setup.py build_package_protos pip_install_dir $ROOT/src/python/grpcio_reflection # Build/install tests +$VENV_PYTHON -m pip install coverage oauth2client $VENV_PYTHON $ROOT/src/python/grpcio_tests/setup.py preprocess $VENV_PYTHON $ROOT/src/python/grpcio_tests/setup.py build_package_protos pip_install_dir $ROOT/src/python/grpcio_tests |