change logger imports

pype/api.py

@@ -15,7 +15,7 @@ from .action import (
     RepairContextAction
 )
 
-from pypeapp.api import Logger
+from pypeapp import Logger
 
 from . import (
     Anatomy,

pype/avalon_apps/avalon_app.py

@@ -2,7 +2,7 @@ import os
 import argparse
 from Qt import QtGui, QtWidgets
 from avalon.tools import libraryloader
-from pypeapp.api import Logger
+from pypeapp import Logger
 from avalon import io
 from launcher import launcher_widget, lib as launcher_lib
 

pype/ftrack/actions/action_application_loader.py

@@ -2,7 +2,7 @@ import toml
 import time
 from pype.ftrack import AppAction
 from avalon import lib
-from pypeapp.api import Logger
+from pypeapp import Logger
 from pype import lib as pypelib
 
 log = Logger().get_logger(__name__)

pype/ftrack/actions/action_create_cust_attrs.py

@@ -6,7 +6,7 @@ import arrow
 import logging
 from pype.vendor import ftrack_api
 from pype.ftrack import BaseAction, get_ca_mongoid
-from pypeapp.lib.config import get_presets
+from pypeapp.config import get_presets
 
 """
 This action creates/updates custom attributes.

pype/ftrack/ftrack_server/event_server_cli.py

@@ -1,9 +1,9 @@
 import sys
 from pype.ftrack import credentials
 from pype.ftrack.ftrack_server import FtrackServer
-from pypeapp import api
+from pypeapp import Logger
 
-log = api.Logger().get_logger(__name__, "ftrack-event-server-cli")
+log = Logger().get_logger(__name__, "ftrack-event-server-cli")
 
 possible_yes = ['y', 'yes']
 possible_no = ['n', 'no']

pype/ftrack/ftrack_server/ftrack_server.py

@@ -5,7 +5,7 @@ import importlib
 from pype.vendor import ftrack_api
 import time
 import logging
-from pypeapp.api import Logger
+from pypeapp import Logger
 
 log = Logger().get_logger(__name__)
 

pype/ftrack/lib/avalon_sync.py

@@ -8,7 +8,7 @@ import avalon
 import avalon.api
 from avalon import schema
 from avalon.vendor import toml, jsonschema
-from pypeapp.api import Logger
+from pypeapp import Logger
 
 ValidationError = jsonschema.ValidationError
 

pype/ftrack/lib/ftrack_app_handler.py

@@ -8,6 +8,8 @@ from pype import lib as pypelib
 from .avalon_sync import get_config_data
 from .ftrack_base_handler import BaseHandler
 
+from pypeapp import Anatomy
+
 
 class AppAction(BaseHandler):
     '''Custom Action base class
@@ -169,7 +171,8 @@ class AppAction(BaseHandler):
         os.environ["AVALON_APP"] = self.identifier.split("_")[0]
         os.environ["AVALON_APP_NAME"] = self.identifier
 
-        anatomy = pype.Anatomy
+        anatomy = Anatomy(project_name=project_name)
+
         hierarchy = ""
         parents = database[project_name].find_one({
             "type": 'asset',
@@ -179,20 +182,21 @@ class AppAction(BaseHandler):
         if parents:
             hierarchy = os.path.join(*parents)
 
-        data = {"project": {"name": entity['project']['full_name'],
+        data = {
+                "root": {"work": os.environ.get("PYPE_STUDIO_PROJECTS_PATH")},
+                "project": {"name": entity['project']['full_name'],
                             "code": entity['project']['name']},
                 "task": entity['name'],
                 "asset": entity['parent']['name'],
                 "hierarchy": hierarchy}
         try:
-            anatomy = anatomy.format(data)
+            anatomy_filled = anatomy.format(data)
+            # anatomy = anatomy.format(data)
         except Exception as e:
             self.log.error(
                 "{0} Error in anatomy.format: {1}".format(__name__, e)
             )
-        os.environ["AVALON_WORKDIR"] = os.path.join(
-            anatomy.work.root, anatomy.work.folder
-        )
+        os.environ["AVALON_WORKDIR"] = anatomy_filled['work']['folder']
 
         # collect all parents from the task
         parents = []
@@ -210,13 +214,22 @@ class AppAction(BaseHandler):
         tools_env = acre.get_tools(tools_attr)
         env = acre.compute(tools_env)
         env = acre.merge(env, current_env=dict(os.environ))
+        env = acre.append(dict(os.environ), env)
+
+
+        # 
+        # tools_env = acre.get_tools(tools)
+        # env = acre.compute(dict(tools_env))
+        # env = acre.merge(env, dict(os.environ))
+        # os.environ = acre.append(dict(os.environ), env)
+        # os.environ = acre.compute(os.environ)
 
         # Get path to execute
-        st_temp_path = os.environ['PYPE_STUDIO_TEMPLATES']
+        st_temp_path = os.environ['PYPE_CONFIG']
         os_plat = platform.system().lower()
 
         # Path to folder with launchers
-        path = os.path.join(st_temp_path, 'bin', os_plat)
+        path = os.path.join(st_temp_path, 'launchers', os_plat)
         # Full path to executable launcher
         execfile = None
 
@@ -321,6 +334,8 @@ class AppAction(BaseHandler):
 
         # Set origin avalon environments
         for key, value in env_origin.items():
+            if value == None:
+                value = ""
             os.environ[key] = value
 
         return {

pype/plugins/launcher/actions/Aport.py

@@ -9,7 +9,7 @@ import pype.api as pype
 
 from pype.api import Logger
 
-log = Logger.getLogger(__name__, "aport")
+log = Logger().get_logger(__name__, "aport")
 
 
 class Aport(api.Action):

pype/plugins/launcher/actions/AssetCreator.py

@@ -7,7 +7,7 @@ from pype.tools import assetcreator
 
 from pype.api import Logger
 
-log = Logger.getLogger(__name__, "aport")
+log = Logger().get_logger(__name__, "asset_creator")
 
 
 class AssetCreator(api.Action):

pype/templates.py

@@ -4,9 +4,8 @@ from avalon import io
 from avalon import api as avalon
 from . import lib
 # from pypeapp.api import (Templates, Logger, format)
-from pypeapp.api import Logger
-log = Logger().get_logger(__name__,
-                       os.getenv("AVALON_APP", "pype-config"))
+from pypeapp import Logger
+log = Logger().get_logger(__name__, os.getenv("AVALON_APP", "pype-config"))
 
 SESSION = None