diff options
| author |  Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2016-02-25 09:40:23 -0800 |
|---|---|---|
| committer | Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2016-02-25 09:40:23 -0800 |
| commit | 7620649134d52d155e76983dd9ca9c85b68b3adc (patch) | |
| tree | d2e7286bb06088e4555480ee940015d03102ff78 /tools | |
| parent | 74b5b7e10e85987ec937961f05ef3e746f8f9c36 (diff) | |
| parent | 88966ab1452f015c58664e37569976bc433910fc (diff) | |
Merge pull request #5359 from nicolasnoble/upmerge
Upmerge from 0.13
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/run_tests/build_artifact_python.sh | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/tools/run_tests/build_artifact_python.sh b/tools/run_tests/build_artifact_python.sh index 6e7ab911d5..7ba04d7546 100755 --- a/tools/run_tests/build_artifact_python.sh +++ b/tools/run_tests/build_artifact_python.sh @@ -39,6 +39,14 @@ then pip install -rrequirements.txt fi +# Build the source distribution first because MANIFEST.in cannot override +# exclusion of built shared objects among package resources (for some +# inexplicable reason). +GRPC_PYTHON_USE_CUSTOM_BDIST=0 \ +GRPC_PYTHON_BUILD_WITH_CYTHON=1 \ +${SETARCH_CMD} python setup.py \ + sdist + # The bdist_wheel_grpc_custom command is finicky about command output ordering # and thus ought to be run in a shell command separate of others. Further, it # trashes the actual bdist_wheel output, so it should be run first so that @@ -48,11 +56,12 @@ GRPC_PYTHON_BUILD_WITH_CYTHON=1 \ ${SETARCH_CMD} python setup.py \ build_tagged_ext +# Wheel has a bug where directories don't get excluded. +# https://bitbucket.org/pypa/wheel/issues/99/cannot-exclude-directory GRPC_PYTHON_USE_CUSTOM_BDIST=0 \ GRPC_PYTHON_BUILD_WITH_CYTHON=1 \ ${SETARCH_CMD} python setup.py \ - bdist_wheel \ - sdist + bdist_wheel mkdir -p artifacts |