From e320dca2835221abfd0ae8309a69a80af5eec185 Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Wed, 3 Feb 2016 15:58:50 -0800 Subject: [PATCH 1/3] chmod u+x --- tools/run_tests/build_package_node.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 tools/run_tests/build_package_node.sh diff --git a/tools/run_tests/build_package_node.sh b/tools/run_tests/build_package_node.sh old mode 100644 new mode 100755 From e0667170418d4be7e117258c653a01dd7eb2fc96 Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Wed, 3 Feb 2016 15:57:57 -0800 Subject: [PATCH 2/3] add python mac target --- tools/run_tests/artifact_targets.py | 8 ++++++-- 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 f71b8f7acde..d32e778545a 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 0b263db8c0d..1867e87e288 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 From 844c355a3c2767fa070ee14448708f8a94c6ec7e Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Wed, 3 Feb 2016 17:05:49 -0800 Subject: [PATCH 3/3] we actually need the wheel --- tools/run_tests/artifact_targets.py | 1 - tools/run_tests/build_artifact_python.sh | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/run_tests/artifact_targets.py b/tools/run_tests/artifact_targets.py index d32e778545a..b37f968c064 100644 --- a/tools/run_tests/artifact_targets.py +++ b/tools/run_tests/artifact_targets.py @@ -98,7 +98,6 @@ class PythonArtifact: else: environ = {} if self.platform == 'linux': - environ['BDIST_WHEEL_MAYBE'] = 'bdist_wheel' if self.arch == 'x86': environ['SETARCH_CMD'] = 'linux32' return create_docker_jobspec(self.name, diff --git a/tools/run_tests/build_artifact_python.sh b/tools/run_tests/build_artifact_python.sh index 1867e87e288..48cf390f696 100755 --- a/tools/run_tests/build_artifact_python.sh +++ b/tools/run_tests/build_artifact_python.sh @@ -40,7 +40,7 @@ then fi GRPC_PYTHON_BUILD_WITH_CYTHON=1 ${SETARCH_CMD} python setup.py \ - ${BDIST_WHEEL_MAYBE} \ + bdist_wheel \ sdist \ bdist_egg_grpc_custom