diff --git a/doc/install-on-macosx.md b/doc/install-on-macosx.md index d55f82644..950638e36 100644 --- a/doc/install-on-macosx.md +++ b/doc/install-on-macosx.md @@ -19,7 +19,7 @@ brew update brew install git cmake automake autoconf libtool boost graphviz sudo easy_install pip sudo pip install ipython --user -sudo pip install numpy typing funcsigs subprocess32 protobuf==3.0.0a2 colorama graphviz cloudpickle --ignore-installed six +sudo pip install numpy typing funcsigs subprocess32 protobuf colorama graphviz cloudpickle --ignore-installed six ``` ## Build diff --git a/doc/install-on-ubuntu.md b/doc/install-on-ubuntu.md index fe7fff34d..f98262ca7 100644 --- a/doc/install-on-ubuntu.md +++ b/doc/install-on-ubuntu.md @@ -15,7 +15,7 @@ First install the dependencies. We currently do not support Python 3. ``` sudo apt-get update sudo apt-get install -y git cmake build-essential autoconf curl libtool python-dev python-numpy python-pip libboost-all-dev unzip graphviz -sudo pip install ipython typing funcsigs subprocess32 protobuf==3.0.0a2 colorama graphviz cloudpickle +sudo pip install ipython typing funcsigs subprocess32 protobuf colorama graphviz cloudpickle ``` ## Build diff --git a/docker/deploy/Dockerfile b/docker/deploy/Dockerfile index 63ca1337c..b58814553 100644 --- a/docker/deploy/Dockerfile +++ b/docker/deploy/Dockerfile @@ -6,7 +6,7 @@ RUN apt-get update RUN apt-get -y install apt-utils RUN apt-get -y install sudo RUN apt-get install -y git cmake build-essential autoconf curl libtool python-dev python-numpy python-pip libboost-all-dev unzip graphviz -RUN pip install ipython typing funcsigs subprocess32 protobuf==3.0.0a2 colorama graphviz cloudpickle +RUN pip install ipython typing funcsigs subprocess32 protobuf colorama graphviz cloudpickle RUN adduser --gecos --ingroup ray-user --disabled-login --gecos ray-user RUN adduser ray-user sudo RUN sed -i "s|%sudo\tALL=(ALL:ALL) ALL|%sudo\tALL=NOPASSWD: ALL|" /etc/sudoers diff --git a/docker/devel/Dockerfile b/docker/devel/Dockerfile index cdabefcc2..35f979959 100644 --- a/docker/devel/Dockerfile +++ b/docker/devel/Dockerfile @@ -6,7 +6,7 @@ RUN apt-get update RUN apt-get -y install apt-utils RUN apt-get -y install sudo RUN apt-get install -y git cmake build-essential autoconf curl libtool python-dev python-numpy python-pip libboost-all-dev unzip graphviz -RUN pip install ipython typing funcsigs subprocess32 protobuf==3.0.0a2 colorama graphviz cloudpickle +RUN pip install ipython typing funcsigs subprocess32 protobuf colorama graphviz cloudpickle RUN adduser --gecos --ingroup ray-user --disabled-login --gecos ray-user --uid 500 RUN adduser ray-user sudo RUN sed -i "s|%sudo\tALL=(ALL:ALL) ALL|%sudo\tALL=NOPASSWD: ALL|" /etc/sudoers diff --git a/docker/test-base/Dockerfile b/docker/test-base/Dockerfile index b1c1f740c..f33a0cc34 100644 --- a/docker/test-base/Dockerfile +++ b/docker/test-base/Dockerfile @@ -7,7 +7,7 @@ RUN apt-get update RUN apt-get -y install apt-utils RUN apt-get -y install sudo RUN apt-get install -y git cmake build-essential autoconf curl libtool python-dev python-numpy python-pip libboost-all-dev unzip graphviz -RUN pip install ipython typing funcsigs subprocess32 protobuf==3.0.0a2 colorama graphviz cloudpickle +RUN pip install ipython typing funcsigs subprocess32 protobuf colorama graphviz cloudpickle RUN adduser --gecos --ingroup ray-user --disabled-login --gecos ray-user RUN adduser ray-user sudo RUN sed -i "s|%sudo\tALL=(ALL:ALL) ALL|%sudo\tALL=NOPASSWD: ALL|" /etc/sudoers diff --git a/install-dependencies.sh b/install-dependencies.sh index fbfb4052c..52b213cab 100755 --- a/install-dependencies.sh +++ b/install-dependencies.sh @@ -31,11 +31,11 @@ if [[ $platform == "linux" ]]; then # These commands must be kept in sync with the installation instructions. sudo apt-get update sudo apt-get install -y git cmake build-essential autoconf curl libtool python-dev python-numpy python-pip libboost-all-dev unzip graphviz - sudo pip install ipython typing funcsigs subprocess32 protobuf==3.0.0a2 colorama graphviz cloudpickle + sudo pip install ipython typing funcsigs subprocess32 protobuf colorama graphviz cloudpickle elif [[ $platform == "macosx" ]]; then # These commands must be kept in sync with the installation instructions. brew install git cmake automake autoconf libtool boost graphviz sudo easy_install pip sudo pip install ipython --user - sudo pip install numpy typing funcsigs subprocess32 protobuf==3.0.0-alpha-2 colorama graphviz cloudpickle --ignore-installed six + sudo pip install numpy typing funcsigs subprocess32 protobuf colorama graphviz cloudpickle --ignore-installed six fi diff --git a/setup-env.sh b/setup-env.sh old mode 100755 new mode 100644 index a800d903c..1bc201a0c --- a/setup-env.sh +++ b/setup-env.sh @@ -6,3 +6,15 @@ ROOT_DIR=$(cd "$(dirname "${BASH_SOURCE:-$0}")"; pwd) export GRPC_VERBOSITY=ERROR # make grpc only print error messages export PYTHONPATH="$ROOT_DIR/lib/python/:$ROOT_DIR/thirdparty/numbuf/build" + +# Print instructions for adding Ray to your bashrc. +unamestr="$(uname)" +if [[ "$unamestr" == "Linux" ]]; then + BASH_RC="~/.bashrc" +elif [[ "$unamestr" == "Darwin" ]]; then + BASH_RC="~/.bash_profile" +fi +echo "To permanently add Ray to your Python path, run, + +echo 'export PYTHONPATH=$ROOT_DIR/lib/python/:$ROOT_DIR/thirdparty/numbuf/build:\$PYTHONPATH' >> $BASH_RC +"