diff options
| author |  Michael Lumish <mlumish@google.com> | 2016-02-04 08:43:12 -0800 |
|---|---|---|
| committer | Michael Lumish <mlumish@google.com> | 2016-02-04 08:43:12 -0800 |
| commit | bf9ac1fcc78d2bf82165258463e08af481b939d7 (patch) | |
| tree | e1cf2c31d8246e2b90a841ec820eda8a80ea7921 /tools | |
| parent | b9b38ba62b5c8e37ec91e128dbe1f379fee084ee (diff) | |
| parent | 844c355a3c2767fa070ee14448708f8a94c6ec7e (diff) | |
Merge pull request #5055 from jtattermusch/python_mac_artifact
Build python artifact on Mac
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/run_tests/artifact_targets.py | 7 | ||||
| -rwxr-xr-x | tools/run_tests/build_artifact_python.sh | 10 | ||||
| -rwxr-xr-x[-rw-r--r--] | tools/run_tests/build_package_node.sh | 0 |
3 files changed, 11 insertions, 6 deletions
diff --git a/tools/run_tests/artifact_targets.py b/tools/run_tests/artifact_targets.py index f71b8f7acd..b37f968c06 100644 --- a/tools/run_tests/artifact_targets.py +++ b/tools/run_tests/artifact_targets.py @@ -96,8 +96,8 @@ class PythonArtifact: if self.platform == 'windows': raise Exception('Not supported yet.') else: + environ = {} if self.platform == 'linux': - environ = {} if self.arch == 'x86': environ['SETARCH_CMD'] = 'linux32' return create_docker_jobspec(self.name, @@ -105,8 +105,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 +233,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..48cf390f69 100755 --- a/tools/run_tests/build_artifact_python.sh +++ b/tools/run_tests/build_artifact_python.sh @@ -32,10 +32,12 @@ 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 \ diff --git a/tools/run_tests/build_package_node.sh b/tools/run_tests/build_package_node.sh index e6360f979f..e6360f979f 100644..100755 --- a/tools/run_tests/build_package_node.sh +++ b/tools/run_tests/build_package_node.sh |