Make sure the right Python interpreter is used (#4334)

This commit is contained in:
Philipp Moritz 2019-03-12 12:21:55 -07:00 committed by Robert Nishihara
parent 3c41cb9b60
commit 490d896f41
4 changed files with 4 additions and 11 deletions

View file

@ -34,11 +34,6 @@ matrix:
script: script:
- ./java/test.sh - ./java/test.sh
# Test Bazel build
- rm -rf build
- ./ci/suppress_output ./ci/travis/install-bazel.sh
- bazel build ...
- os: linux - os: linux
dist: trusty dist: trusty
env: LINT=1 PYTHONWARNINGS=ignore env: LINT=1 PYTHONWARNINGS=ignore

View file

@ -20,11 +20,9 @@ py_library(
) )
# May not be named "cython", since that conflicts with Cython/ on OSX # May not be named "cython", since that conflicts with Cython/ on OSX
py_binary( filegroup(
name="cython_binary", name="cython_binary",
srcs=["cython.py"], srcs=["cython.py"],
main="cython.py",
srcs_version="PY2AND3",
visibility=["//visibility:public"], visibility=["//visibility:public"],
deps=["cython_lib"], data=["cython_lib"],
) )

View file

@ -46,7 +46,7 @@ def pyx_library(name, deps=[], py_deps=[], srcs=[], **kwargs):
# Optionally use PYTHON_BIN_PATH on Linux platforms so that python 3 # Optionally use PYTHON_BIN_PATH on Linux platforms so that python 3
# works. Windows has issues with cython_binary so skip PYTHON_BIN_PATH. # works. Windows has issues with cython_binary so skip PYTHON_BIN_PATH.
cmd= cmd=
"PYTHONHASHSEED=0 $(location @cython//:cython_binary) --cplus $(SRCS) --output-file $(OUTS)", "PYTHONHASHSEED=0 $${PYTHON_BIN_PATH} $(location @cython//:cython_binary) --cplus $(SRCS) --output-file $(OUTS)",
tools=["@cython//:cython_binary"] + pxd_srcs, tools=["@cython//:cython_binary"] + pxd_srcs,
) )

View file

@ -121,7 +121,7 @@ else
$PYTHON_EXECUTABLE -m pip install \ $PYTHON_EXECUTABLE -m pip install \
--target=$ROOT_DIR/python/ray/pyarrow_files pyarrow==0.12.0.RAY \ --target=$ROOT_DIR/python/ray/pyarrow_files pyarrow==0.12.0.RAY \
--find-links https://s3-us-west-2.amazonaws.com/arrow-wheels/9357dc130789ee42f8181d8724bee1d5d1509060/index.html --find-links https://s3-us-west-2.amazonaws.com/arrow-wheels/9357dc130789ee42f8181d8724bee1d5d1509060/index.html
bazel build //:ray_pkg -c opt --verbose_failures bazel build //:ray_pkg -c opt --verbose_failures --action_env=PYTHON_BIN_PATH=$PYTHON_EXECUTABLE
# Copy files and keep them writeable. This is a workaround, as Bazel # Copy files and keep them writeable. This is a workaround, as Bazel
# marks all generated files non-writeable. If we would just copy them # marks all generated files non-writeable. If we would just copy them
# over without adding write permission, the copy would fail the next time. # over without adding write permission, the copy would fail the next time.