Merge branch 'master' of https://github.com/getavalon/core into fix412

# Conflicts:
#	avalon/tools/workfiles/app.py

Note this changes the fix from getavalon#465 to not store the widgets as explicit variables but by setting the parent widget

Author: BigRoy

avalon/fusion/__init__.py

@@ -18,8 +18,8 @@
 )
 
 from .workio import (
-    open,
-    save,
+    open_file,
+    save_file,
     current_file,
     has_unsaved_changes,
     file_extensions,
@@ -42,8 +42,8 @@
     "comp_lock_and_undo_chunk",
 
     # Workfiles API
-    "open",
-    "save",
+    "open_file",
+    "save_file",
     "current_file",
     "has_unsaved_changes",
     "file_extensions",
@@ -52,3 +52,7 @@
     "maintained_selection"
 
 ]
+
+# Backwards API compatibility
+open = open_file
+save = save_file

avalon/fusion/workio.py

@@ -14,14 +14,14 @@ def has_unsaved_changes():
     return comp.GetAttrs()["COMPB_Modified"]
 
 
-def save(filepath):
+def save_file(filepath):
     from avalon.fusion.pipeline import get_current_comp
 
     comp = get_current_comp()
     comp.Save(filepath)
 
 
-def open(filepath):
+def open_file(filepath):
     # Hack to get fusion, see avalon.fusion.pipeline.get_current_comp()
     fusion = getattr(sys.modules["__main__"], "fusion", None)
 

avalon/houdini/__init__.py

@@ -10,8 +10,8 @@
 )
 
 from .workio import (
-    open,
-    save,
+    open_file,
+    save_file,
     current_file,
     has_unsaved_changes,
     file_extensions,
@@ -38,8 +38,8 @@
     "containerise",
 
     # Workfiles API
-    "open",
-    "save",
+    "open_file",
+    "save_file",
     "current_file",
     "has_unsaved_changes",
     "file_extensions",
@@ -53,3 +53,7 @@
     "maintained_selection",
     "unique_name"
 ]
+
+# Backwards API compatibility
+open = open_file
+save = save_file

avalon/houdini/pipeline.py

@@ -75,6 +75,13 @@ def find_host_config(config):
     return config
 
 
+def get_main_window():
+    """Acquire Houdini's main window"""
+    if self._parent is None:
+        self._parent = hou.ui.mainQtWindow()
+    return self._parent
+
+
 def reload_pipeline(*args):
     """Attempt to reload pipeline at run-time.
 
@@ -116,7 +123,7 @@ def reload_pipeline(*args):
         module = importlib.import_module(module)
         reload(module)
 
-    self._parent = {hou.ui.mainQtWindow().objectName(): hou.ui.mainQtWindow()}
+    get_main_window()
 
     import avalon.houdini
     api.install(avalon.houdini)
@@ -201,12 +208,11 @@ def containerise(name,
     return container
 
 
-def parse_container(container, validate=True):
+def parse_container(container):
     """Return the container node's full container data.
 
     Args:
         container (hou.Node): A container node name.
-        validate(bool): turn the validation for the container on or off
 
     Returns:
         dict: The container schema data for this container node.
@@ -221,9 +227,6 @@ def parse_container(container, validate=True):
     data["objectName"] = container.path()
     data["node"] = container
 
-    if validate:
-        schema.validate(data)
-
     return data
 
 
@@ -321,9 +324,7 @@ def on_file_event_callback(event):
 
 
 def on_houdini_initialize():
-
-    main_window = hou.qt.mainWindow()
-    self._parent = {main_window.objectName(): main_window}
+    get_main_window()
 
 
 def _register_callbacks():

avalon/houdini/workio.py

@@ -12,7 +12,7 @@ def has_unsaved_changes():
     return hou.hipFile.hasUnsavedChanges()
 
 
-def save(filepath):
+def save_file(filepath):
 
     # Force forwards slashes to avoid segfault
     filepath = filepath.replace("\\", "/")
@@ -23,7 +23,7 @@ def save(filepath):
     return filepath
 
 
-def open(filepath):
+def open_file(filepath):
 
     # Force forwards slashes to avoid segfault
     filepath = filepath.replace("\\", "/")

avalon/lib.py

@@ -217,12 +217,13 @@ def launch(executable, args=None, environment=None, cwd=None):
         universal_newlines=True,
     )
 
-    if env.get("CREATE_NEW_CONSOLE"):
+    # this won't do anything on linux/macos as `creationFlags` are
+    # only windows specific.
+    if IS_WIN32 and env.get("CREATE_NEW_CONSOLE"):
         kwargs["creationflags"] = CREATE_NEW_CONSOLE
         kwargs.pop("stdout")
         kwargs.pop("stderr")
     else:
-
         if IS_WIN32:
             kwargs["creationflags"] = CREATE_NO_WINDOW
 

avalon/maya/__init__.py

@@ -27,8 +27,8 @@
 )
 
 from .workio import (
-    open,
-    save,
+    open_file,
+    save_file,
     current_file,
     has_unsaved_changes,
     file_extensions,
@@ -71,8 +71,8 @@
     "lock_ignored",
 
     # Workfiles API
-    "open",
-    "save",
+    "open_file",
+    "save_file",
     "current_file",
     "has_unsaved_changes",
     "file_extensions",
@@ -93,3 +93,7 @@
     "suspended_refresh",
 
 ]
+
+# Backwards API compatibility
+open = open_file
+save = save_file

avalon/maya/commands.py

@@ -33,17 +33,22 @@ def reset_frame_range():
         cmds.warning("No edit information found for %s" % shot["name"])
         return
 
