Feature/PYPE-762 multi root

docs/source/conf.py

@@ -15,14 +15,11 @@
 # import os
 # import sys
 # sys.path.insert(0, os.path.abspath('.'))
-import sys
 import os
-from pprint import pprint
 from pypeapp.pypeLauncher import PypeLauncher
-from pypeapp.storage import Storage
 from pypeapp.deployment import Deployment
 
-pype_setup = os.getenv('PYPE_ROOT')
+pype_setup = os.getenv('PYPE_SETUP_PATH')
 d = Deployment(pype_setup)
 launcher = PypeLauncher()
 
@@ -32,7 +29,6 @@
 os.environ['TOOL_ENV'] = os.path.normpath(os.path.join(config_path,
  'environments'))
 launcher._add_modules()
-Storage().update_environment()
 launcher._load_default_environments(tools=tools)
 
 # -- Project information -----------------------------------------------------

make_docs.bat

@@ -25,15 +25,15 @@ set PYTHONPATH=%%d;!PYTHONPATH!
 echo ^>^>^> Setting PYPE_CONFIG
 call :ResolvePath pypeconfig "..\pype-config"
 set PYPE_CONFIG=%pypeconfig%
-echo ^>^>^> Setting PYPE_ROOT
+echo ^>^>^> Setting PYPE_SETUP_PATH
 call :ResolvePath pyperoot "..\..\"
-set PYPE_ROOT=%pyperoot%
-set PYTHONPATH=%PYPE_ROOT%;%PYTHONPATH%
+set PYPE_SETUP_PATH=%pyperoot%
+set PYTHONPATH=%PYPE_SETUP_PATH%;%PYTHONPATH%
 echo ^>^>^> Setting PYPE_ENV
 set PYPE_ENV="C:\Users\Public\pype_env2"
 
 call "docs\make.bat" clean
-sphinx-apidoc -M -f -d 6 --ext-autodoc --ext-intersphinx --ext-viewcode -o docs\source pype %PYPE_ROOT%\repos\pype\pype\vendor\*
+sphinx-apidoc -M -f -d 6 --ext-autodoc --ext-intersphinx --ext-viewcode -o docs\source pype %PYPE_SETUP_PATH%\repos\pype\pype\vendor\*
 call "docs\make.bat" html
 echo ^>^>^> Doing cleanup ...
 set PYTHONPATH=%_OLD_PYTHONPATH%

pype/__init__.py

@@ -3,7 +3,7 @@
 from pyblish import api as pyblish
 from avalon import api as avalon
 from .lib import filter_pyblish_plugins
-from pypeapp import config
+from pypeapp import config, Roots
 
 
 import logging
@@ -84,6 +84,9 @@ def install():
  avalon.register_plugin_path(avalon.Loader, plugin_path)
  avalon.register_plugin_path(avalon.Creator, plugin_path)
 
+ if project_name:
+ root_obj = Roots(project_name)
+ avalon.register_root(root_obj.roots)
  # apply monkey patched discover to original one
  avalon.discover = patched_discover
 

pype/clockify/widget_settings.py

@@ -26,7 +26,7 @@ def __init__(self, main_parent=None, parent=None, optional=True):
  elif hasattr(parent, 'parent') and hasattr(parent.parent, 'icon'):
  self.setWindowIcon(self.parent.parent.icon)
  else:
- pype_setup = os.getenv('PYPE_ROOT')
+ pype_setup = os.getenv('PYPE_SETUP_PATH')
  items = [pype_setup, "app", "resources", "icon.png"]
  fname = os.path.sep.join(items)
  icon = QtGui.QIcon(fname)