Version 3.0.0 (2021-04-01)

README.md

@@ -208,21 +208,10 @@ install it to user data directory (on Windows to `%LOCALAPPDATA%\pypeclub\pype`,
 ### From sources
 Pype can be run directly from sources by activating virtual environment:
 
-**On Windows:**
-```powershell
-.\venv\Scripts\Activate.ps1
-```
-and running:
-```powershell
-python start.py tray
-```
-**On macOS/Linux:**
 ```sh
-source ./venv/bin/activate
-python start.py tray
+poetry run python start.py tray
 ```
 
-
 This will use current Pype version with sources. You can override this with `--use-version=x.x.x` and
 then Pype will try to find locally installed specified version (present in user data directory).
 

pype/__init__.py

@@ -1,19 +1,22 @@
 # -*- coding: utf-8 -*-
 """Pype module."""
 import os
+import platform
 import functools
 import logging
 
 from .settings import get_project_settings
-from .lib import Anatomy, filter_pyblish_plugins
+from .lib import (
+ Anatomy,
+ filter_pyblish_plugins,
+ change_timer_to_current_context
+)
 
 pyblish = avalon = _original_discover = None
 
 log = logging.getLogger(__name__)
 
 
-PROJECT_PLUGINS_PATH = os.environ.get("PYPE_PROJECT_PLUGINS")
-STUDIO_PLUGINS_PATH = os.environ.get("PYPE_STUDIO_PLUGINS")
 PACKAGE_DIR = os.path.dirname(os.path.abspath(__file__))
 PLUGINS_DIR = os.path.join(PACKAGE_DIR, "plugins")
 
@@ -98,40 +101,41 @@ def install():
  pyblish.register_discovery_filter(filter_pyblish_plugins)
  avalon.register_plugin_path(avalon.Loader, LOAD_PATH)
 
- # Register project specific plugins
  project_name = os.environ.get("AVALON_PROJECT")
- if PROJECT_PLUGINS_PATH and project_name:
- for path in PROJECT_PLUGINS_PATH.split(os.pathsep):
- if not path:
- continue
- plugin_path = os.path.join(path, project_name, "plugins")
- if os.path.exists(plugin_path):
- pyblish.register_plugin_path(plugin_path)
- avalon.register_plugin_path(avalon.Loader, plugin_path)
- avalon.register_plugin_path(avalon.Creator, plugin_path)
- avalon.register_plugin_path(
- avalon.InventoryAction, plugin_path
- )
 
  # Register studio specific plugins
- if STUDIO_PLUGINS_PATH and project_name:
- for path in STUDIO_PLUGINS_PATH.split(os.pathsep):
- if not path:
- continue
- if os.path.exists(path):
- pyblish.register_plugin_path(path)
- avalon.register_plugin_path(avalon.Loader, path)
- avalon.register_plugin_path(avalon.Creator, path)
- avalon.register_plugin_path(avalon.InventoryAction, path)
-
  if project_name:
  anatomy = Anatomy(project_name)
  anatomy.set_root_environments()
  avalon.register_root(anatomy.roots)
+
+ project_settings = get_project_settings(project_name)
+ platform_name = platform.system().lower()
+ project_plugins = (
+ project_settings
+ .get("global", {})
+ .get("project_plugins", {})
+ .get(platform_name)
+ ) or []
+ for path in project_plugins:
+ if not path or not os.path.exists(path):
+ continue
+
+ pyblish.register_plugin_path(path)
+ avalon.register_plugin_path(avalon.Loader, path)
+ avalon.register_plugin_path(avalon.Creator, path)
+ avalon.register_plugin_path(avalon.InventoryAction, path)
+
  # apply monkey patched discover to original one
  log.info("Patching discovery")
  avalon.discover = patched_discover
 
+ avalon.on("taskChanged", _on_task_change)
+
+
+def _on_task_change(*args):
+ change_timer_to_current_context()
+
 
 @import_wrapper
 def uninstall():

pype/hooks/pre_global_host_data.py

@@ -32,7 +32,7 @@ def execute(self):
  "project_name": self.data["project_name"],
  "asset_name": self.data["asset_name"],
  "task_name": self.data["task_name"],
- "app_name": app.app_name,
+
  "app": app,
 
  "dbcon": self.data["dbcon"],
@@ -41,7 +41,6 @@ def execute(self):
 
  "anatomy": self.data["anatomy"],
 
- "settings_env": self.data.get("settings_env"),
  "env": self.launch_context.env,
 
  "log": self.log

pype/hooks/pre_python2_vendor.py

@@ -6,7 +6,7 @@ class PrePython2Vendor(PreLaunchHook):
  """Prepend python 2 dependencies for py2 hosts."""
  # WARNING This hook will probably be deprecated in Pype 3 - kept for test
  order = 10
- app_groups = ["hiero", "nuke"]
+ app_groups = ["hiero", "nuke", "nukex"]
 
  def execute(self):
  # Prepare vendor dir path

pype/hosts/blender/hooks/pre_pyside_install.py

@@ -0,0 +1,148 @@
+import os
+import subprocess
+from pype.lib import PreLaunchHook
+
+
+class InstallPySideToBlender(PreLaunchHook):
+ """Install Qt binding to blender's python packages.
+
+ Prelaunch hook does 2 things:
+ 1.) Blender's python packages are pushed to the beginning of PYTHONPATH.
+ 2.) Check if blender has installed PySide2 and will try to install if not.
+
+ For pipeline implementation is required to have Qt binding installed in
+ blender's python packages.
+
+ Prelaunch hook can work only on Windows right now.
+ """
+
+ app_groups = ["blender"]
+ platforms = ["windows"]
+
+ def execute(self):
+ # Prelaunch hook is not crutial
+ try:
+ self.inner_execute()
+ except Exception:
+ self.log.warning(
+ "Processing of {} crashed.".format(self.__class__.__name__),
+ exc_info=True
+ )
+
+ def inner_execute(self):
+ # Get blender's python directory
+ executable = self.launch_context.executable.executable_path
+ # Blender installation contain subfolder named with it's version where
+ # python binaries are stored.
+ version_subfolder = self.launch_context.app_name.split("_")[1]
+ pythond_dir = os.path.join(
+ os.path.dirname(executable),
+ version_subfolder,
+ "python"
+ )
+
+ # Change PYTHONPATH to contain blender's packages as first
+ python_paths = [
+ os.path.join(pythond_dir, "lib"),
+ os.path.join(pythond_dir, "lib", "site-packages"),
+ ]
+ python_path = self.launch_context.env.get("PYTHONPATH") or ""
+ for path in python_path.split(os.pathsep):
+ if path:
+ python_paths.append(path)
+
+ self.launch_context.env["PYTHONPATH"] = os.pathsep.join(python_paths)
+
+ # Get blender's python executable
+ python_executable = os.path.join(pythond_dir, "bin", "python.exe")
+ if not os.path.exists(python_executable):
+ self.log.warning(
+ "Couldn't find python executable for blender. {}".format(
+ executable
+ )
+ )
+ return
+
+ # Check if PySide2 is installed and skip if yes
+ if self.is_pyside_installed(python_executable):
+ return
+
+ # Install PySide2 in blender's python
+ self.install_pyside_windows(python_executable)
+
+ def install_pyside_windows(self, python_executable):
+ """Install PySide2 python module to blender's python.
+
+ Installation requires administration rights that's why it is required
+ to use "pywin32" module which can execute command's and ask for
+ administration rights.
+ """
+ try:
+ import win32api
+ import win32con
+ import win32process
+ import win32event
+ import pywintypes
+ from win32comext.shell.shell import ShellExecuteEx
+ from win32comext.shell import shellcon
+ except Exception:
+ self.log.warning("Couldn't import \"pywin32\" modules")
+ return
+
+ try:
+ # Parameters
+ # - use "-m pip" as module pip to install PySide2 and argument
+ # "--ignore-installed" is to force install module to blender's
+ # site-packages and make sure it is binary compatible
+ parameters = "-m pip install --ignore-installed PySide2"
+
+ # Execute command and ask for administrator's rights
+ process_info = ShellExecuteEx(
+ nShow=win32con.SW_SHOWNORMAL,
+ fMask=shellcon.SEE_MASK_NOCLOSEPROCESS,
+ lpVerb="runas",
+ lpFile=python_executable,
+ lpParameters=parameters,
+ lpDirectory=os.path.dirname(python_executable)
+ )
+ process_handle = process_info["hProcess"]
+ obj = win32event.WaitForSingleObject(
+ process_handle, win32event.INFINITE
+ )
+ returncode = win32process.GetExitCodeProcess(process_handle)
+ if returncode == 0:
+ self.log.info(
+ "Successfully installed PySide2 module to blender."
+ )
+ return
+ except pywintypes.error:
+ pass
+
+ self.log.warning("Failed to instal PySide2 module to blender.")
+
+ def is_pyside_installed(self, python_executable):
+ """Check if PySide2 module is in blender's pip list.
+
+ Check that PySide2 is installed directly in blender's site-packages.
+ It is possible that it is installed in user's site-packages but that
+ may be incompatible with blender's python.
+ """
+ # Get pip list from blender's python executable
+ args = [python_executable, "-m", "pip", "list"]
+ process = subprocess.Popen(args, stdout=subprocess.PIPE)
+ stdout, _ = process.communicate()
+ lines = stdout.decode().split("\r\n")
+ # Second line contain dashes that define maximum length of module name.
+ # Second column of dashes define maximum length of module version.
+ package_dashes, *_ = lines[1].split(" ")
+ package_len = len(package_dashes)
+
+ # Got through printed lines starting at line 3
+ for idx in range(2, len(lines)):
+ line = lines[idx]
+ if not line:
+ continue
+ package_name = line[0:package_len].strip()
+ if package_name.lower() == "pyside2":
+ return True
+ return False

pype/hosts/celaction/api/cli.py

@@ -91,25 +91,12 @@ def main():
  # Registers pype's Global pyblish plugins
  pype.install()
 
- for path in PUBLISH_PATHS:
- path = os.path.normpath(path)
-
- if not os.path.exists(path):
- continue
-
- log.info(f"Registering path: {path}")
- pyblish.api.register_plugin_path(path)
+ if os.path.exists(PUBLISH_PATH):
+ log.info(f"Registering path: {PUBLISH_PATH}")
+ pyblish.api.register_plugin_path(PUBLISH_PATH)
 
  pyblish.api.register_host(publish_host)
 
- # Register project specific plugins
- project_name = os.environ["AVALON_PROJECT"]
- project_plugins_paths = os.getenv("PYPE_PROJECT_PLUGINS", "")
- for path in project_plugins_paths.split(os.pathsep):
- plugin_path = os.path.join(path, project_name, "plugins")
- if os.path.exists(plugin_path):
- pyblish.api.register_plugin_path(plugin_path)
-
  return publish.show()
 
 

pype/hosts/harmony/plugins/publish/collect_farm_render.py

@@ -124,10 +124,16 @@ def get_instances(self, context):
  # TODO: handle pixel aspect and frame step
  # TODO: set Deadline stuff (pools, priority, etc. by presets)
  # because of using 'renderFarm' as a family, replace 'Farm' with
- # capitalized task name
- subset_name = node.split("/")[1].replace(
+ # capitalized task name - issue of avalon-core Creator app
+ subset_name = node.split("/")[1]
+ task_name = context.data["anatomyData"]["task"].capitalize()
+ replace_str = ""
+ if task_name.lower() not in subset_name.lower():
+ replace_str = task_name
+ subset_name = subset_name.replace(
  'Farm',
- context.data["anatomyData"]["task"].capitalize())
+ replace_str)
+
  render_instance = HarmonyRenderInstance(
  version=version,
  time=api.time(),

pype/hosts/houdini/startup/MainMenuCommon.XML

@@ -2,7 +2,7 @@
 <mainMenu>
  <menuBar>
  <subMenu id="avalon_menu">
- <label>Avalon</label>
+ <label>Pype</label>
  <subMenu id="avalon_context">
  <labelExpression><![CDATA[
 from avalon import api
@@ -58,7 +58,7 @@ publish.show(parent)
  <label>Work Files</label>
  <scriptCode><![CDATA[
 import hou, os
-from avalon.tools import workfiles
+from pype.tools import workfiles
 workfiles.show(os.environ["AVALON_WORKDIR"])
  ]]></scriptCode>
  </scriptItem>

pype/hosts/houdini/startup/scripts/123.py

@@ -1,10 +1,10 @@
-from avalon import pipeline, houdini
+from avalon import api, houdini
 import hou
 
 
 def main():
  print("Installing Avalon ...")
- pipeline.install(houdini)
+ api.install(houdini)
 
 
 main()

pype/hosts/maya/api/__init__.py

@@ -12,6 +12,7 @@
 from pyblish import api as pyblish
 from pype.lib import any_outdated
 import pype.hosts.maya
+from pype.hosts.maya.lib import copy_workspace_mel
 from . import menu, lib
 
 log = logging.getLogger("pype.hosts.maya")
@@ -46,6 +47,7 @@ def install():
  avalon.on("new", on_new)
  avalon.before("save", on_before_save)
  avalon.on("taskChanged", on_task_changed)
+ avalon.on("before.workfile.save", before_workfile_save)
 
  log.info("Setting default family states for loader..")
  avalon.data["familiesStateToggled"] = ["imagesequence"]
@@ -203,3 +205,11 @@ def on_task_changed(*args):
  "Context was changed",
  ("Context was changed to {}".format(avalon.Session["AVALON_ASSET"])),
  )
+
+
+def before_workfile_save(workfile_path):
+ if not workfile_path:
+ return
+
+ workdir = os.path.dirname(workfile_path)
+ copy_workspace_mel(workdir)