Fix #364: Make cbloader and cbsceneinventory the new defaults

avalon/__main__.py

@@ -9,8 +9,8 @@
                         help="Launch Instance Creator in standalone mode")
     parser.add_argument("--loader", action="store_true",
                         help="Launch Asset Loader in standalone mode")
-    parser.add_argument("--manager", action="store_true",
-                        help="Launch Manager in standalone mode")
+    parser.add_argument("--sceneinventory", action="store_true",
+                        help="Launch Scene Inventory in standalone mode")
     parser.add_argument("--projectmanager", action="store_true",
                         help="Launch Manager in standalone mode")
     parser.add_argument("--root",
@@ -28,9 +28,9 @@
         from .tools import loader
         loader.show(debug=True)
 
-    elif args.manager:
-        from .tools import manager
-        manager.show(debug=True)
+    elif args.sceneinventory:
+        from .tools import sceneinventory
+        sceneinventory.show(debug=True)
 
     elif args.projectmanager:
         from .tools import projectmanager

avalon/houdini/pipeline.py

@@ -91,19 +91,17 @@ def reload_pipeline(*args):
 
                    "avalon.houdini.pipeline",
                    "avalon.houdini.lib",
-                   "avalon.tools.loader.app",
                    "avalon.tools.creator.app",
-                   "avalon.tools.manager.app",
 
                    # NOTE(marcus): These have circular depenendencies
                    #               that is preventing reloadability
-                   # "avalon.tools.cbloader.delegates",
-                   # "avalon.tools.cbloader.model",
-                   # "avalon.tools.cbloader.widgets",
-                   # "avalon.tools.cbloader.app",
-                   # "avalon.tools.cbsceneinventory.model",
-                   # "avalon.tools.cbsceneinventory.proxy",
-                   # "avalon.tools.cbsceneinventory.app",
+                   # "avalon.tools.loader.delegates",
+                   # "avalon.tools.loader.model",
+                   # "avalon.tools.loader.widgets",
+                   # "avalon.tools.loader.app",
+                   # "avalon.tools.sceneinventory.model",
+                   # "avalon.tools.sceneinventory.proxy",
+                   # "avalon.tools.sceneinventory.app",
                    # "avalon.tools.projectmanager.dialogs",
                    # "avalon.tools.projectmanager.lib",
                    # "avalon.tools.projectmanager.model",

avalon/maya/compat.py

@@ -18,7 +18,7 @@ def remove_googleapiclient():
     """Check if the compatibility must be maintained
 
     The Maya 2018 version tries to import the `http` module from
-    Maya2018\plug-ins\MASH\scripts\googleapiclient\http.py in stead of the
+    Maya2018/plug-ins/MASH/scripts/googleapiclient/http.py in stead of the
     module from six.py. This import conflict causes a crash Avalon's publisher.
     This is due to Autodesk adding paths to the PYTHONPATH environment variable
     which contain modules instead of only packages.
@@ -92,7 +92,7 @@ def load(Loader,
         suffix="_",
     )
 
-    # TODO(roy): add compatibility check, see `tools.cbloader.lib`
+    # TODO(roy): add compatibility check, see `tools.loader.lib`
 
     Loader.log.info(
         "Running '%s' on '%s'" % (Loader.__name__, asset["name"])

avalon/maya/pipeline.py

@@ -115,8 +115,7 @@ def _install_menu():
         creator,
         loader,
         publish,
-        cbloader,
-        cbsceneinventory,
+        sceneinventory,
         contextmanager
     )
 
@@ -153,22 +152,16 @@ def deferred():
         cmds.menuItem("Create...",
                       command=lambda *args: creator.show(parent=self._parent))
 
-        if api.Session.get("AVALON_EARLY_ADOPTER"):
-            cmds.menuItem("Load...",
-                          command=lambda *args:
-                          cbloader.show(parent=self._parent,
-                                        use_context=True))
-        else:
-            cmds.menuItem("Load...",
-                          command=lambda *args:
-                          loader.show(parent=self._parent))
+        cmds.menuItem("Load...",
+                      command=lambda *args: loader.show(parent=self._parent,
+                                                        use_context=True))
 
         cmds.menuItem("Publish...",
                       command=lambda *args: publish.show(parent=self._parent),
                       image=publish.ICON)
 
         cmds.menuItem("Manage...",
-                      command=lambda *args: cbsceneinventory.show(
+                      command=lambda *args: sceneinventory.show(
                           parent=self._parent))
 
         cmds.menuItem(divider=True)
@@ -221,19 +214,17 @@ def reload_pipeline(*args):
                    "avalon.maya.interactive",
                    "avalon.maya.pipeline",
                    "avalon.maya.lib",
-                   "avalon.tools.loader.app",
                    "avalon.tools.creator.app",
-                   "avalon.tools.manager.app",
 
                    # NOTE(marcus): These have circular depenendencies
                    #               that is preventing reloadability
-                   # "avalon.tools.cbloader.delegates",
-                   # "avalon.tools.cbloader.model",
-                   # "avalon.tools.cbloader.widgets",
-                   # "avalon.tools.cbloader.app",
-                   # "avalon.tools.cbsceneinventory.model",
-                   # "avalon.tools.cbsceneinventory.proxy",
-                   # "avalon.tools.cbsceneinventory.app",
+                   # "avalon.tools.loader.delegates",
+                   # "avalon.tools.loader.model",
+                   # "avalon.tools.loader.widgets",
+                   # "avalon.tools.loader.app",
+                   # "avalon.tools.sceneinventory.model",
+                   # "avalon.tools.sceneinventory.proxy",
+                   # "avalon.tools.sceneinventory.app",
                    # "avalon.tools.projectmanager.dialogs",
                    # "avalon.tools.projectmanager.lib",
                    # "avalon.tools.projectmanager.model",