-    fps = {
-        "12": "12fps",
-        "15": "game",
-        "16": "16fps",
-        "24": "film",
-        "25": "pal",
-        "30": "ntsc",
-        "48": "show",
-        "50": "palf",
-        "60": "ntscf"
-    }.get(api.Session.get("AVALON_FPS"), "pal")  # Default to "pal"
+    fps = {15: 'game',
+           24: 'film',
+           25: 'pal',
+           30: 'ntsc',
+           48: 'show',
+           50: 'palf',
+           60: 'ntscf',
+           23.98: '23.976fps',
+           23.976: '23.976fps',
+           29.97: '29.97fps',
+           47.952: '47.952fps',
+           47.95: '47.952fps',
+           59.94: '59.94fps',
+           44100: '44100fps',
+           48000: '48000fps'
+           }.get(float(api.Session.get("AVALON_FPS", 25)), "pal")
 
     cmds.currentUnit(time=fps)
 

avalon/maya/pipeline.py

@@ -5,6 +5,8 @@
 import contextlib
 
 from maya import cmds, OpenMaya
+import maya.utils
+import maya.api.OpenMaya as om
 from pyblish import api as pyblish
 
 from . import lib, compat
@@ -93,6 +95,16 @@ def find_host_config(config):
     return config
 
 
+def get_main_window():
+    """Acquire Maya's main window"""
+    if self._parent is None:
+        self._parent = {
+            widget.objectName(): widget
+            for widget in QtWidgets.QApplication.topLevelWidgets()
+        }["MayaWindow"]
+    return self._parent
+
+
 def uninstall(config):
     """Uninstall Maya-specific functionality of avalon-core.
 
@@ -194,15 +206,20 @@ def deferred():
                       command=interactive.reset_resolution)
 
     # Allow time for uninstallation to finish.
-    QtCore.QTimer.singleShot(100, deferred)
+    # We use Maya's executeDeferred instead of QTimer.singleShot
+    # so that it only gets called after Maya UI has initialized too.
+    # This is crucial with Maya 2020+ which initializes without UI
+    # first as a QCoreApplication
+    maya.utils.executeDeferred(deferred)
 
 
 def launch_workfiles_app(*args):
     workfiles.show(
         os.path.join(
             cmds.workspace(query=True, rootDirectory=True),
             cmds.workspace(fileRuleEntry="scene")
-        )
+        ),
+        parent=self._parent
     )
 
 
@@ -248,18 +265,21 @@ def reload_pipeline(*args):
         module = importlib.import_module(module)
         reload(module)
 
-    self._parent = {
-        widget.objectName(): widget
-        for widget in QtWidgets.QApplication.topLevelWidgets()
-    }["MayaWindow"]
+    get_main_window()
 
     import avalon.maya
     api.install(avalon.maya)
 
 
 def _uninstall_menu():
-    app = QtWidgets.QApplication.instance()
-    widgets = dict((w.objectName(), w) for w in app.allWidgets())
+    
+    # In Maya 2020+ don't use the QApplication.instance()
+    # during startup (userSetup.py) as it will return a
+    # QtCore.QCoreApplication instance which does not have
+    # the allWidgets method. As such, we call the staticmethod.
+    all_widgets = QtWidgets.QApplication.allWidgets()
+    
+    widgets = dict((w.objectName(), w) for w in all_widgets)
     menu = widgets.get(self._menu)
 
     if menu:
@@ -422,7 +442,7 @@ def containerise(name,
     return container
 
 
-def parse_container(container, validate=True):
+def parse_container(container):
     """Return the container node's full container data.
 
     Args:
@@ -440,28 +460,59 @@ def parse_container(container, validate=True):
     # Append transient data
     data["objectName"] = container
 
-    if validate:
-        schema.validate(data)
-
     return data
 
 
 def _ls():
-    containers = list()
-    for identifier in (AVALON_CONTAINER_ID,
-                       "pyblish.mindbender.container"):
-        containers += lib.lsattr("id", identifier)
+    """Yields Avalon container node names.
 
-    return containers
+    Used by `ls()` to retrieve the nodes and then query the full container's
+    data.
+
+    Yields:
+        str: Avalon container node name (objectSet)
+
+    """
+
+    def _maya_iterate(iterator):
+        """Helper to iterate a maya iterator"""
+        while not iterator.isDone():
+            yield iterator.thisNode()
+            iterator.next()
+
+    ids = {AVALON_CONTAINER_ID,
+           # Backwards compatibility
+           "pyblish.mindbender.container"}
+
+    # Iterate over all 'set' nodes in the scene to detect whether
+    # they have the avalon container ".id" attribute.
+    fn_dep = om.MFnDependencyNode()
+    iterator = om.MItDependencyNodes(om.MFn.kSet)
+    for mobject in _maya_iterate(iterator):
+        if mobject.apiTypeStr != "kSet":
+            # Only match by exact type
+            continue
+
+        fn_dep.setObject(mobject)
+        if not fn_dep.hasAttribute("id"):
+            continue
+
+        plug = fn_dep.findPlug("id", True)
+        value = plug.asString()
+        if value in ids:
+            yield fn_dep.name()
 
 
 def ls():
-    """List containers from active Maya scene
+    """Yields containers from active Maya scene
 
     This is the host-equivalent of api.ls(), but instead of listing
     assets on disk, it lists assets already loaded in Maya; once loaded
     they are called 'containers'
 
+    Yields:
+        dict: container
+
     """
     container_names = _ls()
 
@@ -592,10 +643,7 @@ def _on_maya_initialized(*args):
         return
 
     # Keep reference to the main Window, once a main window exists.
-    self._parent = {
-        widget.objectName(): widget
-        for widget in QtWidgets.QApplication.topLevelWidgets()
-    }["MayaWindow"]
+    get_main_window()
 
 
 def _on_scene_new(*args):