Fix documentation building with psutil issue (#7077)

python/ray/test_utils.py

@@ -6,10 +6,10 @@ import sys
 import tempfile
 import time
 
-import psutil
-
 import ray
 
+import psutil  # We must import psutil after ray because we bundle it with ray.
+
 
 class RayTestTimeoutException(Exception):
     """Exception used to identify timeouts from test utilities."""

python/ray/tests/test_metrics.py

@@ -1,7 +1,6 @@
 import os
 import json
 import grpc
-import psutil
 import pytest
 import requests
 import time
@@ -14,6 +13,8 @@ from ray.core.generated import reporter_pb2_grpc
 from ray.test_utils import (RayTestTimeoutException,
                             wait_until_succeeded_without_exception)
 
+import psutil  # We must import psutil after ray because we bundle it with ray.
+
 
 def test_worker_stats(shutdown_only):
     addresses = ray.init(num_cpus=1, include_webui=True)