Including psutil & setproctitle (#7031)

python/setup.py

@@ -73,8 +73,8 @@ if "RAY_USE_NEW_GCS" in os.environ and os.environ["RAY_USE_NEW_GCS"] == "on":
     ]
 
 extras = {
-    "debug": ["psutil", "setproctitle", "py-spy >= 0.2.0"],
-    "dashboard": ["aiohttp", "google", "grpcio", "psutil", "setproctitle"],
+    "debug": [],
+    "dashboard": [],
     "serve": ["uvicorn", "pygments", "werkzeug", "flask", "pandas", "blist"],
     "tune": ["tabulate", "tensorboardX"],
 }
@@ -104,19 +104,16 @@ class build_ext(_build_ext.build_ext):
 
         # We also need to install pyarrow along with Ray, so make sure that the
         # relevant non-Python pyarrow files get copied.
-        pyarrow_files = []
-        for (root, dirs, filenames) in os.walk("./ray/pyarrow_files/pyarrow"):
-            for name in filenames:
-                pyarrow_files.append(os.path.join(root, name))
+        pyarrow_files = self.walk_directory("./ray/pyarrow_files/pyarrow")
 
         # We also need to install pickle5 along with Ray, so make sure that the
         # relevant non-Python pickle5 files get copied.
-        pickle5_files = []
-        for (root, dirs, filenames) in os.walk("./ray/pickle5_files/pickle5"):
-            for name in filenames:
-                pickle5_files.append(os.path.join(root, name))
+        pickle5_files = self.walk_directory("./ray/pickle5_files/pickle5")
 
-        files_to_include = ray_files + pyarrow_files + pickle5_files
+        thirdparty_files = self.walk_directory("./ray/thirdparty_files")
+
+        files_to_include = ray_files + pyarrow_files + pickle5_files + \
+            thirdparty_files
 
         # Copy over the autogenerated protobuf Python bindings.
         for directory in generated_python_directories:
@@ -135,6 +132,13 @@ class build_ext(_build_ext.build_ext):
                 print("Failed to copy optional file {}. This is ok."
                       .format(filename))
 
+    def walk_directory(self, directory):
+        file_list = []
+        for (root, dirs, filenames) in os.walk(directory):
+            for name in filenames:
+                file_list.append(os.path.join(root, name))
+        return file_list
+
     def move_file(self, filename):
         # TODO(rkn): This feels very brittle. It may not handle all cases. See
         # https://github.com/apache/arrow/blob/master/python/setup.py for an
@@ -183,6 +187,10 @@ requires = [
     "faulthandler;python_version<'3.3'",
     "protobuf >= 3.8.0",
     "cloudpickle",
+    "py-spy >= 0.2.0",
+    "aiohttp",
+    "google",
+    "grpcio"
 ]
 
 setup(