diff --git a/README.rst b/README.rst index 7c6c5b0a4..320b0bbcc 100644 --- a/README.rst +++ b/README.rst @@ -182,7 +182,7 @@ RLlib Quick Start More Information ---------------- -- `Documentation`_, in particular `Building Ray and Contributing to Ray`_ +- `Documentation`_ - `Tutorial`_ - `Blog`_ - `Ray paper`_ @@ -191,7 +191,6 @@ More Information - `Tune paper`_ .. _`Documentation`: http://ray.readthedocs.io/en/latest/index.html -.. _`Building Ray and Contributing to Ray`: https://ray.readthedocs.io/en/latest/development.html .. _`Tutorial`: https://github.com/ray-project/tutorial .. _`Blog`: https://ray-project.github.io/ .. _`Ray paper`: https://arxiv.org/abs/1712.05889 diff --git a/ci/travis/install-dependencies.sh b/ci/travis/install-dependencies.sh index af920c48a..66613f6ba 100755 --- a/ci/travis/install-dependencies.sh +++ b/ci/travis/install-dependencies.sh @@ -42,7 +42,7 @@ fi if [[ "$PYTHON" == "3.6" ]] && [[ "$platform" == "linux" ]]; then sudo apt-get update - sudo apt-get install -y python-dev python-numpy build-essential curl unzip tmux gdb libunwind-dev + sudo apt-get install -y build-essential curl unzip tmux gdb libunwind-dev # Install miniconda. wget -q https://repo.continuum.io/miniconda/Miniconda3-4.5.4-Linux-x86_64.sh -O miniconda.sh -nv bash miniconda.sh -b -p $HOME/miniconda @@ -51,7 +51,7 @@ if [[ "$PYTHON" == "3.6" ]] && [[ "$platform" == "linux" ]]; then pip install scipy tensorflow==$tf_version \ cython==0.29.0 gym \ opencv-python-headless pyyaml pandas==0.24.2 requests \ - feather-format lxml openpyxl xlrd py-spy pytest-timeout networkx tabulate aiohttp \ + feather-format lxml openpyxl xlrd py-spy pytest pytest-timeout networkx tabulate aiohttp \ uvicorn dataclasses pygments werkzeug kubernetes flask grpcio pytest-sugar pytest-rerunfailures pytest-asyncio \ blist scikit-learn numba elif [[ "$PYTHON" == "3.6" ]] && [[ "$platform" == "macosx" ]]; then @@ -62,7 +62,7 @@ elif [[ "$PYTHON" == "3.6" ]] && [[ "$platform" == "macosx" ]]; then pip install scipy tensorflow==$tf_version \ cython==0.29.0 gym \ opencv-python-headless pyyaml pandas==0.24.2 requests \ - feather-format lxml openpyxl xlrd py-spy pytest-timeout networkx tabulate aiohttp \ + feather-format lxml openpyxl xlrd py-spy pytest pytest-timeout networkx tabulate aiohttp \ uvicorn dataclasses pygments werkzeug kubernetes flask grpcio pytest-sugar pytest-rerunfailures pytest-asyncio \ blist scikit-learn numba elif [[ "$LINT" == "1" ]]; then diff --git a/ci/travis/test-wheels.sh b/ci/travis/test-wheels.sh index 1025fb84c..bb714fd53 100755 --- a/ci/travis/test-wheels.sh +++ b/ci/travis/test-wheels.sh @@ -43,12 +43,14 @@ if [[ "$platform" == "linux" ]]; then # Check that ray.__commit__ was set properly. $PYTHON_EXE -u -c "import ray; print(ray.__commit__)" | grep $TRAVIS_COMMIT || (echo "ray.__commit__ not set properly!" && exit 1) + # Install the dependencies to run the tests. + $PIP_CMD install -q aiohttp google grpcio pytest requests + # Run a simple test script to make sure that the wheel works. INSTALLED_RAY_DIRECTORY=$(dirname "$($PYTHON_EXE -u -c "import ray; print(ray.__file__)" | tail -n1)") $PYTHON_EXE "$TEST_SCRIPT" # Run the UI test to make sure that the packaged UI works. - $PIP_CMD install -q aiohttp google grpcio requests $PYTHON_EXE "$UI_TEST_SCRIPT" # Check that the other wheels are present. @@ -82,13 +84,15 @@ elif [[ "$platform" == "macosx" ]]; then # Install the wheel. $PIP_CMD install -q "$PYTHON_WHEEL" + # Install the dependencies to run the tests. + $PIP_CMD install -q aiohttp google grpcio pytest requests + # Run a simple test script to make sure that the wheel works. INSTALLED_RAY_DIRECTORY=$(dirname "$($PYTHON_EXE -u -c "import ray; print(ray.__file__)" | tail -n1)") $PYTHON_EXE "$TEST_SCRIPT" if (( $(echo "$PY_MM >= 3.0" | bc) )); then # Run the UI test to make sure that the packaged UI works. - $PIP_CMD install -q aiohttp google grpcio requests $PYTHON_EXE "$UI_TEST_SCRIPT" fi diff --git a/doc/source/installation.rst b/doc/source/installation.rst index 44a33b52e..18815a1f4 100644 --- a/doc/source/installation.rst +++ b/doc/source/installation.rst @@ -58,24 +58,6 @@ For example, here are the Ray 0.9.0.dev0 wheels for Python 3.5, MacOS for commit pip install https://ray-wheels.s3-us-west-2.amazonaws.com/master/a0ba4499ac645c9d3e82e68f3a281e48ad57f873/ray-0.9.0.dev0-cp35-cp35m-macosx_10_13_intel.whl - -Installing Ray with Anaconda ----------------------------- - -If you use `Anaconda`_ and want to use Ray in a defined environment, e.g, ``ray``, use these commands: - -.. code-block:: bash - - conda create --name ray - conda activate ray - conda install --name ray pip - pip install ray - -Use ``pip list`` to confirm that ``ray`` is installed. - -.. _`Anaconda`: https://www.anaconda.com/ - - Building Ray from Source ------------------------ @@ -87,8 +69,7 @@ both Linux and MacOS. Dependencies ~~~~~~~~~~~~ -To build Ray, first install the following dependencies. We recommend using -`Anaconda`_. +To build Ray, first install the following dependencies. For Ubuntu, run the following commands: @@ -97,11 +78,7 @@ For Ubuntu, run the following commands: sudo apt-get update sudo apt-get install -y build-essential curl unzip psmisc - # If you are not using Anaconda, you need the following. - sudo apt-get install python-dev # For Python 2. - sudo apt-get install python3-dev # For Python 3. - - pip install cython==0.29.0 + pip install cython==0.29.0 pytest For MacOS, run the following commands: @@ -110,13 +87,7 @@ For MacOS, run the following commands: brew update brew install wget - pip install cython==0.29.0 - -If you are using Anaconda, you may also need to run the following. - -.. code-block:: bash - - conda install libgcc + pip install cython==0.29.0 pytest Install Ray @@ -175,6 +146,23 @@ the dashboard. For example, ====================================================================== +Installing Ray with Anaconda +---------------------------- + +If you use `Anaconda`_ and want to use Ray in a defined environment, e.g, ``ray``, use these commands: + +.. code-block:: bash + + conda create --name ray + conda activate ray + conda install --name ray pip + pip install ray + +Use ``pip list`` to confirm that ``ray`` is installed. + +.. _`Anaconda`: https://www.anaconda.com/ + + Docker Source Images -------------------- diff --git a/java/doc/installation.rst b/java/doc/installation.rst index f2cc1c5ef..a956b0044 100644 --- a/java/doc/installation.rst +++ b/java/doc/installation.rst @@ -19,10 +19,6 @@ For Ubuntu users, run the following commands: sudo apt-get update sudo apt-get install -y maven build-essential curl unzip psmisc python # we install python here because python2 is required to build the webui - # If you are not using Anaconda, you need the following. - sudo apt-get install python-dev # For Python 2. - sudo apt-get install python3-dev # For Python 3. - pip install cython==0.29.0 For macOS users, run the following commands: diff --git a/python/ray/__init__.py b/python/ray/__init__.py index 0016465fd..d4664ff5e 100644 --- a/python/ray/__init__.py +++ b/python/ray/__init__.py @@ -41,14 +41,6 @@ if os.path.exists(so_path): import ray._raylet # noqa: E402 -# See https://github.com/ray-project/ray/issues/131. -helpful_message = """ - -If you are using Anaconda, try fixing this problem by running: - - conda install libgcc -""" - from ray._raylet import ( ActorCheckpointID, ActorClassID, diff --git a/python/setup.py b/python/setup.py index a1f209b73..985f4d608 100644 --- a/python/setup.py +++ b/python/setup.py @@ -177,7 +177,6 @@ requires = [ "click", "colorama", "packaging", - "pytest", "pyyaml", "redis>=3.3.2", # NOTE: Don't upgrade the version of six! Doing so causes installation