Raise exception if pyarrow is imported before ray. (ray-project#1283)

* Raise exception if pyarrow is imported before ray. * Pip install pyarrow when building doc so we don't have to mock it. * Raise ImportError instead of Exception.
zzcThomas · Dec 8, 2017 · 5adbdfe · 5adbdfe
1 parent 2e0eb0e
commit 5adbdfe
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/doc/requirements-doc.txt b/doc/requirements-doc.txt
@@ -5,6 +5,7 @@ funcsigs
 mock
 numpy
 opencv-python
+pyarrow
 psutil
 recommonmark
 redis

diff --git a/doc/source/conf.py b/doc/source/conf.py
@@ -32,8 +32,6 @@
                 "tensorflow.python",
                 "tensorflow.python.client",
                 "tensorflow.python.util",
-                "pyarrow",
-                "pyarrow.plasma",
                 "smart_open",
                 "ray.local_scheduler",
                 "ray.plasma",

diff --git a/python/ray/__init__.py b/python/ray/__init__.py
@@ -4,6 +4,12 @@
 
 import os
 import sys
+
+if "pyarrow" in sys.modules:
+    raise ImportError("Ray must be imported before pyarrow because Ray "
+                      "requires a specific version of pyarrow (which is "
+                      "packaged along with Ray).")
+
 # Add the directory containing pyarrow to the Python path so that we find the
 # pyarrow version packaged with ray and not a pre-existing pyarrow.
 pyarrow_path = os.path.join(os.path.abspath(os.path.dirname(__file__)),
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,6 +5,7 @@ funcsigs @@
     mock
     numpy
     opencv-python
+    pyarrow
     psutil
     recommonmark
     redis
@@ Expand Down @@