diff --git a/pype/hosts/blender/plugins/load/load_action.py b/pype/hosts/blender/plugins/load/load_action.py index 79e42995b3..61dc9ce317 100644 --- a/pype/hosts/blender/plugins/load/load_action.py +++ b/pype/hosts/blender/plugins/load/load_action.py @@ -247,7 +247,7 @@ class BlendActionLoader(pype.hosts.blender.api.plugin.AssetLoader): """Remove an existing container from a Blender scene. Arguments: - container (avalon-core:container-1.0): Container to remove, + container (openpype:container-1.0): Container to remove, from `host.ls()`. Returns: diff --git a/pype/hosts/blender/plugins/load/load_animation.py b/pype/hosts/blender/plugins/load/load_animation.py index a1be6e99ed..53d30d0a66 100644 --- a/pype/hosts/blender/plugins/load/load_animation.py +++ b/pype/hosts/blender/plugins/load/load_animation.py @@ -217,7 +217,7 @@ class BlendAnimationLoader(pype.hosts.blender.api.plugin.AssetLoader): """Remove an existing container from a Blender scene. Arguments: - container (avalon-core:container-1.0): Container to remove, + container (openpype:container-1.0): Container to remove, from `host.ls()`. Returns: diff --git a/pype/hosts/blender/plugins/load/load_camera.py b/pype/hosts/blender/plugins/load/load_camera.py index e6aa11af7e..1e8d4086ac 100644 --- a/pype/hosts/blender/plugins/load/load_camera.py +++ b/pype/hosts/blender/plugins/load/load_camera.py @@ -216,7 +216,7 @@ class BlendCameraLoader(pype.hosts.blender.api.plugin.AssetLoader): """Remove an existing container from a Blender scene. Arguments: - container (avalon-core:container-1.0): Container to remove, + container (openpype:container-1.0): Container to remove, from `host.ls()`. Returns: diff --git a/pype/hosts/blender/plugins/load/load_layout.py b/pype/hosts/blender/plugins/load/load_layout.py index 8d4c9fb75c..cdd5f7db85 100644 --- a/pype/hosts/blender/plugins/load/load_layout.py +++ b/pype/hosts/blender/plugins/load/load_layout.py @@ -251,7 +251,7 @@ class BlendLayoutLoader(plugin.AssetLoader): """Remove an existing container from a Blender scene. Arguments: - container (avalon-core:container-1.0): Container to remove, + container (openpype:container-1.0): Container to remove, from `host.ls()`. Returns: @@ -648,7 +648,7 @@ class UnrealLayoutLoader(plugin.AssetLoader): """Remove an existing container from a Blender scene. Arguments: - container (avalon-core:container-1.0): Container to remove, + container (openpype:container-1.0): Container to remove, from `host.ls()`. Returns: diff --git a/pype/hosts/blender/plugins/load/load_model.py b/pype/hosts/blender/plugins/load/load_model.py index f48c0f8f94..4c6c1a8d7f 100644 --- a/pype/hosts/blender/plugins/load/load_model.py +++ b/pype/hosts/blender/plugins/load/load_model.py @@ -211,7 +211,7 @@ class BlendModelLoader(plugin.AssetLoader): """Remove an existing container from a Blender scene. Arguments: - container (avalon-core:container-1.0): Container to remove, + container (openpype:container-1.0): Container to remove, from `host.ls()`. Returns: diff --git a/pype/hosts/blender/plugins/load/load_rig.py b/pype/hosts/blender/plugins/load/load_rig.py index 1cc722045c..12fca8e4aa 100644 --- a/pype/hosts/blender/plugins/load/load_rig.py +++ b/pype/hosts/blender/plugins/load/load_rig.py @@ -267,7 +267,7 @@ class BlendRigLoader(plugin.AssetLoader): """Remove an existing container from a Blender scene. Arguments: - container (avalon-core:container-1.0): Container to remove, + container (openpype:container-1.0): Container to remove, from `host.ls()`. Returns: diff --git a/pype/hosts/hiero/api/pipeline.py b/pype/hosts/hiero/api/pipeline.py index 26777fa252..6d9f24698e 100644 --- a/pype/hosts/hiero/api/pipeline.py +++ b/pype/hosts/hiero/api/pipeline.py @@ -110,7 +110,7 @@ def containerise(track_item, """ data_imprint = OrderedDict({ - "schema": "avalon-core:container-2.0", + "schema": "openpype:container-2.0", "id": AVALON_CONTAINER_ID, "name": str(name), "namespace": str(namespace), diff --git a/pype/hosts/maya/api/plugin.py b/pype/hosts/maya/api/plugin.py index 81c89017ff..c24cfad2d3 100644 --- a/pype/hosts/maya/api/plugin.py +++ b/pype/hosts/maya/api/plugin.py @@ -256,7 +256,7 @@ class ReferenceLoader(api.Loader): Deprecated; this functionality is replaced by `api.remove()` Arguments: - container (avalon-core:container-1.0): Which container + container (openpype:container-1.0): Which container to remove from scene. """ diff --git a/pype/hosts/resolve/api/pipeline.py b/pype/hosts/resolve/api/pipeline.py index 2d08203650..a130258e37 100644 --- a/pype/hosts/resolve/api/pipeline.py +++ b/pype/hosts/resolve/api/pipeline.py @@ -110,7 +110,7 @@ def containerise(timeline_item, """ data_imprint = OrderedDict({ - "schema": "avalon-core:container-2.0", + "schema": "openpype:container-2.0", "id": AVALON_CONTAINER_ID, "name": str(name), "namespace": str(namespace), diff --git a/pype/hosts/unreal/plugins/load/load_animation.py b/pype/hosts/unreal/plugins/load/load_animation.py index 5e106788ce..18910983ea 100644 --- a/pype/hosts/unreal/plugins/load/load_animation.py +++ b/pype/hosts/unreal/plugins/load/load_animation.py @@ -99,7 +99,7 @@ class AnimationFBXLoader(api.Loader): container=container_name, path=asset_dir) data = { - "schema": "avalon-core:container-2.0", + "schema": "openpype:container-2.0", "id": pipeline.AVALON_CONTAINER_ID, "asset": asset, "namespace": asset_dir, diff --git a/pype/hosts/unreal/plugins/load/load_rig.py b/pype/hosts/unreal/plugins/load/load_rig.py index 56351e388b..7f6e31618a 100644 --- a/pype/hosts/unreal/plugins/load/load_rig.py +++ b/pype/hosts/unreal/plugins/load/load_rig.py @@ -96,7 +96,7 @@ class SkeletalMeshFBXLoader(api.Loader): container=container_name, path=asset_dir) data = { - "schema": "avalon-core:container-2.0", + "schema": "openpype:container-2.0", "id": pipeline.AVALON_CONTAINER_ID, "asset": asset, "namespace": asset_dir, diff --git a/pype/hosts/unreal/plugins/load/load_setdress.py b/pype/hosts/unreal/plugins/load/load_setdress.py index 08330e349b..da302deb1c 100644 --- a/pype/hosts/unreal/plugins/load/load_setdress.py +++ b/pype/hosts/unreal/plugins/load/load_setdress.py @@ -67,7 +67,7 @@ class AnimationCollectionLoader(api.Loader): container=container_name, path=asset_dir) data = { - "schema": "avalon-core:container-2.0", + "schema": "openpype:container-2.0", "id": pipeline.AVALON_CONTAINER_ID, "asset": asset, "namespace": asset_dir, diff --git a/pype/hosts/unreal/plugins/load/load_staticmeshfbx.py b/pype/hosts/unreal/plugins/load/load_staticmeshfbx.py index 149bafcacc..dbea1d5951 100644 --- a/pype/hosts/unreal/plugins/load/load_staticmeshfbx.py +++ b/pype/hosts/unreal/plugins/load/load_staticmeshfbx.py @@ -79,7 +79,7 @@ class StaticMeshFBXLoader(api.Loader): container=container_name, path=asset_dir) data = { - "schema": "avalon-core:container-2.0", + "schema": "openpype:container-2.0", "id": pipeline.AVALON_CONTAINER_ID, "asset": asset, "namespace": asset_dir, diff --git a/pype/modules/ftrack/event_handlers_user/action_store_thumbnails_to_avalon.py b/pype/modules/ftrack/event_handlers_user/action_store_thumbnails_to_avalon.py index 4fbea6b8a5..ac09d0c126 100644 --- a/pype/modules/ftrack/event_handlers_user/action_store_thumbnails_to_avalon.py +++ b/pype/modules/ftrack/event_handlers_user/action_store_thumbnails_to_avalon.py @@ -274,7 +274,7 @@ class StoreThumbnailsToAvalon(BaseAction): thumbnail_entity = { "_id": thumbnail_id, "type": "thumbnail", - "schema": "pype:thumbnail-1.0", + "schema": "openpype:thumbnail-1.0", "data": { "template": thumbnail_template, "template_data": template_data diff --git a/pype/modules/ftrack/lib/avalon_sync.py b/pype/modules/ftrack/lib/avalon_sync.py index 43e02283c2..bbc01d6b66 100644 --- a/pype/modules/ftrack/lib/avalon_sync.py +++ b/pype/modules/ftrack/lib/avalon_sync.py @@ -31,9 +31,9 @@ log = Logger.get_logger(__name__) # Current schemas for avalon types EntitySchemas = { - "project": "pype:project-3.0", - "asset": "pype:asset-3.0", - "config": "pype:config-2.0" + "project": "openpype:project-3.0", + "asset": "openpype:asset-3.0", + "config": "openpype:config-2.0" } # Group name of custom attributes diff --git a/pype/plugins/publish/extract_hierarchy_avalon.py b/pype/plugins/publish/extract_hierarchy_avalon.py index 74751c6807..dd1f09bafa 100644 --- a/pype/plugins/publish/extract_hierarchy_avalon.py +++ b/pype/plugins/publish/extract_hierarchy_avalon.py @@ -2,6 +2,7 @@ import pyblish.api from avalon import io from copy import deepcopy + class ExtractHierarchyToAvalon(pyblish.api.ContextPlugin): """Create entities in Avalon based on collected data.""" @@ -148,7 +149,7 @@ class ExtractHierarchyToAvalon(pyblish.api.ContextPlugin): # Unarchived asset should not use same data new_entity = { "_id": entity["_id"], - "schema": "avalon-core:asset-3.0", + "schema": "openpype:asset-3.0", "name": entity["name"], "parent": self.project["_id"], "type": "asset", @@ -162,7 +163,7 @@ class ExtractHierarchyToAvalon(pyblish.api.ContextPlugin): def create_avalon_asset(self, name, data): item = { - "schema": "avalon-core:asset-3.0", + "schema": "openpype:asset-3.0", "name": name, "parent": self.project["_id"], "type": "asset", diff --git a/pype/plugins/publish/integrate_master_version.py b/pype/plugins/publish/integrate_master_version.py index 7709f089fe..ec836954e8 100644 --- a/pype/plugins/publish/integrate_master_version.py +++ b/pype/plugins/publish/integrate_master_version.py @@ -168,7 +168,7 @@ class IntegrateHeroVersion(pyblish.api.InstancePlugin): "version_id": src_version_entity["_id"], "parent": src_version_entity["parent"], "type": "hero_version", - "schema": "pype:hero_version-1.0" + "schema": "openpype:hero_version-1.0" } schema.validate(new_hero_version) diff --git a/pype/plugins/publish/integrate_new.py b/pype/plugins/publish/integrate_new.py index d4a094a975..d342ba2e39 100644 --- a/pype/plugins/publish/integrate_new.py +++ b/pype/plugins/publish/integrate_new.py @@ -501,7 +501,7 @@ class IntegrateAssetNew(pyblish.api.InstancePlugin): data.update({'path': dst, 'template': template}) representation = { "_id": repre_id, - "schema": "pype:representation-2.0", + "schema": "openpype:representation-2.0", "type": "representation", "parent": version_id, "name": repre['name'], @@ -685,7 +685,7 @@ class IntegrateAssetNew(pyblish.api.InstancePlugin): families.append(_family) _id = io.insert_one({ - "schema": "pype:subset-3.0", + "schema": "openpype:subset-3.0", "type": "subset", "name": subset_name, "data": { @@ -726,7 +726,7 @@ class IntegrateAssetNew(pyblish.api.InstancePlugin): dict: collection of data to create a version """ - return {"schema": "pype:version-3.0", + return {"schema": "openpype:version-3.0", "type": "version", "parent": subset["_id"], "name": version_number, diff --git a/pype/plugins/publish/integrate_thumbnail.py b/pype/plugins/publish/integrate_thumbnail.py index 23d2da5f4b..28a93efb9a 100644 --- a/pype/plugins/publish/integrate_thumbnail.py +++ b/pype/plugins/publish/integrate_thumbnail.py @@ -130,7 +130,7 @@ class IntegrateThumbnails(pyblish.api.InstancePlugin): thumbnail_entity = { "_id": thumbnail_id, "type": "thumbnail", - "schema": "pype:thumbnail-1.0", + "schema": "openpype:thumbnail-1.0", "data": { "template": thumbnail_template, "template_data": repre_context diff --git a/pype/tests/test_mongo_performance.py b/pype/tests/test_mongo_performance.py index ea5ea90aae..cd606d6483 100644 --- a/pype/tests/test_mongo_performance.py +++ b/pype/tests/test_mongo_performance.py @@ -108,7 +108,7 @@ class TestPerformance(): "template": "{root}\\{project[name]}\\{hierarchy}\\{asset}\\publish\\{family}\\{subset}\\v{version:0>3}\\{project[code]}_{asset}_{subset}_v{version:0>3}<_{output}><.{frame:0>4}>.{representation}" }, "type": "representation", - "schema": "pype:representation-2.0" + "schema": "openpype:representation-2.0" } insert_recs.append(document) diff --git a/pype/tools/assetcreator/app.py b/pype/tools/assetcreator/app.py index f025af9662..366bb8be08 100644 --- a/pype/tools/assetcreator/app.py +++ b/pype/tools/assetcreator/app.py @@ -396,7 +396,7 @@ class Window(QtWidgets.QDialog): new_asset_info = { 'parent': av_project['_id'], 'name': name, - 'schema': "avalon-core:asset-3.0", + 'schema': "openpype:asset-3.0", 'type': 'asset', 'data': new_asset_data }