From ddcbd229ba68e502ced116445dce2808af454331 Mon Sep 17 00:00:00 2001
From: Dmitri Gekhtman <62982571+DmitriGekhtman@users.noreply.github.com>
Date: Tue, 26 Jan 2021 10:29:07 -0800
Subject: [PATCH] Rename the ray.operator module to ray.ray_operator (#13705)

* Rename ray.operator module

* mypy
---
 ci/travis/format.sh                                     | 4 ++--
 python/ray/{operator => ray_operator}/__init__.py       | 0
 python/ray/{operator => ray_operator}/operator.py       | 2 +-
 python/ray/{operator => ray_operator}/operator_utils.py | 0
 python/ray/setup-dev.py                                 | 2 +-
 python/setup.py                                         | 2 +-
 6 files changed, 5 insertions(+), 5 deletions(-)
 rename python/ray/{operator => ray_operator}/__init__.py (100%)
 rename python/ray/{operator => ray_operator}/operator.py (99%)
 rename python/ray/{operator => ray_operator}/operator_utils.py (100%)

diff --git a/ci/travis/format.sh b/ci/travis/format.sh
index 3f4b753f4..bb916869c 100755
--- a/ci/travis/format.sh
+++ b/ci/travis/format.sh
@@ -107,8 +107,8 @@ MYPY_FILES=(
     'autoscaler/node_provider.py'
     'autoscaler/sdk.py'
     'autoscaler/_private/commands.py'
-    'operator/operator.py'
-    'operator/operator_utils.py'
+    'ray_operator/operator.py'
+    'ray_operator/operator_utils.py'
 )
 
 YAPF_EXCLUDES=(
diff --git a/python/ray/operator/__init__.py b/python/ray/ray_operator/__init__.py
similarity index 100%
rename from python/ray/operator/__init__.py
rename to python/ray/ray_operator/__init__.py
diff --git a/python/ray/operator/operator.py b/python/ray/ray_operator/operator.py
similarity index 99%
rename from python/ray/operator/operator.py
rename to python/ray/ray_operator/operator.py
index cf83eaa24..cc03c2fef 100644
--- a/python/ray/operator/operator.py
+++ b/python/ray/ray_operator/operator.py
@@ -9,7 +9,7 @@ import yaml
 from ray._private import services
 from ray.autoscaler._private import commands
 from ray import monitor
-from ray.operator import operator_utils
+from ray.ray_operator import operator_utils
 from ray import ray_constants
 
 
diff --git a/python/ray/operator/operator_utils.py b/python/ray/ray_operator/operator_utils.py
similarity index 100%
rename from python/ray/operator/operator_utils.py
rename to python/ray/ray_operator/operator_utils.py
diff --git a/python/ray/setup-dev.py b/python/ray/setup-dev.py
index 285c0028e..dcbb622ad 100755
--- a/python/ray/setup-dev.py
+++ b/python/ray/setup-dev.py
@@ -66,7 +66,7 @@ if __name__ == "__main__":
     do_link("rllib", force=args.yes, local_path="../../../rllib")
     do_link("tune", force=args.yes)
     do_link("autoscaler", force=args.yes)
-    do_link("operator", force=args.yes)
+    do_link("ray_operator", force=args.yes)
     do_link("cloudpickle", force=args.yes)
     do_link("scripts", force=args.yes)
     do_link("internal", force=args.yes)
diff --git a/python/setup.py b/python/setup.py
index a1542a7a2..e00fcc082 100644
--- a/python/setup.py
+++ b/python/setup.py
@@ -449,7 +449,7 @@ setuptools.setup(
             "ray=ray.scripts.scripts:main",
             "rllib=ray.rllib.scripts:cli [rllib]",
             "tune=ray.tune.scripts:cli",
-            "ray-operator=ray.operator.operator:main",
+            "ray-operator=ray.ray_operator.operator:main",
             "serve=ray.serve.scripts:cli",
         ]
     },