diff options
| author |  Jan Tattermusch <jtattermusch@google.com> | 2016-02-03 15:57:57 -0800 |
|---|---|---|
| committer | Jan Tattermusch <jtattermusch@google.com> | 2016-02-03 16:19:26 -0800 |
| commit | e0667170418d4be7e117258c653a01dd7eb2fc96 (patch) | |
| tree | 82d8b8ac4e2ae93416616a1db4ac2d01d969903c /tools/run_tests | |
| parent | e320dca2835221abfd0ae8309a69a80af5eec185 (diff) | |
add python mac target
Diffstat (limited to 'tools/run_tests')
| -rw-r--r-- | tools/run_tests/artifact_targets.py | 8 | ||||
| -rwxr-xr-x | tools/run_tests/build_artifact_python.sh | 12 |
2 files changed, 13 insertions, 7 deletions
diff --git a/tools/run_tests/artifact_targets.py b/tools/run_tests/artifact_targets.py index f71b8f7acd..d32e778545 100644 --- a/tools/run_tests/artifact_targets.py +++ b/tools/run_tests/artifact_targets.py @@ -96,8 +96,9 @@ class PythonArtifact: if self.platform == 'windows': raise Exception('Not supported yet.') else: + environ = {} if self.platform == 'linux': - environ = {} + environ['BDIST_WHEEL_MAYBE'] = 'bdist_wheel' if self.arch == 'x86': environ['SETARCH_CMD'] = 'linux32' return create_docker_jobspec(self.name, @@ -105,8 +106,10 @@ class PythonArtifact: 'tools/run_tests/build_artifact_python.sh', environ=environ) else: + environ['SKIP_PIP_INSTALL'] = 'TRUE' return create_jobspec(self.name, - ['tools/run_tests/build_artifact_python.sh']) + ['tools/run_tests/build_artifact_python.sh'], + environ=environ) def __str__(self): return self.name @@ -231,6 +234,7 @@ def targets(): for arch in ('x86', 'x64')] + [PythonArtifact('linux', 'x86'), PythonArtifact('linux', 'x64'), + PythonArtifact('macos', 'x64'), RubyArtifact('linux', 'x86'), RubyArtifact('linux', 'x64'), RubyArtifact('macos', 'x64')]) diff --git a/tools/run_tests/build_artifact_python.sh b/tools/run_tests/build_artifact_python.sh index 0b263db8c0..1867e87e28 100755 --- a/tools/run_tests/build_artifact_python.sh +++ b/tools/run_tests/build_artifact_python.sh @@ -32,13 +32,15 @@ set -ex cd $(dirname $0)/../.. -pip install --upgrade six -pip install --upgrade setuptools - -pip install -rrequirements.txt +if [ "$SKIP_PIP_INSTALL" == "" ] +then + pip install --upgrade six + pip install --upgrade setuptools + pip install -rrequirements.txt +fi GRPC_PYTHON_BUILD_WITH_CYTHON=1 ${SETARCH_CMD} python setup.py \ - bdist_wheel \ + ${BDIST_WHEEL_MAYBE} \ sdist \ bdist_egg_grpc_custom |