Frame13/ayon-core
1
0
Fork 1
mirror of https://github.com/ynput/ayon-core.git synced 2026-01-01 16:34:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merged in feature/import_adjustments (pull request #395)

Browse source 
cleanup or imports

Approved-by: Milan Kolar <milan@orbi.tools>
This commit is contained in:
Jakub Trllo 2019-12-06 17:14:33 +00:00 • committed by Milan Kolar
commit 432d98b668
13 changed files with 15 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

15
pype/ftrack/actions/action_update_from_v2-2-0.py
View file

@ -1,14 +1,6 @@
import os import os
import sys
import argparse
import logging
import collections
import json
import re
import ftrack_api
from pype.ftrack import BaseAction from pype.ftrack import BaseAction
from avalon import io, inventory, schema
from pype.ftrack.lib.io_nonsingleton import DbConnector from pype.ftrack.lib.io_nonsingleton import DbConnector
@ -134,7 +126,6 @@ class PypeUpdateFromV2_2_0(BaseAction):
"title": title "title": title
} }
def launch(self, session, entities, event): def launch(self, session, entities, event):
if 'values' not in event['data']: if 'values' not in event['data']:
return return
@ -182,7 +173,7 @@ class PypeUpdateFromV2_2_0(BaseAction):
{"type": "asset"}, {"type": "asset"},
{"$unset": {"silo": ""}} {"$unset": {"silo": ""}}
) )
self.log.debug("- setting schema of assets to v.3") self.log.debug("- setting schema of assets to v.3")
self.db_con.update_many( self.db_con.update_many(
{"type": "asset"}, {"type": "asset"},
@ -191,10 +182,8 @@ class PypeUpdateFromV2_2_0(BaseAction):
return True return True
def register(session, plugins_presets={}): def register(session, plugins_presets={}):
"""Register plugin. Called when used as an plugin.""" """Register plugin. Called when used as an plugin."""
if not isinstance(session, ftrack_api.session.Session):
return
PypeUpdateFromV2_2_0(session, plugins_presets).register() PypeUpdateFromV2_2_0(session, plugins_presets).register()

4
pype/lib.py
View file

@ -1,14 +1,12 @@
import os import os
import re import re
import logging import logging
import importlib
import itertools import itertools
import contextlib import contextlib
import subprocess import subprocess
import inspect import inspect
from avalon import io
import avalon.io as io
import avalon.api import avalon.api
import avalon import avalon

5
pype/plugins/aport/publish/collect_context.py
View file

@ -1,9 +1,6 @@
import os import os
import pyblish.api import pyblish.api
from avalon import ( from avalon import api as avalon
io,
api as avalon
)
from pype import api as pype from pype import api as pype
import json import json
from pathlib import Path from pathlib import Path

3
pype/plugins/launcher/actions/Aport.py
View file

@ -1,7 +1,4 @@
import os import os
import sys
from avalon import io
from pprint import pprint
import acre import acre
from avalon import api, lib from avalon import api, lib

3
pype/plugins/launcher/actions/unused/PremierePro.py
View file

@ -1,10 +1,9 @@
import os import os
import sys
from pprint import pprint
import acre import acre
from avalon import api, lib, io from avalon import api, lib, io
import pype.api as pype import pype.api as pype
from pypeapp import Anatomy
class PremierePro(api.Action): class PremierePro(api.Action):

2
pype/plugins/maya/publish/validate_node_ids_in_database.py
View file

@ -1,6 +1,6 @@
import pyblish.api import pyblish.api
import avalon.io as io from avalon import io
import pype.api import pype.api
import pype.maya.action import pype.maya.action

2
pype/plugins/maya/publish/validate_node_ids_related.py
View file

@ -1,7 +1,7 @@
import pyblish.api import pyblish.api
import pype.api import pype.api
import avalon.io as io from avalon import io
import pype.maya.action import pype.maya.action
from pype.maya import lib from pype.maya import lib

2
pype/plugins/nuke/_publish_unused/validate_nuke_settings.py
View file

@ -1,7 +1,7 @@
import nuke import nuke
import os import os
import pyblish.api import pyblish.api
import avalon.io as io from avalon import io
# TODO: add repair function # TODO: add repair function

7
pype/plugins/nuke/load/load_mov.py
View file

@ -1,9 +1,6 @@
import os
import contextlib import contextlib
from avalon import api from avalon import api, io
import avalon.io as io
import nuke import nuke
@ -102,7 +99,7 @@ class LoadMov(api.Loader):
handle_start = version_data.get("handleStart", None) handle_start = version_data.get("handleStart", None)
handle_end = version_data.get("handleEnd", None) handle_end = version_data.get("handleEnd", None)
repr_cont = context["representation"]["context"] repr_cont = context["representation"]["context"]
# fix handle start and end if none are available # fix handle start and end if none are available
if not handle_start and not handle_end: if not handle_start and not handle_end:
handle_start = handles handle_start = handles

5
pype/plugins/nuke/load/load_sequence.py
View file

@ -1,9 +1,6 @@
import os
import contextlib import contextlib
from avalon import api from avalon import api, io
import avalon.io as io
import nuke import nuke

3
pype/setdress_api.py
View file

@ -7,8 +7,7 @@ import copy
from maya import cmds from maya import cmds
from avalon import api from avalon import api, io
import avalon.io as io
from avalon.maya.lib import unique_namespace from avalon.maya.lib import unique_namespace
from pype.maya.lib import matrix_equals from pype.maya.lib import matrix_equals

2
pype/standalonepublish/widgets/widget_component_item.py
View file

@ -2,7 +2,7 @@ import os
from . import QtCore, QtGui, QtWidgets from . import QtCore, QtGui, QtWidgets
from . import SvgButton from . import SvgButton
from . import get_resource from . import get_resource
from avalon import style from pypeapp import style
class ComponentItem(QtWidgets.QFrame): class ComponentItem(QtWidgets.QFrame):

5
pype/tools/assetcreator/widget.py
View file

@ -3,9 +3,8 @@ import contextlib
import collections import collections
from avalon.vendor import qtawesome from avalon.vendor import qtawesome
from avalon.vendor.Qt import QtWidgets, QtCore, QtGui from Qt import QtWidgets, QtCore, QtGui
from avalon import io from avalon import style, io
from avalon import style
from .model import ( from .model import (
TreeModel, TreeModel,