[dependencies] vendor colorama (#17183)

ci/travis/install-dependencies.sh

@@ -376,7 +376,7 @@ install_dependencies() {
     HOROVOD_WITH_GLOO=1 HOROVOD_WITHOUT_MPI=1 HOROVOD_WITHOUT_MXNET=1 pip install -U git+https://github.com/horovod/horovod.git
   fi
 
-  CC=gcc pip install psutil setproctitle==1.2.2 --target="${WORKSPACE_DIR}/python/ray/thirdparty_files"
+  CC=gcc pip install psutil setproctitle==1.2.2 colorama --target="${WORKSPACE_DIR}/python/ray/thirdparty_files"
 }
 
 install_dependencies "$@"

python/ray/_private/services.py

@@ -17,13 +17,13 @@ import sys
 import time
 from typing import Optional
 
-import colorama
 # Ray modules
 import ray
 import ray.ray_constants as ray_constants
 import redis
 
-# Import psutil after ray so the packaged version is used.
+# Import psutil and colorama after ray so the packaged version is used.
+import colorama
 import psutil
 
 resource = None

python/ray/autoscaler/_private/cli_logger.py

@@ -18,6 +18,8 @@ from typing import Any, Dict, Tuple, Optional, List
 import click
 import warnings
 
+# Import ray first to use the bundled colorama
+import ray  # noqa: F401
 import colorama
 
 

python/ray/exceptions.py

@@ -1,10 +1,9 @@
 import os
 from traceback import format_exception
 
-import colorama
-
 import ray.cloudpickle as pickle
 from ray.core.generated.common_pb2 import RayException, Language, PYTHON
+import colorama
 import setproctitle
 
 

python/ray/util/check_serialize.py

@@ -2,11 +2,14 @@
 from typing import Any, Tuple, Set, Optional
 import inspect
 import ray.cloudpickle as cp
-import colorama
 from contextlib import contextmanager
 
+# Import ray first to use the bundled colorama
+import ray  # noqa: F401
 from ray.util.annotations import DeveloperAPI
 
+import colorama
+
 
 @contextmanager
 def _indent(printer):

python/ray/worker.py

@@ -1,5 +1,4 @@
 from contextlib import contextmanager
-import colorama
 import atexit
 import faulthandler
 import hashlib
@@ -33,6 +32,7 @@ import ray._private.import_thread as import_thread
 from ray.util.tracing.tracing_helper import import_from_string
 from ray.util.annotations import PublicAPI, DeveloperAPI, Deprecated
 import ray
+import colorama
 import setproctitle
 import ray.state
 

python/requirements.txt

@@ -9,7 +9,6 @@ aiohttp==3.7
 aioredis
 click >= 7.0
 cloudpickle
-colorama
 colorful
 filelock
 gpustat

python/setup.py

@@ -191,7 +191,6 @@ if setup_spec.type == SetupType.RAY:
         "aioredis",
         "attrs",
         "click >= 7.0",
-        "colorama",
         "dataclasses; python_version < '3.7'",
         "filelock",
         "grpcio >= 1.28.1",
@@ -328,7 +327,7 @@ def build(build_python, build_java, build_cpp):
     # that certain flags will not be passed along such as --user or sudo.
     # TODO(rkn): Fix this.
     if not os.getenv("SKIP_THIRDPARTY_INSTALL"):
-        pip_packages = ["psutil", "setproctitle==1.2.2"]
+        pip_packages = ["psutil", "setproctitle==1.2.2", "colorama"]
         subprocess.check_call(
             [
                 sys.executable, "-m", "pip", "install", "-q",