hotfix/convert old app code to pypeapp

pype/aport/__init__.py

@@ -3,11 +3,11 @@ import sys
 
 from avalon import api as avalon
 from pyblish import api as pyblish
-from app import api as app
+from pypeapp import execute, Logger
 
 from .. import api
 
-log = api.Logger().get_logger(__name__, "aport")
+log = Logger().get_logger(__name__, "aport")
 
 AVALON_CONFIG = os.getenv("AVALON_CONFIG", "pype")
 
@@ -83,7 +83,7 @@ def pico_server_launch():
                 "api"
                 ]
 
-        app.forward(
+        execute(
             args,
             cwd=path
         )

pype/aport/api.py

@@ -15,7 +15,7 @@ from avalon import io
 
 import pyblish.api as pyblish
 
-from app.api import forward
+from pypeapp import execute
 from pype import api as pype
 
 
@@ -70,7 +70,7 @@ def publish(json_data_path, gui):
     log.debug(args)
 
     # start standalone pyblish qml
-    forward([
+    execute([
         sys.executable, "-u"
     ] + args,
         cwd=cwd

pype/aport/original/api.py

@@ -15,7 +15,7 @@ from avalon import io
 
 import pyblish.api as pyblish
 
-from app.api import forward
+from pypeapp import execute
 from pype import api as pype
 
 
@@ -68,7 +68,7 @@ def publish(json_data_path, staging_dir=None):
     log.debug(args)
 
     # start standalone pyblish qml
-    forward([
+    execute([
         sys.executable, "-u"
     ] + args,
         cwd=cwd
@@ -239,8 +239,8 @@ app.register_module(__name__)
 
 # remove all Handlers created by pico
 for name, handler in [(handler.get_name(), handler)
-                      for handler in pype.Logger.logging.root.handlers[:]]:
+                      for handler in Logger().logging.root.handlers[:]]:
     if "pype" not in str(name).lower():
         print(name)
         print(handler)
-        pype.Logger.logging.root.removeHandler(handler)
+        Logger().logging.root.removeHandler(handler)

pype/aport/pipeline.py

@@ -11,7 +11,7 @@ from avalon import io
 
 import pyblish.api as pyblish
 
-from app.api import forward
+from pypeapp import execute
 from pype import api as pype
 
 # remove all Handlers created by pico
@@ -67,7 +67,7 @@ def publish(json_data_path, staging_dir=None):
     log.debug(args)
 
     # start standalone pyblish qml
-    forward([
+    execute([
         sys.executable, "-u"
     ] + args,
         cwd=os.getenv('AVALON_WORKDIR').replace("\\", "/")

pype/clockify/clockify.py

@@ -1,6 +1,6 @@
 import threading
-from app import style
-from app.vendor.Qt import QtWidgets
+from pypeapp import style
+from Qt import QtWidgets
 from pype.clockify import ClockifySettings, ClockifyAPI
 
 

pype/clockify/widget_settings.py

@@ -1,6 +1,6 @@
 import os
-from app.vendor.Qt import QtCore, QtGui, QtWidgets
-from app import style
+from Qt import QtCore, QtGui, QtWidgets
+from pypeapp import style
 
 
 class ClockifySettings(QtWidgets.QWidget):

pype/ftrack/actions/action_djvview.py

@@ -7,7 +7,7 @@ import subprocess
 from operator import itemgetter
 import ftrack_api
 from pype.ftrack import BaseAction
-from app.api import Logger
+from pypeapp import Logger
 from pype import lib as pypelib
 
 

pype/ftrack/actions/action_rv.py

@@ -8,9 +8,9 @@ import logging
 import operator
 import re
 from pype import lib as pypelib
-from app.api import Logger
+from pypeapp import Logger
 
-log = Logger.getLogger(__name__)
+log = Logger().get_logger(__name__)
 
 
 class RVAction(BaseAction):

pype/ftrack/events/event_test.py

@@ -3,7 +3,6 @@ import sys
 import re
 import ftrack_api
 from pype.ftrack import BaseEvent
-from app import api
 
 
 ignore_me = True

pype/lib.py

@@ -420,8 +420,6 @@ def get_avalon_project_template_schema():
 
 
 def get_avalon_project_template():
-    # from app.api import Templates
-
     from pypeapp import Anatomy
 
     """

pype/plugins/global/publish/validate_templates.py

@@ -1,7 +1,4 @@
 import pyblish.api
-from app.api import (
-    Templates
-)
 
 class ValidateTemplates(pyblish.api.ContextPlugin):
     """Check if all templates were filed"""
@@ -14,7 +11,7 @@ class ValidateTemplates(pyblish.api.ContextPlugin):
 
         anatomy = context.data["anatomy"]
         if not anatomy:
-            raise RuntimeError("Did not find templates")
+            raise RuntimeError("Did not find anatomy")
         else:
             data = { "project": {"name": "D001_projectsx",
                                 "code": "prjX"},
@@ -26,7 +23,7 @@ class ValidateTemplates(pyblish.api.ContextPlugin):
 
 
             anatomy = context.data["anatomy"].format(data)
-            self.log.info(anatomy.work.path)
+            self.log.info(anatomy["work"]["path"])
 
             data = { "project": {"name": "D001_projectsy",
                                 "code": "prjY"},
@@ -37,4 +34,4 @@ class ValidateTemplates(pyblish.api.ContextPlugin):
                      "hierarchy": "ep101/sq01/bob"}
 
             anatomy = context.data["anatomy"].format(data)
-            self.log.info(anatomy.work.file)
+            self.log.info(anatomy["work"]["file"])

pype/premiere/__init__.py

@@ -1,18 +1,15 @@
 import os
-import sys
 
 from pysync import walktree
 
 from avalon import api as avalon
 from pyblish import api as pyblish
-from app import api as app
-from pprint import pprint
+from pypeapp import Logger
 from .. import api
 
 import requests
 
-
-log = api.Logger().get_logger(__name__, "premiere")
+log = Logger().get_logger(__name__, "premiere")
 
 AVALON_CONFIG = os.getenv("AVALON_CONFIG", "pype")
 EXTENSIONS_PATH_LOCAL = os.getenv("EXTENSIONS_PATH", None)

pype/widgets/project_settings.py

@@ -1,6 +1,6 @@
 
 
-from app import style
+from pypeapp import style
 from avalon.vendor.Qt import QtCore, QtGui, QtWidgets
 import os
 import getpass
@@ -9,9 +9,6 @@ import platform
 import ftrack_api
 
 
-# object symbol
-
-
 class Project_name_getUI(QtWidgets.QWidget):
     '''
     Project setting ui: here all the neceserry ui widgets are created