Merge branch 'release/2.5-pype'

Author: mkolar

.flake8

@@ -0,0 +1,2 @@
+[flake8]
+ignore = BLK100

.hound.yml

@@ -1,4 +1,8 @@
 python:
   enabled: true
 
+flake8:
+  enabled: true
+  config_file: .flake8
+
 fail_on_violations: true

Dockerfile-maya2016

@@ -5,7 +5,7 @@ RUN wget https://bootstrap.pypa.io/get-pip.py && \
 	mayapy -m pip install \
 		nose \
 		nose-exclude \
-		coverage \
+		coverage==4.5.4 \
 		pyblish-base==1.4.2 \
 		pyblish-maya \
 		pymongo \

avalon/fusion/pipeline.py

@@ -2,10 +2,12 @@
 import contextlib
 import importlib
 import logging
-from pyblish import api as pyblish
-from avalon import api as avalon
 
+import pyblish.api
+
+from .. import api
 from ..pipeline import AVALON_CONTAINER_ID
+from ..lib import find_submodule
 
 
 class CompLogHandler(logging.Handler):
@@ -23,32 +25,30 @@ def ls():
     assets on disk, it lists assets already loaded in Fusion; once loaded
     they are called 'containers'
 
+    Yields:
+        dict: container
+
     """
 
     comp = get_current_comp()
     tools = comp.GetToolList(False, "Loader").values()
+
+    has_metadata_collector = False
+    config_host = find_submodule(api.registered_config(), "fusion")
+    if hasattr(config_host, "collect_container_metadata"):
+        has_metadata_collector = True
+
     for tool in tools:
         container = parse_container(tool)
         if container:
-            # Collect custom data if attribute is present
-            config = find_host_config(avalon.registered_config())
-            if hasattr(config, "collect_container_metadata"):
-                metadata = config.collect_container_metadata(container)
+
+            if has_metadata_collector:
+                metadata = config_host.collect_container_metadata(container)
                 container.update(metadata)
 
             yield container
 
 
-def find_host_config(config):
-    config_name = config.__name__
-    try:
-        config = importlib.import_module(config_name + ".fusion")
-    except ImportError:
-        pass
-
-    return config
-
-
 def install(config):
     """Install Fusion-specific functionality of avalon-core.
 
@@ -60,7 +60,7 @@ def install(config):
     # TODO: Set project
     # TODO: Install Fusion menu (this is done with config .fu script actually)
 
-    pyblish.register_host("fusion")
+    pyblish.api.register_host("fusion")
 
     # Remove all handlers associated with the root logger object, because
     # that one sometimes logs as "warnings" incorrectly.
@@ -75,10 +75,18 @@ def install(config):
     logger.addHandler(handler)
     logger.setLevel(logging.DEBUG)
 
-    # Trigger install on the config's "fusion" package
-    config = find_host_config(config)
-    if hasattr(config, "install"):
-        config.install()
+
+def uninstall(config):
+    """Uninstall Fusion-specific functionality of avalon-core.
+
+    This function is called automatically on calling `api.uninstall()`.
+
+    Args:
+        config: configuration module
+
+    """
+
+    pyblish.api.deregister_host("fusion")
 
 
 def imprint_container(tool,

avalon/houdini/lib.py

@@ -62,8 +62,8 @@ def imprint(node, data):
 
 
 def lsattr(attr, value=None):
-    nodes = list(hou.node("/obj").allNodes())
     if value is None:
+        nodes = list(hou.node("/obj").allNodes())
         return [n for n in nodes if n.parm(attr)]
     return lsattrs({attr: value})
 

avalon/houdini/pipeline.py

@@ -10,8 +10,8 @@
 
 # Local libraries
 from . import lib
-from ..lib import logger
-from avalon import api, schema
+from ..lib import logger, find_submodule
+from .. import api
 
 from ..pipeline import AVALON_CONTAINER_ID
 
@@ -39,10 +39,6 @@ def install(config):
 
     self._has_been_setup = True
 
-    config = find_host_config(config)
-    if hasattr(config, "install"):
-        config.install()
-
 
 def uninstall(config):
     """Uninstall Houdini-specific functionality of avalon-core.
@@ -54,27 +50,11 @@ def uninstall(config):
 
     """
 
-    config = find_host_config(config)
-    if hasattr(config, "uninstall"):
-        config.uninstall()
-
     pyblish.api.deregister_host("hython")
     pyblish.api.deregister_host("hpython")
     pyblish.api.deregister_host("houdini")
 
 
-def find_host_config(config):
-    config_name = config.__name__
-    try:
-        config = importlib.import_module(config_name + ".houdini")
-    except ImportError as exc:
-        if str(exc) != "No module name {}".format(config_name + ".houdini"):
-            raise
-        config = None
-
-    return config
-
-
 def get_main_window():
     """Acquire Houdini's main window"""
     if self._parent is None:
@@ -89,8 +69,6 @@ def reload_pipeline(*args):
 
     """
 
-    import importlib
-
     api.uninstall()
 
     for module in ("avalon.io",
@@ -236,13 +214,17 @@ def ls():
                        "pyblish.mindbender.container"):
         containers += lib.lsattr("id", identifier)
 
+    has_metadata_collector = False
+    config_host = find_submodule(api.registered_config(), "houdini")
+    if hasattr(config_host, "collect_container_metadata"):
+        has_metadata_collector = True
+
     for container in sorted(containers):
         data = parse_container(container)
 
         # Collect custom data if attribute is present
-        config = find_host_config(api.registered_config())
-        if hasattr(config, "collect_container_metadata"):
-            metadata = config.collect_container_metadata(container)
+        if has_metadata_collector:
+            metadata = config_host.collect_container_metadata(container)
             data.update(metadata)
 
         yield data

avalon/lib.py

@@ -5,6 +5,7 @@
 import json
 import logging
 import datetime
+import importlib
 import subprocess
 import types
 
@@ -236,7 +237,7 @@ def modules_from_path(path):
     """Get python scripts as modules from a path.
 
     Arguments:
-        path (str): Path to python scrips.
+        path (str): Path to folder containing python scripts.
 
     Returns:
         List of modules.
@@ -275,9 +276,30 @@ def modules_from_path(path):
             sys.modules[mod_name] = module
 
         except Exception as err:
-            print("Skipped: \"%s\" (%s)", mod_name, err)
+            print("Skipped: \"{0}\" ({1})".format(mod_name, err))
             continue
 
         modules.append(module)
 
     return modules
+
+
+def find_submodule(module, submodule):
+    """Find and return submodule of the module.
+
+    Args:
+        module (types.ModuleType): The module to search in.
+        submodule (str): The submodule name to find.
+
+    Returns:
+        types.ModuleType or None: The module, if found.
+
+    """
+    name = "{0}.{1}".format(module.__name__, submodule)
+    try:
+        return importlib.import_module(name)
+    except ImportError as exc:
+        if str(exc) != "No module name {}".format(name):
+            log_.warning("Could not find '%s' in module: %s",
+                         submodule,
+                         module)

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)