Merge pull request #974 from pypeclub/feature/ftrack_plugins_in_module

Ftrack plugins in ftrack module
ynput · Feb 4, 2021 · 48e72b6 · 48e72b6
2 parents a1a203d + 8d80324
commit 48e72b6
Show file tree

Hide file tree

Showing 11 changed files with 2 additions and 2 deletions.
diff --git a/pype/modules/ftrack/ftrack_module.py b/pype/modules/ftrack/ftrack_module.py
@@ -63,7 +63,7 @@ def get_global_environments(self):
     def get_plugin_paths(self):
         """Ftrack plugin paths."""
         return {
-            "publish": [os.path.join(pype.PLUGINS_DIR, "ftrack", "publish")]
+            "publish": [os.path.join(FTRACK_MODULE_DIR, "plugins", "publish")]
         }
 
     def get_launch_hook_paths(self):

diff --git a/...used_publish/integrate_ftrack_comments.py → ...used_publish/integrate_ftrack_comments.py b/...used_publish/integrate_ftrack_comments.py → ...used_publish/integrate_ftrack_comments.py
diff --git a/...gins/ftrack/publish/collect_ftrack_api.py → ...ack/plugins/publish/collect_ftrack_api.py b/...gins/ftrack/publish/collect_ftrack_api.py → ...ack/plugins/publish/collect_ftrack_api.py
diff --git a/...ns/ftrack/publish/integrate_ftrack_api.py → ...k/plugins/publish/integrate_ftrack_api.py b/...ns/ftrack/publish/integrate_ftrack_api.py → ...k/plugins/publish/integrate_ftrack_api.py
diff --git a/...h/integrate_ftrack_component_overwrite.py → ...h/integrate_ftrack_component_overwrite.py b/...h/integrate_ftrack_component_overwrite.py → ...h/integrate_ftrack_component_overwrite.py
diff --git a/...ack/publish/integrate_ftrack_instances.py → ...ins/publish/integrate_ftrack_instances.py b/...ack/publish/integrate_ftrack_instances.py → ...ins/publish/integrate_ftrack_instances.py
diff --git a/...s/ftrack/publish/integrate_ftrack_note.py → .../plugins/publish/integrate_ftrack_note.py b/...s/ftrack/publish/integrate_ftrack_note.py → .../plugins/publish/integrate_ftrack_note.py
diff --git a/...ack/publish/integrate_hierarchy_ftrack.py → ...ins/publish/integrate_hierarchy_ftrack.py b/...ack/publish/integrate_hierarchy_ftrack.py → ...ins/publish/integrate_hierarchy_ftrack.py
diff --git a/.../publish/integrate_hierarchy_ftrack_SP.py → .../publish/integrate_hierarchy_ftrack_SP.py b/.../publish/integrate_hierarchy_ftrack_SP.py → .../publish/integrate_hierarchy_ftrack_SP.py
diff --git a/...ck/publish/integrate_remove_components.py → ...ns/publish/integrate_remove_components.py b/...ck/publish/integrate_remove_components.py → ...ns/publish/integrate_remove_components.py
diff --git a/...lish/validate_custom_ftrack_attributes.py → ...lish/validate_custom_ftrack_attributes.py b/...lish/validate_custom_ftrack_attributes.py → ...lish/validate_custom_ftrack_attributes.py
@@ -61,7 +61,7 @@ def process(self, instance):
                         "Missing FTrack Task entity in context")
 
         host = pyblish.api.current_host()
-        to_check = self.ftrack_custom_attributes.get(host, {}))
+        to_check = self.ftrack_custom_attributes.get(host, {})
 
         if not to_check:
             self.log.warning("ftrack_attributes preset not found")