diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml new file mode 100644 index 0000000..033f66c --- /dev/null +++ b/.pre-commit-config.yaml @@ -0,0 +1,41 @@ +# Copyright (c) 2019 Shotgun Software Inc. +# +# CONFIDENTIAL AND PROPRIETARY +# +# This work is provided "AS IS" and subject to the Shotgun Pipeline Toolkit +# Source Code License included in this distribution package. See LICENSE. +# By accessing, using, copying or modifying this work you indicate your +# agreement to the Shotgun Pipeline Toolkit Source Code License. All rights +# not expressly granted therein are reserved by Shotgun Software Inc. + +# Styles the code properly +# Exclude the UI files, as they are auto-generated. +exclude: "ui\/.*py$" +# List of super useful formatters. +repos: + - repo: https://github.com/pre-commit/pre-commit-hooks + rev: v2.2.3 + hooks: + # Ensures the code is syntaxically correct + - id: check-ast + language_version: python3 + # Ensures a yaml file is properly formatted + - id: check-yaml + # Ensures a file name will resolve on all platform + - id: check-case-conflict + # Checks files with the execute bit set have shebangs + - id: check-executables-have-shebangs + # Ensure there's no incomplete merges + - id: check-merge-conflict + # Adds an empty line if missing at the end of a file. + - id: end-of-file-fixer + # Makes sure requirements.txt is properly formatted + - id: requirements-txt-fixer + # Removes trailing whitespaces. + - id: trailing-whitespace + # Leave black at the bottom so all touchups are done before it is run. + - repo: https://github.com/ambv/black + rev: stable + hooks: + - id: black + language_version: python3 diff --git a/README b/README index c751a71..5ae83f2 100644 --- a/README +++ b/README @@ -2,7 +2,7 @@ The Shotgun Pipeline Toolkit Default Configuration ------------------------------------------------------------------------- -Welcome to the Shotgun Pipeline Toolkit default configuration! +Welcome to the Shotgun Pipeline Toolkit default configuration! For more information, go to the following url: https://support.shotgunsoftware.com/hc/en-us/articles/115000067493-Integrations-Admin-Guide diff --git a/after_project_create.py b/after_project_create.py index 64b2a9f..60240c1 100644 --- a/after_project_create.py +++ b/after_project_create.py @@ -23,6 +23,7 @@ the following keyword arguments: """ + def create(sg, project_id, log, **kwargs): """ Insert post-project code here diff --git a/core/hooks/README b/core/hooks/README index 3b264e1..8e20b75 100644 --- a/core/hooks/README +++ b/core/hooks/README @@ -1,12 +1,12 @@ This location is for core hook override files. -The Shotgun Pipeline Toolkit comes with a series of Core Hooks, essentially snippets of python +The Shotgun Pipeline Toolkit comes with a series of Core Hooks, essentially snippets of python that contain key operations such as copying a file, creating directories etc. These hooks are part of the platform distribution and are therefore bundled with the code itself. If you want to provide your own hook implementations, for example control file system permissions as files are being copied, you can override the core hooks by putting a file with the same -name as the core hook in this location. Sgtk will basically look in this folder first as it is -requesting a core hook - if it doesn't find the core hook here, it will look in its internal -platform location. \ No newline at end of file +name as the core hook in this location. Sgtk will basically look in this folder first as it is +requesting a core hook - if it doesn't find the core hook here, it will look in its internal +platform location. diff --git a/core/hooks/pick_environment.py b/core/hooks/pick_environment.py index 1a2bcd4..07778e0 100644 --- a/core/hooks/pick_environment.py +++ b/core/hooks/pick_environment.py @@ -16,7 +16,6 @@ from tank import Hook class PickEnvironment(Hook): - def execute(self, context, **kwargs): """ The default implementation assumes there are three environments, called shot, asset diff --git a/core/roots.yml b/core/roots.yml index 0298afe..c43d818 100644 --- a/core/roots.yml +++ b/core/roots.yml @@ -67,4 +67,3 @@ primary: # description: "High performance storage for fast/frequent texture access" # shotgun_storage_id: 2 # - diff --git a/core/schema/project/assets/asset_type.yml b/core/schema/project/assets/asset_type.yml index a48c42b..65c5664 100644 --- a/core/schema/project/assets/asset_type.yml +++ b/core/schema/project/assets/asset_type.yml @@ -1,11 +1,11 @@ # Copyright (c) 2015 Shotgun Software Inc. -# +# # CONFIDENTIAL AND PROPRIETARY -# -# This work is provided "AS IS" and subject to the Shotgun Pipeline Toolkit +# +# This work is provided "AS IS" and subject to the Shotgun Pipeline Toolkit # Source Code License included in this distribution package. See LICENSE. -# By accessing, using, copying or modifying this work you indicate your -# agreement to the Shotgun Pipeline Toolkit Source Code License. All rights +# By accessing, using, copying or modifying this work you indicate your +# agreement to the Shotgun Pipeline Toolkit Source Code License. All rights # not expressly granted therein are reserved by Shotgun Software Inc. # the type of dynamic content @@ -15,10 +15,9 @@ type: "shotgun_list_field" entity_type: "Asset" # switch this to true if you only want to make folders for -# values that are being used. Note that evaluating this is +# values that are being used. Note that evaluating this is # expensive and may potentially slow down folder creation. -skip_unused: false +skip_unused: false # the shotgun field to use for the folder name field_name: "sg_asset_type" - diff --git a/core/schema/project/assets/asset_type/asset.yml b/core/schema/project/assets/asset_type/asset.yml index 9db0616..a1fa14c 100644 --- a/core/schema/project/assets/asset_type/asset.yml +++ b/core/schema/project/assets/asset_type/asset.yml @@ -1,11 +1,11 @@ # Copyright (c) 2015 Shotgun Software Inc. -# +# # CONFIDENTIAL AND PROPRIETARY -# -# This work is provided "AS IS" and subject to the Shotgun Pipeline Toolkit +# +# This work is provided "AS IS" and subject to the Shotgun Pipeline Toolkit # Source Code License included in this distribution package. See LICENSE. -# By accessing, using, copying or modifying this work you indicate your -# agreement to the Shotgun Pipeline Toolkit Source Code License. All rights +# By accessing, using, copying or modifying this work you indicate your +# agreement to the Shotgun Pipeline Toolkit Source Code License. All rights # not expressly granted therein are reserved by Shotgun Software Inc. # the type of dynamic content @@ -18,7 +18,7 @@ name: "code" entity_type: "Asset" # shotgun filters to apply when getting the list of items -# this should be a list of dicts, each dict containing +# this should be a list of dicts, each dict containing # three fields: path, relation and values # (this is std shotgun API syntax) # any values starting with $ are resolved into path objects diff --git a/core/schema/project/assets/asset_type/asset/step.yml b/core/schema/project/assets/asset_type/asset/step.yml index 494eb0a..f8d188f 100644 --- a/core/schema/project/assets/asset_type/asset/step.yml +++ b/core/schema/project/assets/asset_type/asset/step.yml @@ -1,11 +1,11 @@ # Copyright (c) 2015 Shotgun Software Inc. -# +# # CONFIDENTIAL AND PROPRIETARY -# -# This work is provided "AS IS" and subject to the Shotgun Pipeline Toolkit +# +# This work is provided "AS IS" and subject to the Shotgun Pipeline Toolkit # Source Code License included in this distribution package. See LICENSE. -# By accessing, using, copying or modifying this work you indicate your -# agreement to the Shotgun Pipeline Toolkit Source Code License. All rights +# By accessing, using, copying or modifying this work you indicate your +# agreement to the Shotgun Pipeline Toolkit Source Code License. All rights # not expressly granted therein are reserved by Shotgun Software Inc. # the type of dynamic content @@ -13,4 +13,3 @@ type: "shotgun_step" # the shotgun field to use for the folder name name: "short_name" - diff --git a/core/schema/project/assets/asset_type/asset/step/publish/3dsmax.yml b/core/schema/project/assets/asset_type/asset/step/publish/3dsmax.yml index e54b4b3..8ca4a54 100644 --- a/core/schema/project/assets/asset_type/asset/step/publish/3dsmax.yml +++ b/core/schema/project/assets/asset_type/asset/step/publish/3dsmax.yml @@ -1,11 +1,11 @@ # Copyright (c) 2015 Shotgun Software Inc. -# +# # CONFIDENTIAL AND PROPRIETARY -# -# This work is provided "AS IS" and subject to the Shotgun Pipeline Toolkit +# +# This work is provided "AS IS" and subject to the Shotgun Pipeline Toolkit # Source Code License included in this distribution package. See LICENSE. -# By accessing, using, copying or modifying this work you indicate your -# agreement to the Shotgun Pipeline Toolkit Source Code License. All rights +# By accessing, using, copying or modifying this work you indicate your +# agreement to the Shotgun Pipeline Toolkit Source Code License. All rights # not expressly granted therein are reserved by Shotgun Software Inc. # the type of dynamic content @@ -13,4 +13,3 @@ type: "static" # defer creation and only create this folder when 3dsmax starts defer_creation: ["tk-3dsmax", "tk-3dsmaxplus"] - diff --git a/core/schema/project/assets/asset_type/asset/step/publish/3dsmax/placeholder b/core/schema/project/assets/asset_type/asset/step/publish/3dsmax/placeholder index 88a425e..6ce76a9 100644 --- a/core/schema/project/assets/asset_type/asset/step/publish/3dsmax/placeholder +++ b/core/schema/project/assets/asset_type/asset/step/publish/3dsmax/placeholder @@ -1,4 +1,4 @@ # This file is a placeholder to ensure that the parent folder is preserved and not deleted by git. # Any file named 'placeholder' will not be copied across when folders are created. # Note: You can which files should be ignored when folders are created in the ignore_files file, -# located in the schema folder. \ No newline at end of file +# located in the schema folder. diff --git a/core/schema/project/assets/asset_type/asset/step/publish/alias.yml b/core/schema/project/assets/asset_type/asset/step/publish/alias.yml index f4bdaac..aa449c3 100644 --- a/core/schema/project/assets/asset_type/asset/step/publish/alias.yml +++ b/core/schema/project/assets/asset_type/asset/step/publish/alias.yml @@ -13,4 +13,3 @@ type: "static" # defer creation and only create this folder when Nuke starts defer_creation: "tk-alias" - diff --git a/core/schema/project/assets/asset_type/asset/step/publish/alias/placeholder b/core/schema/project/assets/asset_type/asset/step/publish/alias/placeholder index 88a425e..6ce76a9 100644 --- a/core/schema/project/assets/asset_type/asset/step/publish/alias/placeholder +++ b/core/schema/project/assets/asset_type/asset/step/publish/alias/placeholder @@ -1,4 +1,4 @@ # This file is a placeholder to ensure that the parent folder is preserved and not deleted by git. # Any file named 'placeholder' will not be copied across when folders are created. # Note: You can which files should be ignored when folders are created in the ignore_files file, -# located in the schema folder. \ No newline at end of file +# located in the schema folder. diff --git a/core/schema/project/assets/asset_type/asset/step/publish/caches/placeholder b/core/schema/project/assets/asset_type/asset/step/publish/caches/placeholder index 88a425e..6ce76a9 100644 --- a/core/schema/project/assets/asset_type/asset/step/publish/caches/placeholder +++ b/core/schema/project/assets/asset_type/asset/step/publish/caches/placeholder @@ -1,4 +1,4 @@ # This file is a placeholder to ensure that the parent folder is preserved and not deleted by git. # Any file named 'placeholder' will not be copied across when folders are created. # Note: You can which files should be ignored when folders are created in the ignore_files file, -# located in the schema folder. \ No newline at end of file +# located in the schema folder. diff --git a/core/schema/project/assets/asset_type/asset/step/publish/elements/placeholder b/core/schema/project/assets/asset_type/asset/step/publish/elements/placeholder index 88a425e..6ce76a9 100644 --- a/core/schema/project/assets/asset_type/asset/step/publish/elements/placeholder +++ b/core/schema/project/assets/asset_type/asset/step/publish/elements/placeholder @@ -1,4 +1,4 @@ # This file is a placeholder to ensure that the parent folder is preserved and not deleted by git. # Any file named 'placeholder' will not be copied across when folders are created. # Note: You can which files should be ignored when folders are created in the ignore_files file, -# located in the schema folder. \ No newline at end of file +# located in the schema folder. diff --git a/core/schema/project/assets/asset_type/asset/step/publish/houdini.yml b/core/schema/project/assets/asset_type/asset/step/publish/houdini.yml index 82af73e..4acdbad 100644 --- a/core/schema/project/assets/asset_type/asset/step/publish/houdini.yml +++ b/core/schema/project/assets/asset_type/asset/step/publish/houdini.yml @@ -1,11 +1,11 @@ # Copyright (c) 2015 Shotgun Software Inc. -# +# # CONFIDENTIAL AND PROPRIETARY -# -# This work is provided "AS IS" and subject to the Shotgun Pipeline Toolkit +# +# This work is provided "AS IS" and subject to the Shotgun Pipeline Toolkit # Source Code License included in this distribution package. See LICENSE. -# By accessing, using, copying or modifying this work you indicate your -# agreement to the Shotgun Pipeline Toolkit Source Code License. All rights +# By accessing, using, copying or modifying this work you indicate your +# agreement to the Shotgun Pipeline Toolkit Source Code License. All rights # not expressly granted therein are reserved by Shotgun Software Inc. # the type of dynamic content @@ -13,4 +13,3 @@ type: "static" # defer creation and only create this folder when Houdini starts defer_creation: "tk-houdini" - diff --git a/core/schema/project/assets/asset_type/asset/step/publish/houdini/placeholder b/core/schema/project/assets/asset_type/asset/step/publish/houdini/placeholder index 88a425e..6ce76a9 100644 --- a/core/schema/project/assets/asset_type/asset/step/publish/houdini/placeholder +++ b/core/schema/project/assets/asset_type/asset/step/publish/houdini/placeholder @@ -1,4 +1,4 @@ # This file is a placeholder to ensure that the parent folder is preserved and not deleted by git. # Any file named 'placeholder' will not be copied across when folders are created. # Note: You can which files should be ignored when folders are created in the ignore_files file, -# located in the schema folder. \ No newline at end of file +# located in the schema folder. diff --git a/core/schema/project/assets/asset_type/asset/step/publish/mari/placeholder b/core/schema/project/assets/asset_type/asset/step/publish/mari/placeholder index 88a425e..6ce76a9 100644 --- a/core/schema/project/assets/asset_type/asset/step/publish/mari/placeholder +++ b/core/schema/project/assets/asset_type/asset/step/publish/mari/placeholder @@ -1,4 +1,4 @@ # This file is a placeholder to ensure that the parent folder is preserved and not deleted by git. # Any file named 'placeholder' will not be copied across when folders are created. # Note: You can which files should be ignored when folders are created in the ignore_files file, -# located in the schema folder. \ No newline at end of file +# located in the schema folder. diff --git a/core/schema/project/assets/asset_type/asset/step/publish/maya.yml b/core/schema/project/assets/asset_type/asset/step/publish/maya.yml index 0cb3ad0..a44c5e4 100644 --- a/core/schema/project/assets/asset_type/asset/step/publish/maya.yml +++ b/core/schema/project/assets/asset_type/asset/step/publish/maya.yml @@ -1,11 +1,11 @@ # Copyright (c) 2015 Shotgun Software Inc. -# +# # CONFIDENTIAL AND PROPRIETARY -# -# This work is provided "AS IS" and subject to the Shotgun Pipeline Toolkit +# +# This work is provided "AS IS" and subject to the Shotgun Pipeline Toolkit # Source Code License included in this distribution package. See LICENSE. -# By accessing, using, copying or modifying this work you indicate your -# agreement to the Shotgun Pipeline Toolkit Source Code License. All rights +# By accessing, using, copying or modifying this work you indicate your +# agreement to the Shotgun Pipeline Toolkit Source Code License. All rights # not expressly granted therein are reserved by Shotgun Software Inc. # the type of dynamic content @@ -13,4 +13,3 @@ type: "static" # defer creation and only create this folder when Maya starts defer_creation: "tk-maya" - diff --git a/core/schema/project/assets/asset_type/asset/step/publish/maya/placeholder b/core/schema/project/assets/asset_type/asset/step/publish/maya/placeholder index 88a425e..6ce76a9 100644 --- a/core/schema/project/assets/asset_type/asset/step/publish/maya/placeholder +++ b/core/schema/project/assets/asset_type/asset/step/publish/maya/placeholder @@ -1,4 +1,4 @@ # This file is a placeholder to ensure that the parent folder is preserved and not deleted by git. # Any file named 'placeholder' will not be copied across when folders are created. # Note: You can which files should be ignored when folders are created in the ignore_files file, -# located in the schema folder. \ No newline at end of file +# located in the schema folder. diff --git a/core/schema/project/assets/asset_type/asset/step/publish/mobu.yml b/core/schema/project/assets/asset_type/asset/step/publish/mobu.yml index 650b767..ab1bf95 100644 --- a/core/schema/project/assets/asset_type/asset/step/publish/mobu.yml +++ b/core/schema/project/assets/asset_type/asset/step/publish/mobu.yml @@ -1,11 +1,11 @@ # Copyright (c) 2015 Shotgun Software Inc. -# +# # CONFIDENTIAL AND PROPRIETARY -# -# This work is provided "AS IS" and subject to the Shotgun Pipeline Toolkit +# +# This work is provided "AS IS" and subject to the Shotgun Pipeline Toolkit # Source Code License included in this distribution package. See LICENSE. -# By accessing, using, copying or modifying this work you indicate your -# agreement to the Shotgun Pipeline Toolkit Source Code License. All rights +# By accessing, using, copying or modifying this work you indicate your +# agreement to the Shotgun Pipeline Toolkit Source Code License. All rights # not expressly granted therein are reserved by Shotgun Software Inc. # the type of dynamic content @@ -13,4 +13,3 @@ type: "static" # defer creation and only create this folder when Motion Builder starts defer_creation: "tk-motionbuilder" - diff --git a/core/schema/project/assets/asset_type/asset/step/publish/mobu/placeholder b/core/schema/project/assets/asset_type/asset/step/publish/mobu/placeholder index 88a425e..6ce76a9 100644 --- a/core/schema/project/assets/asset_type/asset/step/publish/mobu/placeholder +++ b/core/schema/project/assets/asset_type/asset/step/publish/mobu/placeholder @@ -1,4 +1,4 @@ # This file is a placeholder to ensure that the parent folder is preserved and not deleted by git. # Any file named 'placeholder' will not be copied across when folders are created. # Note: You can which files should be ignored when folders are created in the ignore_files file, -# located in the schema folder. \ No newline at end of file +# located in the schema folder. diff --git a/core/schema/project/assets/asset_type/asset/step/publish/nuke.yml b/core/schema/project/assets/asset_type/asset/step/publish/nuke.yml index 8d319d6..6657bd4 100644 --- a/core/schema/project/assets/asset_type/asset/step/publish/nuke.yml +++ b/core/schema/project/assets/asset_type/asset/step/publish/nuke.yml @@ -1,11 +1,11 @@ # Copyright (c) 2015 Shotgun Software Inc. -# +# # CONFIDENTIAL AND PROPRIETARY -# -# This work is provided "AS IS" and subject to the Shotgun Pipeline Toolkit +# +# This work is provided "AS IS" and subject to the Shotgun Pipeline Toolkit # Source Code License included in this distribution package. See LICENSE. -# By accessing, using, copying or modifying this work you indicate your -# agreement to the Shotgun Pipeline Toolkit Source Code License. All rights +# By accessing, using, copying or modifying this work you indicate your +# agreement to the Shotgun Pipeline Toolkit Source Code License. All rights # not expressly granted therein are reserved by Shotgun Software Inc. # the type of dynamic content @@ -13,4 +13,3 @@ type: "static" # defer creation and only create this folder when Nuke starts defer_creation: "tk-nuke" - diff --git a/core/schema/project/assets/asset_type/asset/step/publish/nuke/placeholder b/core/schema/project/assets/asset_type/asset/step/publish/nuke/placeholder index 88a425e..6ce76a9 100644 --- a/core/schema/project/assets/asset_type/asset/step/publish/nuke/placeholder +++ b/core/schema/project/assets/asset_type/asset/step/publish/nuke/placeholder @@ -1,4 +1,4 @@ # This file is a placeholder to ensure that the parent folder is preserved and not deleted by git. # Any file named 'placeholder' will not be copied across when folders are created. # Note: You can which files should be ignored when folders are created in the ignore_files file, -# located in the schema folder. \ No newline at end of file +# located in the schema folder. diff --git a/core/schema/project/assets/asset_type/asset/step/publish/photoshop.yml b/core/schema/project/assets/asset_type/asset/step/publish/photoshop.yml index 181a108..17a6b39 100644 --- a/core/schema/project/assets/asset_type/asset/step/publish/photoshop.yml +++ b/core/schema/project/assets/asset_type/asset/step/publish/photoshop.yml @@ -1,11 +1,11 @@ # Copyright (c) 2015 Shotgun Software Inc. -# +# # CONFIDENTIAL AND PROPRIETARY -# -# This work is provided "AS IS" and subject to the Shotgun Pipeline Toolkit +# +# This work is provided "AS IS" and subject to the Shotgun Pipeline Toolkit # Source Code License included in this distribution package. See LICENSE. -# By accessing, using, copying or modifying this work you indicate your -# agreement to the Shotgun Pipeline Toolkit Source Code License. All rights +# By accessing, using, copying or modifying this work you indicate your +# agreement to the Shotgun Pipeline Toolkit Source Code License. All rights # not expressly granted therein are reserved by Shotgun Software Inc. # the type of dynamic content @@ -13,4 +13,3 @@ type: "static" # defer creation and only create this folder when Photoshop starts defer_creation: "tk-photoshopcc" - diff --git a/core/schema/project/assets/asset_type/asset/step/publish/photoshop/placeholder b/core/schema/project/assets/asset_type/asset/step/publish/photoshop/placeholder index 88a425e..6ce76a9 100644 --- a/core/schema/project/assets/asset_type/asset/step/publish/photoshop/placeholder +++ b/core/schema/project/assets/asset_type/asset/step/publish/photoshop/placeholder @@ -1,4 +1,4 @@ # This file is a placeholder to ensure that the parent folder is preserved and not deleted by git. # Any file named 'placeholder' will not be copied across when folders are created. # Note: You can which files should be ignored when folders are created in the ignore_files file, -# located in the schema folder. \ No newline at end of file +# located in the schema folder. diff --git a/core/schema/project/assets/asset_type/asset/step/publish/vred.yml b/core/schema/project/assets/asset_type/asset/step/publish/vred.yml index 49ac2ad..487af07 100644 --- a/core/schema/project/assets/asset_type/asset/step/publish/vred.yml +++ b/core/schema/project/assets/asset_type/asset/step/publish/vred.yml @@ -13,4 +13,3 @@ type: "static" # defer creation and only create this folder when Nuke starts defer_creation: "tk-vred" - diff --git a/core/schema/project/assets/asset_type/asset/step/publish/vred/placeholder b/core/schema/project/assets/asset_type/asset/step/publish/vred/placeholder index 88a425e..6ce76a9 100644 --- a/core/schema/project/assets/asset_type/asset/step/publish/vred/placeholder +++ b/core/schema/project/assets/asset_type/asset/step/publish/vred/placeholder @@ -1,4 +1,4 @@ # This file is a placeholder to ensure that the parent folder is preserved and not deleted by git. # Any file named 'placeholder' will not be copied across when folders are created. # Note: You can which files should be ignored when folders are created in the ignore_files file, -# located in the schema folder. \ No newline at end of file +# located in the schema folder. diff --git a/core/schema/project/assets/asset_type/asset/step/reference/artwork/placeholder b/core/schema/project/assets/asset_type/asset/step/reference/artwork/placeholder index 88a425e..6ce76a9 100644 --- a/core/schema/project/assets/asset_type/asset/step/reference/artwork/placeholder +++ b/core/schema/project/assets/asset_type/asset/step/reference/artwork/placeholder @@ -1,4 +1,4 @@ # This file is a placeholder to ensure that the parent folder is preserved and not deleted by git. # Any file named 'placeholder' will not be copied across when folders are created. # Note: You can which files should be ignored when folders are created in the ignore_files file, -# located in the schema folder. \ No newline at end of file +# located in the schema folder. diff --git a/core/schema/project/assets/asset_type/asset/step/reference/footage/placeholder b/core/schema/project/assets/asset_type/asset/step/reference/footage/placeholder index 88a425e..6ce76a9 100644 --- a/core/schema/project/assets/asset_type/asset/step/reference/footage/placeholder +++ b/core/schema/project/assets/asset_type/asset/step/reference/footage/placeholder @@ -1,4 +1,4 @@ # This file is a placeholder to ensure that the parent folder is preserved and not deleted by git. # Any file named 'placeholder' will not be copied across when folders are created. # Note: You can which files should be ignored when folders are created in the ignore_files file, -# located in the schema folder. \ No newline at end of file +# located in the schema folder. diff --git a/core/schema/project/assets/asset_type/asset/step/review/placeholder b/core/schema/project/assets/asset_type/asset/step/review/placeholder index 88a425e..6ce76a9 100644 --- a/core/schema/project/assets/asset_type/asset/step/review/placeholder +++ b/core/schema/project/assets/asset_type/asset/step/review/placeholder @@ -1,4 +1,4 @@ # This file is a placeholder to ensure that the parent folder is preserved and not deleted by git. # Any file named 'placeholder' will not be copied across when folders are created. # Note: You can which files should be ignored when folders are created in the ignore_files file, -# located in the schema folder. \ No newline at end of file +# located in the schema folder. diff --git a/core/schema/project/assets/asset_type/asset/step/work/3dsmax.yml b/core/schema/project/assets/asset_type/asset/step/work/3dsmax.yml index e54b4b3..8ca4a54 100644 --- a/core/schema/project/assets/asset_type/asset/step/work/3dsmax.yml +++ b/core/schema/project/assets/asset_type/asset/step/work/3dsmax.yml @@ -1,11 +1,11 @@ # Copyright (c) 2015 Shotgun Software Inc. -# +# # CONFIDENTIAL AND PROPRIETARY -# -# This work is provided "AS IS" and subject to the Shotgun Pipeline Toolkit +# +# This work is provided "AS IS" and subject to the Shotgun Pipeline Toolkit # Source Code License included in this distribution package. See LICENSE. -# By accessing, using, copying or modifying this work you indicate your -# agreement to the Shotgun Pipeline Toolkit Source Code License. All rights +# By accessing, using, copying or modifying this work you indicate your +# agreement to the Shotgun Pipeline Toolkit Source Code License. All rights # not expressly granted therein are reserved by Shotgun Software Inc. # the type of dynamic content @@ -13,4 +13,3 @@ type: "static" # defer creation and only create this folder when 3dsmax starts defer_creation: ["tk-3dsmax", "tk-3dsmaxplus"] - diff --git a/core/schema/project/assets/asset_type/asset/step/work/3dsmax/snapshots/placeholder b/core/schema/project/assets/asset_type/asset/step/work/3dsmax/snapshots/placeholder index 88a425e..6ce76a9 100644 --- a/core/schema/project/assets/asset_type/asset/step/work/3dsmax/snapshots/placeholder +++ b/core/schema/project/assets/asset_type/asset/step/work/3dsmax/snapshots/placeholder @@ -1,4 +1,4 @@ # This file is a placeholder to ensure that the parent folder is preserved and not deleted by git. # Any file named 'placeholder' will not be copied across when folders are created. # Note: You can which files should be ignored when folders are created in the ignore_files file, -# located in the schema folder. \ No newline at end of file +# located in the schema folder. diff --git a/core/schema/project/assets/asset_type/asset/step/work/alias.yml b/core/schema/project/assets/asset_type/asset/step/work/alias.yml index d0ec9f3..233d73b 100644 --- a/core/schema/project/assets/asset_type/asset/step/work/alias.yml +++ b/core/schema/project/assets/asset_type/asset/step/work/alias.yml @@ -13,4 +13,3 @@ type: "static" # defer creation and only create this folder when Maya starts defer_creation: "tk-alias" - diff --git a/core/schema/project/assets/asset_type/asset/step/work/alias/snapshots/placeholder b/core/schema/project/assets/asset_type/asset/step/work/alias/snapshots/placeholder index 88a425e..6ce76a9 100644 --- a/core/schema/project/assets/asset_type/asset/step/work/alias/snapshots/placeholder +++ b/core/schema/project/assets/asset_type/asset/step/work/alias/snapshots/placeholder @@ -1,4 +1,4 @@ # This file is a placeholder to ensure that the parent folder is preserved and not deleted by git. # Any file named 'placeholder' will not be copied across when folders are created. # Note: You can which files should be ignored when folders are created in the ignore_files file, -# located in the schema folder. \ No newline at end of file +# located in the schema folder. diff --git a/core/schema/project/assets/asset_type/asset/step/work/houdini.yml b/core/schema/project/assets/asset_type/asset/step/work/houdini.yml index 82af73e..4acdbad 100644 --- a/core/schema/project/assets/asset_type/asset/step/work/houdini.yml +++ b/core/schema/project/assets/asset_type/asset/step/work/houdini.yml @@ -1,11 +1,11 @@ # Copyright (c) 2015 Shotgun Software Inc. -# +# # CONFIDENTIAL AND PROPRIETARY -# -# This work is provided "AS IS" and subject to the Shotgun Pipeline Toolkit +# +# This work is provided "AS IS" and subject to the Shotgun Pipeline Toolkit # Source Code License included in this distribution package. See LICENSE. -# By accessing, using, copying or modifying this work you indicate your -# agreement to the Shotgun Pipeline Toolkit Source Code License. All rights +# By accessing, using, copying or modifying this work you indicate your +# agreement to the Shotgun Pipeline Toolkit Source Code License. All rights # not expressly granted therein are reserved by Shotgun Software Inc. # the type of dynamic content @@ -13,4 +13,3 @@ type: "static" # defer creation and only create this folder when Houdini starts defer_creation: "tk-houdini" - diff --git a/core/schema/project/assets/asset_type/asset/step/work/houdini/snapshots/placeholder b/core/schema/project/assets/asset_type/asset/step/work/houdini/snapshots/placeholder index 88a425e..6ce76a9 100644 --- a/core/schema/project/assets/asset_type/asset/step/work/houdini/snapshots/placeholder +++ b/core/schema/project/assets/asset_type/asset/step/work/houdini/snapshots/placeholder @@ -1,4 +1,4 @@ # This file is a placeholder to ensure that the parent folder is preserved and not deleted by git. # Any file named 'placeholder' will not be copied across when folders are created. # Note: You can which files should be ignored when folders are created in the ignore_files file, -# located in the schema folder. \ No newline at end of file +# located in the schema folder. diff --git a/core/schema/project/assets/asset_type/asset/step/work/images/placeholder b/core/schema/project/assets/asset_type/asset/step/work/images/placeholder index 88a425e..6ce76a9 100644 --- a/core/schema/project/assets/asset_type/asset/step/work/images/placeholder +++ b/core/schema/project/assets/asset_type/asset/step/work/images/placeholder @@ -1,4 +1,4 @@ # This file is a placeholder to ensure that the parent folder is preserved and not deleted by git. # Any file named 'placeholder' will not be copied across when folders are created. # Note: You can which files should be ignored when folders are created in the ignore_files file, -# located in the schema folder. \ No newline at end of file +# located in the schema folder. diff --git a/core/schema/project/assets/asset_type/asset/step/work/maya.yml b/core/schema/project/assets/asset_type/asset/step/work/maya.yml index 0cb3ad0..a44c5e4 100644 --- a/core/schema/project/assets/asset_type/asset/step/work/maya.yml +++ b/core/schema/project/assets/asset_type/asset/step/work/maya.yml @@ -1,11 +1,11 @@ # Copyright (c) 2015 Shotgun Software Inc. -# +# # CONFIDENTIAL AND PROPRIETARY -# -# This work is provided "AS IS" and subject to the Shotgun Pipeline Toolkit +# +# This work is provided "AS IS" and subject to the Shotgun Pipeline Toolkit # Source Code License included in this distribution package. See LICENSE. -# By accessing, using, copying or modifying this work you indicate your -# agreement to the Shotgun Pipeline Toolkit Source Code License. All rights +# By accessing, using, copying or modifying this work you indicate your +# agreement to the Shotgun Pipeline Toolkit Source Code License. All rights # not expressly granted therein are reserved by Shotgun Software Inc. # the type of dynamic content @@ -13,4 +13,3 @@ type: "static" # defer creation and only create this folder when Maya starts defer_creation: "tk-maya" - diff --git a/core/schema/project/assets/asset_type/asset/step/work/maya/snapshots/placeholder b/core/schema/project/assets/asset_type/asset/step/work/maya/snapshots/placeholder index 88a425e..6ce76a9 100644 --- a/core/schema/project/assets/asset_type/asset/step/work/maya/snapshots/placeholder +++ b/core/schema/project/assets/asset_type/asset/step/work/maya/snapshots/placeholder @@ -1,4 +1,4 @@ # This file is a placeholder to ensure that the parent folder is preserved and not deleted by git. # Any file named 'placeholder' will not be copied across when folders are created. # Note: You can which files should be ignored when folders are created in the ignore_files file, -# located in the schema folder. \ No newline at end of file +# located in the schema folder. diff --git a/core/schema/project/assets/asset_type/asset/step/work/mobu.yml b/core/schema/project/assets/asset_type/asset/step/work/mobu.yml index 650b767..ab1bf95 100644 --- a/core/schema/project/assets/asset_type/asset/step/work/mobu.yml +++ b/core/schema/project/assets/asset_type/asset/step/work/mobu.yml @@ -1,11 +1,11 @@ # Copyright (c) 2015 Shotgun Software Inc. -# +# # CONFIDENTIAL AND PROPRIETARY -# -# This work is provided "AS IS" and subject to the Shotgun Pipeline Toolkit +# +# This work is provided "AS IS" and subject to the Shotgun Pipeline Toolkit # Source Code License included in this distribution package. See LICENSE. -# By accessing, using, copying or modifying this work you indicate your -# agreement to the Shotgun Pipeline Toolkit Source Code License. All rights +# By accessing, using, copying or modifying this work you indicate your +# agreement to the Shotgun Pipeline Toolkit Source Code License. All rights # not expressly granted therein are reserved by Shotgun Software Inc. # the type of dynamic content @@ -13,4 +13,3 @@ type: "static" # defer creation and only create this folder when Motion Builder starts defer_creation: "tk-motionbuilder" - diff --git a/core/schema/project/assets/asset_type/asset/step/work/mobu/snapshots/placeholder b/core/schema/project/assets/asset_type/asset/step/work/mobu/snapshots/placeholder index 88a425e..6ce76a9 100644 --- a/core/schema/project/assets/asset_type/asset/step/work/mobu/snapshots/placeholder +++ b/core/schema/project/assets/asset_type/asset/step/work/mobu/snapshots/placeholder @@ -1,4 +1,4 @@ # This file is a placeholder to ensure that the parent folder is preserved and not deleted by git. # Any file named 'placeholder' will not be copied across when folders are created. # Note: You can which files should be ignored when folders are created in the ignore_files file, -# located in the schema folder. \ No newline at end of file +# located in the schema folder. diff --git a/core/schema/project/assets/asset_type/asset/step/work/nuke.yml b/core/schema/project/assets/asset_type/asset/step/work/nuke.yml index 8d319d6..6657bd4 100644 --- a/core/schema/project/assets/asset_type/asset/step/work/nuke.yml +++ b/core/schema/project/assets/asset_type/asset/step/work/nuke.yml @@ -1,11 +1,11 @@ # Copyright (c) 2015 Shotgun Software Inc. -# +# # CONFIDENTIAL AND PROPRIETARY -# -# This work is provided "AS IS" and subject to the Shotgun Pipeline Toolkit +# +# This work is provided "AS IS" and subject to the Shotgun Pipeline Toolkit # Source Code License included in this distribution package. See LICENSE. -# By accessing, using, copying or modifying this work you indicate your -# agreement to the Shotgun Pipeline Toolkit Source Code License. All rights +# By accessing, using, copying or modifying this work you indicate your +# agreement to the Shotgun Pipeline Toolkit Source Code License. All rights # not expressly granted therein are reserved by Shotgun Software Inc. # the type of dynamic content @@ -13,4 +13,3 @@ type: "static" # defer creation and only create this folder when Nuke starts defer_creation: "tk-nuke" - diff --git a/core/schema/project/assets/asset_type/asset/step/work/nuke/snapshots/placeholder b/core/schema/project/assets/asset_type/asset/step/work/nuke/snapshots/placeholder index 88a425e..6ce76a9 100644 --- a/core/schema/project/assets/asset_type/asset/step/work/nuke/snapshots/placeholder +++ b/core/schema/project/assets/asset_type/asset/step/work/nuke/snapshots/placeholder @@ -1,4 +1,4 @@ # This file is a placeholder to ensure that the parent folder is preserved and not deleted by git. # Any file named 'placeholder' will not be copied across when folders are created. # Note: You can which files should be ignored when folders are created in the ignore_files file, -# located in the schema folder. \ No newline at end of file +# located in the schema folder. diff --git a/core/schema/project/assets/asset_type/asset/step/work/photoshop.yml b/core/schema/project/assets/asset_type/asset/step/work/photoshop.yml index 181a108..17a6b39 100644 --- a/core/schema/project/assets/asset_type/asset/step/work/photoshop.yml +++ b/core/schema/project/assets/asset_type/asset/step/work/photoshop.yml @@ -1,11 +1,11 @@ # Copyright (c) 2015 Shotgun Software Inc. -# +# # CONFIDENTIAL AND PROPRIETARY -# -# This work is provided "AS IS" and subject to the Shotgun Pipeline Toolkit +# +# This work is provided "AS IS" and subject to the Shotgun Pipeline Toolkit # Source Code License included in this distribution package. See LICENSE. -# By accessing, using, copying or modifying this work you indicate your -# agreement to the Shotgun Pipeline Toolkit Source Code License. All rights +# By accessing, using, copying or modifying this work you indicate your +# agreement to the Shotgun Pipeline Toolkit Source Code License. All rights # not expressly granted therein are reserved by Shotgun Software Inc. # the type of dynamic content @@ -13,4 +13,3 @@ type: "static" # defer creation and only create this folder when Photoshop starts defer_creation: "tk-photoshopcc" - diff --git a/core/schema/project/assets/asset_type/asset/step/work/photoshop/snapshots/placeholder b/core/schema/project/assets/asset_type/asset/step/work/photoshop/snapshots/placeholder index 88a425e..6ce76a9 100644 --- a/core/schema/project/assets/asset_type/asset/step/work/photoshop/snapshots/placeholder +++ b/core/schema/project/assets/asset_type/asset/step/work/photoshop/snapshots/placeholder @@ -1,4 +1,4 @@ # This file is a placeholder to ensure that the parent folder is preserved and not deleted by git. # Any file named 'placeholder' will not be copied across when folders are created. # Note: You can which files should be ignored when folders are created in the ignore_files file, -# located in the schema folder. \ No newline at end of file +# located in the schema folder. diff --git a/core/schema/project/assets/asset_type/asset/step/work/vred.yml b/core/schema/project/assets/asset_type/asset/step/work/vred.yml index e0fb1bd..7f7875b 100644 --- a/core/schema/project/assets/asset_type/asset/step/work/vred.yml +++ b/core/schema/project/assets/asset_type/asset/step/work/vred.yml @@ -13,4 +13,3 @@ type: "static" # defer creation and only create this folder when Maya starts defer_creation: "tk-vred" - diff --git a/core/schema/project/assets/asset_type/asset/step/work/vred/snapshots/placeholder b/core/schema/project/assets/asset_type/asset/step/work/vred/snapshots/placeholder index 88a425e..6ce76a9 100644 --- a/core/schema/project/assets/asset_type/asset/step/work/vred/snapshots/placeholder +++ b/core/schema/project/assets/asset_type/asset/step/work/vred/snapshots/placeholder @@ -1,4 +1,4 @@ # This file is a placeholder to ensure that the parent folder is preserved and not deleted by git. # Any file named 'placeholder' will not be copied across when folders are created. # Note: You can which files should be ignored when folders are created in the ignore_files file, -# located in the schema folder. \ No newline at end of file +# located in the schema folder. diff --git a/core/schema/project/editorial/publish/placeholder b/core/schema/project/editorial/publish/placeholder index 88a425e..6ce76a9 100644 --- a/core/schema/project/editorial/publish/placeholder +++ b/core/schema/project/editorial/publish/placeholder @@ -1,4 +1,4 @@ # This file is a placeholder to ensure that the parent folder is preserved and not deleted by git. # Any file named 'placeholder' will not be copied across when folders are created. # Note: You can which files should be ignored when folders are created in the ignore_files file, -# located in the schema folder. \ No newline at end of file +# located in the schema folder. diff --git a/core/schema/project/editorial/work/placeholder b/core/schema/project/editorial/work/placeholder index 88a425e..6ce76a9 100644 --- a/core/schema/project/editorial/work/placeholder +++ b/core/schema/project/editorial/work/placeholder @@ -1,4 +1,4 @@ # This file is a placeholder to ensure that the parent folder is preserved and not deleted by git. # Any file named 'placeholder' will not be copied across when folders are created. # Note: You can which files should be ignored when folders are created in the ignore_files file, -# located in the schema folder. \ No newline at end of file +# located in the schema folder. diff --git a/core/schema/project/reference/artwork/placeholder b/core/schema/project/reference/artwork/placeholder index 88a425e..6ce76a9 100644 --- a/core/schema/project/reference/artwork/placeholder +++ b/core/schema/project/reference/artwork/placeholder @@ -1,4 +1,4 @@ # This file is a placeholder to ensure that the parent folder is preserved and not deleted by git. # Any file named 'placeholder' will not be copied across when folders are created. # Note: You can which files should be ignored when folders are created in the ignore_files file, -# located in the schema folder. \ No newline at end of file +# located in the schema folder. diff --git a/core/schema/project/reference/footage/placeholder b/core/schema/project/reference/footage/placeholder index 88a425e..6ce76a9 100644 --- a/core/schema/project/reference/footage/placeholder +++ b/core/schema/project/reference/footage/placeholder @@ -1,4 +1,4 @@ # This file is a placeholder to ensure that the parent folder is preserved and not deleted by git. # Any file named 'placeholder' will not be copied across when folders are created. # Note: You can which files should be ignored when folders are created in the ignore_files file, -# located in the schema folder. \ No newline at end of file +# located in the schema folder. diff --git a/core/schema/project/sequences/sequence.yml b/core/schema/project/sequences/sequence.yml index 1386b61..d3f21b2 100644 --- a/core/schema/project/sequences/sequence.yml +++ b/core/schema/project/sequences/sequence.yml @@ -1,11 +1,11 @@ # Copyright (c) 2015 Shotgun Software Inc. -# +# # CONFIDENTIAL AND PROPRIETARY -# -# This work is provided "AS IS" and subject to the Shotgun Pipeline Toolkit +# +# This work is provided "AS IS" and subject to the Shotgun Pipeline Toolkit # Source Code License included in this distribution package. See LICENSE. -# By accessing, using, copying or modifying this work you indicate your -# agreement to the Shotgun Pipeline Toolkit Source Code License. All rights +# By accessing, using, copying or modifying this work you indicate your +# agreement to the Shotgun Pipeline Toolkit Source Code License. All rights # not expressly granted therein are reserved by Shotgun Software Inc. # the type of dynamic content @@ -18,9 +18,8 @@ name: "code" entity_type: "Sequence" # shotgun filters to apply when getting the list of items -# this should be a list of dicts, each dict containing +# this should be a list of dicts, each dict containing # three fields: path, relation and values # (this is std shotgun API syntax) # any values starting with $ are resolved into path objects filters: [ { "path": "project", "relation": "is", "values": [ "$project" ] } ] - diff --git a/core/schema/project/sequences/sequence/shot.yml b/core/schema/project/sequences/sequence/shot.yml index 9dfcf9f..a3365c3 100644 --- a/core/schema/project/sequences/sequence/shot.yml +++ b/core/schema/project/sequences/sequence/shot.yml @@ -1,11 +1,11 @@ # Copyright (c) 2015 Shotgun Software Inc. -# +# # CONFIDENTIAL AND PROPRIETARY -# -# This work is provided "AS IS" and subject to the Shotgun Pipeline Toolkit +# +# This work is provided "AS IS" and subject to the Shotgun Pipeline Toolkit # Source Code License included in this distribution package. See LICENSE. -# By accessing, using, copying or modifying this work you indicate your -# agreement to the Shotgun Pipeline Toolkit Source Code License. All rights +# By accessing, using, copying or modifying this work you indicate your +# agreement to the Shotgun Pipeline Toolkit Source Code License. All rights # not expressly granted therein are reserved by Shotgun Software Inc. # the type of dynamic content @@ -18,8 +18,8 @@ name: "code" entity_type: "Shot" # shotgun filters to apply when getting the list of items -# this should be a list of dicts, each dict containing +# this should be a list of dicts, each dict containing # three fields: path, relation and values # (this is std shotgun API syntax) # any values starting with $ are resolved into path objects -filters: [ { "path": "sg_sequence", "relation": "is", "values": [ "$sequence" ] } ] \ No newline at end of file +filters: [ { "path": "sg_sequence", "relation": "is", "values": [ "$sequence" ] } ] diff --git a/core/schema/project/sequences/sequence/shot/editorial/placeholder b/core/schema/project/sequences/sequence/shot/editorial/placeholder index 88a425e..6ce76a9 100644 --- a/core/schema/project/sequences/sequence/shot/editorial/placeholder +++ b/core/schema/project/sequences/sequence/shot/editorial/placeholder @@ -1,4 +1,4 @@ # This file is a placeholder to ensure that the parent folder is preserved and not deleted by git. # Any file named 'placeholder' will not be copied across when folders are created. # Note: You can which files should be ignored when folders are created in the ignore_files file, -# located in the schema folder. \ No newline at end of file +# located in the schema folder. diff --git a/core/schema/project/sequences/sequence/shot/step.yml b/core/schema/project/sequences/sequence/shot/step.yml index 494eb0a..f8d188f 100644 --- a/core/schema/project/sequences/sequence/shot/step.yml +++ b/core/schema/project/sequences/sequence/shot/step.yml @@ -1,11 +1,11 @@ # Copyright (c) 2015 Shotgun Software Inc. -# +# # CONFIDENTIAL AND PROPRIETARY -# -# This work is provided "AS IS" and subject to the Shotgun Pipeline Toolkit +# +# This work is provided "AS IS" and subject to the Shotgun Pipeline Toolkit # Source Code License included in this distribution package. See LICENSE. -# By accessing, using, copying or modifying this work you indicate your -# agreement to the Shotgun Pipeline Toolkit Source Code License. All rights +# By accessing, using, copying or modifying this work you indicate your +# agreement to the Shotgun Pipeline Toolkit Source Code License. All rights # not expressly granted therein are reserved by Shotgun Software Inc. # the type of dynamic content @@ -13,4 +13,3 @@ type: "shotgun_step" # the shotgun field to use for the folder name name: "short_name" - diff --git a/core/schema/project/sequences/sequence/shot/step/publish/3dsmax.yml b/core/schema/project/sequences/sequence/shot/step/publish/3dsmax.yml index e54b4b3..8ca4a54 100644 --- a/core/schema/project/sequences/sequence/shot/step/publish/3dsmax.yml +++ b/core/schema/project/sequences/sequence/shot/step/publish/3dsmax.yml @@ -1,11 +1,11 @@ # Copyright (c) 2015 Shotgun Software Inc. -# +# # CONFIDENTIAL AND PROPRIETARY -# -# This work is provided "AS IS" and subject to the Shotgun Pipeline Toolkit +# +# This work is provided "AS IS" and subject to the Shotgun Pipeline Toolkit # Source Code License included in this distribution package. See LICENSE. -# By accessing, using, copying or modifying this work you indicate your -# agreement to the Shotgun Pipeline Toolkit Source Code License. All rights +# By accessing, using, copying or modifying this work you indicate your +# agreement to the Shotgun Pipeline Toolkit Source Code License. All rights # not expressly granted therein are reserved by Shotgun Software Inc. # the type of dynamic content @@ -13,4 +13,3 @@ type: "static" # defer creation and only create this folder when 3dsmax starts defer_creation: ["tk-3dsmax", "tk-3dsmaxplus"] - diff --git a/core/schema/project/sequences/sequence/shot/step/publish/3dsmax/placeholder b/core/schema/project/sequences/sequence/shot/step/publish/3dsmax/placeholder index 88a425e..6ce76a9 100644 --- a/core/schema/project/sequences/sequence/shot/step/publish/3dsmax/placeholder +++ b/core/schema/project/sequences/sequence/shot/step/publish/3dsmax/placeholder @@ -1,4 +1,4 @@ # This file is a placeholder to ensure that the parent folder is preserved and not deleted by git. # Any file named 'placeholder' will not be copied across when folders are created. # Note: You can which files should be ignored when folders are created in the ignore_files file, -# located in the schema folder. \ No newline at end of file +# located in the schema folder. diff --git a/core/schema/project/sequences/sequence/shot/step/publish/elements/placeholder b/core/schema/project/sequences/sequence/shot/step/publish/elements/placeholder index 88a425e..6ce76a9 100644 --- a/core/schema/project/sequences/sequence/shot/step/publish/elements/placeholder +++ b/core/schema/project/sequences/sequence/shot/step/publish/elements/placeholder @@ -1,4 +1,4 @@ # This file is a placeholder to ensure that the parent folder is preserved and not deleted by git. # Any file named 'placeholder' will not be copied across when folders are created. # Note: You can which files should be ignored when folders are created in the ignore_files file, -# located in the schema folder. \ No newline at end of file +# located in the schema folder. diff --git a/core/schema/project/sequences/sequence/shot/step/publish/houdini.yml b/core/schema/project/sequences/sequence/shot/step/publish/houdini.yml index 82af73e..4acdbad 100644 --- a/core/schema/project/sequences/sequence/shot/step/publish/houdini.yml +++ b/core/schema/project/sequences/sequence/shot/step/publish/houdini.yml @@ -1,11 +1,11 @@ # Copyright (c) 2015 Shotgun Software Inc. -# +# # CONFIDENTIAL AND PROPRIETARY -# -# This work is provided "AS IS" and subject to the Shotgun Pipeline Toolkit +# +# This work is provided "AS IS" and subject to the Shotgun Pipeline Toolkit # Source Code License included in this distribution package. See LICENSE. -# By accessing, using, copying or modifying this work you indicate your -# agreement to the Shotgun Pipeline Toolkit Source Code License. All rights +# By accessing, using, copying or modifying this work you indicate your +# agreement to the Shotgun Pipeline Toolkit Source Code License. All rights # not expressly granted therein are reserved by Shotgun Software Inc. # the type of dynamic content @@ -13,4 +13,3 @@ type: "static" # defer creation and only create this folder when Houdini starts defer_creation: "tk-houdini" - diff --git a/core/schema/project/sequences/sequence/shot/step/publish/houdini/placeholder b/core/schema/project/sequences/sequence/shot/step/publish/houdini/placeholder index 88a425e..6ce76a9 100644 --- a/core/schema/project/sequences/sequence/shot/step/publish/houdini/placeholder +++ b/core/schema/project/sequences/sequence/shot/step/publish/houdini/placeholder @@ -1,4 +1,4 @@ # This file is a placeholder to ensure that the parent folder is preserved and not deleted by git. # Any file named 'placeholder' will not be copied across when folders are created. # Note: You can which files should be ignored when folders are created in the ignore_files file, -# located in the schema folder. \ No newline at end of file +# located in the schema folder. diff --git a/core/schema/project/sequences/sequence/shot/step/publish/maya.yml b/core/schema/project/sequences/sequence/shot/step/publish/maya.yml index 0cb3ad0..a44c5e4 100644 --- a/core/schema/project/sequences/sequence/shot/step/publish/maya.yml +++ b/core/schema/project/sequences/sequence/shot/step/publish/maya.yml @@ -1,11 +1,11 @@ # Copyright (c) 2015 Shotgun Software Inc. -# +# # CONFIDENTIAL AND PROPRIETARY -# -# This work is provided "AS IS" and subject to the Shotgun Pipeline Toolkit +# +# This work is provided "AS IS" and subject to the Shotgun Pipeline Toolkit # Source Code License included in this distribution package. See LICENSE. -# By accessing, using, copying or modifying this work you indicate your -# agreement to the Shotgun Pipeline Toolkit Source Code License. All rights +# By accessing, using, copying or modifying this work you indicate your +# agreement to the Shotgun Pipeline Toolkit Source Code License. All rights # not expressly granted therein are reserved by Shotgun Software Inc. # the type of dynamic content @@ -13,4 +13,3 @@ type: "static" # defer creation and only create this folder when Maya starts defer_creation: "tk-maya" - diff --git a/core/schema/project/sequences/sequence/shot/step/publish/maya/placeholder b/core/schema/project/sequences/sequence/shot/step/publish/maya/placeholder index 88a425e..6ce76a9 100644 --- a/core/schema/project/sequences/sequence/shot/step/publish/maya/placeholder +++ b/core/schema/project/sequences/sequence/shot/step/publish/maya/placeholder @@ -1,4 +1,4 @@ # This file is a placeholder to ensure that the parent folder is preserved and not deleted by git. # Any file named 'placeholder' will not be copied across when folders are created. # Note: You can which files should be ignored when folders are created in the ignore_files file, -# located in the schema folder. \ No newline at end of file +# located in the schema folder. diff --git a/core/schema/project/sequences/sequence/shot/step/publish/mobu.yml b/core/schema/project/sequences/sequence/shot/step/publish/mobu.yml index 650b767..ab1bf95 100644 --- a/core/schema/project/sequences/sequence/shot/step/publish/mobu.yml +++ b/core/schema/project/sequences/sequence/shot/step/publish/mobu.yml @@ -1,11 +1,11 @@ # Copyright (c) 2015 Shotgun Software Inc. -# +# # CONFIDENTIAL AND PROPRIETARY -# -# This work is provided "AS IS" and subject to the Shotgun Pipeline Toolkit +# +# This work is provided "AS IS" and subject to the Shotgun Pipeline Toolkit # Source Code License included in this distribution package. See LICENSE. -# By accessing, using, copying or modifying this work you indicate your -# agreement to the Shotgun Pipeline Toolkit Source Code License. All rights +# By accessing, using, copying or modifying this work you indicate your +# agreement to the Shotgun Pipeline Toolkit Source Code License. All rights # not expressly granted therein are reserved by Shotgun Software Inc. # the type of dynamic content @@ -13,4 +13,3 @@ type: "static" # defer creation and only create this folder when Motion Builder starts defer_creation: "tk-motionbuilder" - diff --git a/core/schema/project/sequences/sequence/shot/step/publish/mobu/placeholder b/core/schema/project/sequences/sequence/shot/step/publish/mobu/placeholder index 88a425e..6ce76a9 100644 --- a/core/schema/project/sequences/sequence/shot/step/publish/mobu/placeholder +++ b/core/schema/project/sequences/sequence/shot/step/publish/mobu/placeholder @@ -1,4 +1,4 @@ # This file is a placeholder to ensure that the parent folder is preserved and not deleted by git. # Any file named 'placeholder' will not be copied across when folders are created. # Note: You can which files should be ignored when folders are created in the ignore_files file, -# located in the schema folder. \ No newline at end of file +# located in the schema folder. diff --git a/core/schema/project/sequences/sequence/shot/step/publish/nuke.yml b/core/schema/project/sequences/sequence/shot/step/publish/nuke.yml index 8d319d6..6657bd4 100644 --- a/core/schema/project/sequences/sequence/shot/step/publish/nuke.yml +++ b/core/schema/project/sequences/sequence/shot/step/publish/nuke.yml @@ -1,11 +1,11 @@ # Copyright (c) 2015 Shotgun Software Inc. -# +# # CONFIDENTIAL AND PROPRIETARY -# -# This work is provided "AS IS" and subject to the Shotgun Pipeline Toolkit +# +# This work is provided "AS IS" and subject to the Shotgun Pipeline Toolkit # Source Code License included in this distribution package. See LICENSE. -# By accessing, using, copying or modifying this work you indicate your -# agreement to the Shotgun Pipeline Toolkit Source Code License. All rights +# By accessing, using, copying or modifying this work you indicate your +# agreement to the Shotgun Pipeline Toolkit Source Code License. All rights # not expressly granted therein are reserved by Shotgun Software Inc. # the type of dynamic content @@ -13,4 +13,3 @@ type: "static" # defer creation and only create this folder when Nuke starts defer_creation: "tk-nuke" - diff --git a/core/schema/project/sequences/sequence/shot/step/publish/nuke/placeholder b/core/schema/project/sequences/sequence/shot/step/publish/nuke/placeholder index 88a425e..6ce76a9 100644 --- a/core/schema/project/sequences/sequence/shot/step/publish/nuke/placeholder +++ b/core/schema/project/sequences/sequence/shot/step/publish/nuke/placeholder @@ -1,4 +1,4 @@ # This file is a placeholder to ensure that the parent folder is preserved and not deleted by git. # Any file named 'placeholder' will not be copied across when folders are created. # Note: You can which files should be ignored when folders are created in the ignore_files file, -# located in the schema folder. \ No newline at end of file +# located in the schema folder. diff --git a/core/schema/project/sequences/sequence/shot/step/publish/photoshop.yml b/core/schema/project/sequences/sequence/shot/step/publish/photoshop.yml index 181a108..17a6b39 100644 --- a/core/schema/project/sequences/sequence/shot/step/publish/photoshop.yml +++ b/core/schema/project/sequences/sequence/shot/step/publish/photoshop.yml @@ -1,11 +1,11 @@ # Copyright (c) 2015 Shotgun Software Inc. -# +# # CONFIDENTIAL AND PROPRIETARY -# -# This work is provided "AS IS" and subject to the Shotgun Pipeline Toolkit +# +# This work is provided "AS IS" and subject to the Shotgun Pipeline Toolkit # Source Code License included in this distribution package. See LICENSE. -# By accessing, using, copying or modifying this work you indicate your -# agreement to the Shotgun Pipeline Toolkit Source Code License. All rights +# By accessing, using, copying or modifying this work you indicate your +# agreement to the Shotgun Pipeline Toolkit Source Code License. All rights # not expressly granted therein are reserved by Shotgun Software Inc. # the type of dynamic content @@ -13,4 +13,3 @@ type: "static" # defer creation and only create this folder when Photoshop starts defer_creation: "tk-photoshopcc" - diff --git a/core/schema/project/sequences/sequence/shot/step/publish/photoshop/placeholder b/core/schema/project/sequences/sequence/shot/step/publish/photoshop/placeholder index 88a425e..6ce76a9 100644 --- a/core/schema/project/sequences/sequence/shot/step/publish/photoshop/placeholder +++ b/core/schema/project/sequences/sequence/shot/step/publish/photoshop/placeholder @@ -1,4 +1,4 @@ # This file is a placeholder to ensure that the parent folder is preserved and not deleted by git. # Any file named 'placeholder' will not be copied across when folders are created. # Note: You can which files should be ignored when folders are created in the ignore_files file, -# located in the schema folder. \ No newline at end of file +# located in the schema folder. diff --git a/core/schema/project/sequences/sequence/shot/step/reference/artwork/placeholder b/core/schema/project/sequences/sequence/shot/step/reference/artwork/placeholder index 88a425e..6ce76a9 100644 --- a/core/schema/project/sequences/sequence/shot/step/reference/artwork/placeholder +++ b/core/schema/project/sequences/sequence/shot/step/reference/artwork/placeholder @@ -1,4 +1,4 @@ # This file is a placeholder to ensure that the parent folder is preserved and not deleted by git. # Any file named 'placeholder' will not be copied across when folders are created. # Note: You can which files should be ignored when folders are created in the ignore_files file, -# located in the schema folder. \ No newline at end of file +# located in the schema folder. diff --git a/core/schema/project/sequences/sequence/shot/step/reference/footage/placeholder b/core/schema/project/sequences/sequence/shot/step/reference/footage/placeholder index 88a425e..6ce76a9 100644 --- a/core/schema/project/sequences/sequence/shot/step/reference/footage/placeholder +++ b/core/schema/project/sequences/sequence/shot/step/reference/footage/placeholder @@ -1,4 +1,4 @@ # This file is a placeholder to ensure that the parent folder is preserved and not deleted by git. # Any file named 'placeholder' will not be copied across when folders are created. # Note: You can which files should be ignored when folders are created in the ignore_files file, -# located in the schema folder. \ No newline at end of file +# located in the schema folder. diff --git a/core/schema/project/sequences/sequence/shot/step/review/placeholder b/core/schema/project/sequences/sequence/shot/step/review/placeholder index 88a425e..6ce76a9 100644 --- a/core/schema/project/sequences/sequence/shot/step/review/placeholder +++ b/core/schema/project/sequences/sequence/shot/step/review/placeholder @@ -1,4 +1,4 @@ # This file is a placeholder to ensure that the parent folder is preserved and not deleted by git. # Any file named 'placeholder' will not be copied across when folders are created. # Note: You can which files should be ignored when folders are created in the ignore_files file, -# located in the schema folder. \ No newline at end of file +# located in the schema folder. diff --git a/core/schema/project/sequences/sequence/shot/step/work/3dsmax.yml b/core/schema/project/sequences/sequence/shot/step/work/3dsmax.yml index e54b4b3..8ca4a54 100644 --- a/core/schema/project/sequences/sequence/shot/step/work/3dsmax.yml +++ b/core/schema/project/sequences/sequence/shot/step/work/3dsmax.yml @@ -1,11 +1,11 @@ # Copyright (c) 2015 Shotgun Software Inc. -# +# # CONFIDENTIAL AND PROPRIETARY -# -# This work is provided "AS IS" and subject to the Shotgun Pipeline Toolkit +# +# This work is provided "AS IS" and subject to the Shotgun Pipeline Toolkit # Source Code License included in this distribution package. See LICENSE. -# By accessing, using, copying or modifying this work you indicate your -# agreement to the Shotgun Pipeline Toolkit Source Code License. All rights +# By accessing, using, copying or modifying this work you indicate your +# agreement to the Shotgun Pipeline Toolkit Source Code License. All rights # not expressly granted therein are reserved by Shotgun Software Inc. # the type of dynamic content @@ -13,4 +13,3 @@ type: "static" # defer creation and only create this folder when 3dsmax starts defer_creation: ["tk-3dsmax", "tk-3dsmaxplus"] - diff --git a/core/schema/project/sequences/sequence/shot/step/work/3dsmax/snapshots/placeholder b/core/schema/project/sequences/sequence/shot/step/work/3dsmax/snapshots/placeholder index 88a425e..6ce76a9 100644 --- a/core/schema/project/sequences/sequence/shot/step/work/3dsmax/snapshots/placeholder +++ b/core/schema/project/sequences/sequence/shot/step/work/3dsmax/snapshots/placeholder @@ -1,4 +1,4 @@ # This file is a placeholder to ensure that the parent folder is preserved and not deleted by git. # Any file named 'placeholder' will not be copied across when folders are created. # Note: You can which files should be ignored when folders are created in the ignore_files file, -# located in the schema folder. \ No newline at end of file +# located in the schema folder. diff --git a/core/schema/project/sequences/sequence/shot/step/work/houdini.yml b/core/schema/project/sequences/sequence/shot/step/work/houdini.yml index 82af73e..4acdbad 100644 --- a/core/schema/project/sequences/sequence/shot/step/work/houdini.yml +++ b/core/schema/project/sequences/sequence/shot/step/work/houdini.yml @@ -1,11 +1,11 @@ # Copyright (c) 2015 Shotgun Software Inc. -# +# # CONFIDENTIAL AND PROPRIETARY -# -# This work is provided "AS IS" and subject to the Shotgun Pipeline Toolkit +# +# This work is provided "AS IS" and subject to the Shotgun Pipeline Toolkit # Source Code License included in this distribution package. See LICENSE. -# By accessing, using, copying or modifying this work you indicate your -# agreement to the Shotgun Pipeline Toolkit Source Code License. All rights +# By accessing, using, copying or modifying this work you indicate your +# agreement to the Shotgun Pipeline Toolkit Source Code License. All rights # not expressly granted therein are reserved by Shotgun Software Inc. # the type of dynamic content @@ -13,4 +13,3 @@ type: "static" # defer creation and only create this folder when Houdini starts defer_creation: "tk-houdini" - diff --git a/core/schema/project/sequences/sequence/shot/step/work/houdini/snapshots/placeholder b/core/schema/project/sequences/sequence/shot/step/work/houdini/snapshots/placeholder index 88a425e..6ce76a9 100644 --- a/core/schema/project/sequences/sequence/shot/step/work/houdini/snapshots/placeholder +++ b/core/schema/project/sequences/sequence/shot/step/work/houdini/snapshots/placeholder @@ -1,4 +1,4 @@ # This file is a placeholder to ensure that the parent folder is preserved and not deleted by git. # Any file named 'placeholder' will not be copied across when folders are created. # Note: You can which files should be ignored when folders are created in the ignore_files file, -# located in the schema folder. \ No newline at end of file +# located in the schema folder. diff --git a/core/schema/project/sequences/sequence/shot/step/work/images/placeholder b/core/schema/project/sequences/sequence/shot/step/work/images/placeholder index 88a425e..6ce76a9 100644 --- a/core/schema/project/sequences/sequence/shot/step/work/images/placeholder +++ b/core/schema/project/sequences/sequence/shot/step/work/images/placeholder @@ -1,4 +1,4 @@ # This file is a placeholder to ensure that the parent folder is preserved and not deleted by git. # Any file named 'placeholder' will not be copied across when folders are created. # Note: You can which files should be ignored when folders are created in the ignore_files file, -# located in the schema folder. \ No newline at end of file +# located in the schema folder. diff --git a/core/schema/project/sequences/sequence/shot/step/work/maya.yml b/core/schema/project/sequences/sequence/shot/step/work/maya.yml index 0cb3ad0..a44c5e4 100644 --- a/core/schema/project/sequences/sequence/shot/step/work/maya.yml +++ b/core/schema/project/sequences/sequence/shot/step/work/maya.yml @@ -1,11 +1,11 @@ # Copyright (c) 2015 Shotgun Software Inc. -# +# # CONFIDENTIAL AND PROPRIETARY -# -# This work is provided "AS IS" and subject to the Shotgun Pipeline Toolkit +# +# This work is provided "AS IS" and subject to the Shotgun Pipeline Toolkit # Source Code License included in this distribution package. See LICENSE. -# By accessing, using, copying or modifying this work you indicate your -# agreement to the Shotgun Pipeline Toolkit Source Code License. All rights +# By accessing, using, copying or modifying this work you indicate your +# agreement to the Shotgun Pipeline Toolkit Source Code License. All rights # not expressly granted therein are reserved by Shotgun Software Inc. # the type of dynamic content @@ -13,4 +13,3 @@ type: "static" # defer creation and only create this folder when Maya starts defer_creation: "tk-maya" - diff --git a/core/schema/project/sequences/sequence/shot/step/work/maya/snapshots/placeholder b/core/schema/project/sequences/sequence/shot/step/work/maya/snapshots/placeholder index 88a425e..6ce76a9 100644 --- a/core/schema/project/sequences/sequence/shot/step/work/maya/snapshots/placeholder +++ b/core/schema/project/sequences/sequence/shot/step/work/maya/snapshots/placeholder @@ -1,4 +1,4 @@ # This file is a placeholder to ensure that the parent folder is preserved and not deleted by git. # Any file named 'placeholder' will not be copied across when folders are created. # Note: You can which files should be ignored when folders are created in the ignore_files file, -# located in the schema folder. \ No newline at end of file +# located in the schema folder. diff --git a/core/schema/project/sequences/sequence/shot/step/work/mobu.yml b/core/schema/project/sequences/sequence/shot/step/work/mobu.yml index 650b767..ab1bf95 100644 --- a/core/schema/project/sequences/sequence/shot/step/work/mobu.yml +++ b/core/schema/project/sequences/sequence/shot/step/work/mobu.yml @@ -1,11 +1,11 @@ # Copyright (c) 2015 Shotgun Software Inc. -# +# # CONFIDENTIAL AND PROPRIETARY -# -# This work is provided "AS IS" and subject to the Shotgun Pipeline Toolkit +# +# This work is provided "AS IS" and subject to the Shotgun Pipeline Toolkit # Source Code License included in this distribution package. See LICENSE. -# By accessing, using, copying or modifying this work you indicate your -# agreement to the Shotgun Pipeline Toolkit Source Code License. All rights +# By accessing, using, copying or modifying this work you indicate your +# agreement to the Shotgun Pipeline Toolkit Source Code License. All rights # not expressly granted therein are reserved by Shotgun Software Inc. # the type of dynamic content @@ -13,4 +13,3 @@ type: "static" # defer creation and only create this folder when Motion Builder starts defer_creation: "tk-motionbuilder" - diff --git a/core/schema/project/sequences/sequence/shot/step/work/mobu/snapshots/placeholder b/core/schema/project/sequences/sequence/shot/step/work/mobu/snapshots/placeholder index 88a425e..6ce76a9 100644 --- a/core/schema/project/sequences/sequence/shot/step/work/mobu/snapshots/placeholder +++ b/core/schema/project/sequences/sequence/shot/step/work/mobu/snapshots/placeholder @@ -1,4 +1,4 @@ # This file is a placeholder to ensure that the parent folder is preserved and not deleted by git. # Any file named 'placeholder' will not be copied across when folders are created. # Note: You can which files should be ignored when folders are created in the ignore_files file, -# located in the schema folder. \ No newline at end of file +# located in the schema folder. diff --git a/core/schema/project/sequences/sequence/shot/step/work/nuke.yml b/core/schema/project/sequences/sequence/shot/step/work/nuke.yml index 8d319d6..6657bd4 100644 --- a/core/schema/project/sequences/sequence/shot/step/work/nuke.yml +++ b/core/schema/project/sequences/sequence/shot/step/work/nuke.yml @@ -1,11 +1,11 @@ # Copyright (c) 2015 Shotgun Software Inc. -# +# # CONFIDENTIAL AND PROPRIETARY -# -# This work is provided "AS IS" and subject to the Shotgun Pipeline Toolkit +# +# This work is provided "AS IS" and subject to the Shotgun Pipeline Toolkit # Source Code License included in this distribution package. See LICENSE. -# By accessing, using, copying or modifying this work you indicate your -# agreement to the Shotgun Pipeline Toolkit Source Code License. All rights +# By accessing, using, copying or modifying this work you indicate your +# agreement to the Shotgun Pipeline Toolkit Source Code License. All rights # not expressly granted therein are reserved by Shotgun Software Inc. # the type of dynamic content @@ -13,4 +13,3 @@ type: "static" # defer creation and only create this folder when Nuke starts defer_creation: "tk-nuke" - diff --git a/core/schema/project/sequences/sequence/shot/step/work/nuke/snapshots/placeholder b/core/schema/project/sequences/sequence/shot/step/work/nuke/snapshots/placeholder index 88a425e..6ce76a9 100644 --- a/core/schema/project/sequences/sequence/shot/step/work/nuke/snapshots/placeholder +++ b/core/schema/project/sequences/sequence/shot/step/work/nuke/snapshots/placeholder @@ -1,4 +1,4 @@ # This file is a placeholder to ensure that the parent folder is preserved and not deleted by git. # Any file named 'placeholder' will not be copied across when folders are created. # Note: You can which files should be ignored when folders are created in the ignore_files file, -# located in the schema folder. \ No newline at end of file +# located in the schema folder. diff --git a/core/schema/project/sequences/sequence/shot/step/work/photoshop.yml b/core/schema/project/sequences/sequence/shot/step/work/photoshop.yml index 181a108..17a6b39 100644 --- a/core/schema/project/sequences/sequence/shot/step/work/photoshop.yml +++ b/core/schema/project/sequences/sequence/shot/step/work/photoshop.yml @@ -1,11 +1,11 @@ # Copyright (c) 2015 Shotgun Software Inc. -# +# # CONFIDENTIAL AND PROPRIETARY -# -# This work is provided "AS IS" and subject to the Shotgun Pipeline Toolkit +# +# This work is provided "AS IS" and subject to the Shotgun Pipeline Toolkit # Source Code License included in this distribution package. See LICENSE. -# By accessing, using, copying or modifying this work you indicate your -# agreement to the Shotgun Pipeline Toolkit Source Code License. All rights +# By accessing, using, copying or modifying this work you indicate your +# agreement to the Shotgun Pipeline Toolkit Source Code License. All rights # not expressly granted therein are reserved by Shotgun Software Inc. # the type of dynamic content @@ -13,4 +13,3 @@ type: "static" # defer creation and only create this folder when Photoshop starts defer_creation: "tk-photoshopcc" - diff --git a/core/schema/project/sequences/sequence/shot/step/work/photoshop/snapshots/placeholder b/core/schema/project/sequences/sequence/shot/step/work/photoshop/snapshots/placeholder index 88a425e..6ce76a9 100644 --- a/core/schema/project/sequences/sequence/shot/step/work/photoshop/snapshots/placeholder +++ b/core/schema/project/sequences/sequence/shot/step/work/photoshop/snapshots/placeholder @@ -1,4 +1,4 @@ # This file is a placeholder to ensure that the parent folder is preserved and not deleted by git. # Any file named 'placeholder' will not be copied across when folders are created. # Note: You can which files should be ignored when folders are created in the ignore_files file, -# located in the schema folder. \ No newline at end of file +# located in the schema folder. diff --git a/env/README.md b/env/README.md index c7c4822..d3b3495 100644 --- a/env/README.md +++ b/env/README.md @@ -1,38 +1,38 @@ Overview of tk-config-default2 environment structure ==================================================== -The `tk-config-default2` config has a different structure than previous -configurations provided by toolkit. It has been reorganized based on client -feedback and observation to help maximize efficiency when needing to manually -curate your production environments. +The `tk-config-default2` config has a different structure than previous +configurations provided by toolkit. It has been reorganized based on client +feedback and observation to help maximize efficiency when needing to manually +curate your production environments. -Top-level environments +Top-level environments ---------------------- -There are 7 top-level files that provide the entry points to environment -configuration. The names of these files correspond to one of the strings +There are 7 top-level files that provide the entry points to environment +configuration. The names of these files correspond to one of the strings returned by the `pick_environment` hook. These files are: -* `asset.yml` - Asset context without a pipeline step. Typically used when +* `asset.yml` - Asset context without a pipeline step. Typically used when building menus in the SG web interface. * `asset_step.yml` - Asset context with a pipeline step. This is the environment typically associated with an artist's Asset work area. -* `project.yml` - A Shotgun project context. Often used when launching a +* `project.yml` - A Shotgun project context. Often used when launching a DCC from SG Desktop, providing apps for further refining the context. -* `publishedfile_version.yml` - A context for providing functionality when +* `publishedfile_version.yml` - A context for providing functionality when viewing PublishedFile or Version entities, typically in SG web interface. * `sequence.yml` - A context used for sequence-based workflows. -* `shot.yml` - Shot context without a pipeline step. Typically used when +* `shot.yml` - Shot context without a pipeline step. Typically used when building menus in the SG web interface. * `shot_step.yml` - Shot context with a pipeline step. This is the environment typically associated with an artist's Shot work area. -Each of these files provides an outline of the engines configured for that +Each of these files provides an outline of the engines configured for that environment. These file don't typically need to be modified unless you're adding -a new engine configuration into one of the environments. +a new engine configuration into one of the environments. The structure of these files is as follows: - + ```yaml includes: # include all frameworks @@ -47,26 +47,26 @@ engines: : "@settings.." : "@settings.." ... - + # reference all of the frameworks frameworks: "@frameworks" ``` The `tk-config-default2` heavily relies on the Toolkit configuration includes -and references. The `includes` section references files that define regular +and references. The `includes` section references files that define regular `YAML` key/value pairs. These keys can then be referenced with the `"@"` syntax seen above. Have a look at one of the top-level environment files for a -concrete example of how this works. +concrete example of how this works. Engine Settings --------------- -The top-level environments include engine settings from -`includes/settings/.yml` files. In `tk-config-default2`, all +The top-level environments include engine settings from +`includes/settings/.yml` files. In `tk-config-default2`, all engine-specific configurations live in that engine's settings file. This -makes it straight forward to know where to go to change how an engine is -configured. For example, if you need to change how the Maya engine is -configured, simply edit the `includes/settings/tk-maya.yml` file. +makes it straight forward to know where to go to change how an engine is +configured. For example, if you need to change how the Maya engine is +configured, simply edit the `includes/settings/tk-maya.yml` file. The structure of these files is as follows: @@ -85,7 +85,7 @@ includes: settings..: apps: # list of apps for this engine in the specific environment - : + : # some simple apps only need to specify a location descriptor location: "@apps..location" # other apps need more configuration, referenced from the included app file @@ -93,24 +93,24 @@ settings..: ... # engine settings are defined/edited here location: "@engines.tk-maya.location" - + # other environment configurations -... +... ``` Here you can see where the engine-specific environment keys ( `settings..`) are defined and then included into the -top-level environment files. Take a look at one of the engine configuration -files for a concrete example. +top-level environment files. Take a look at one of the engine configuration +files for a concrete example. App Settings ------------ -Similar to the engine configuration files, any apps that require more than a +Similar to the engine configuration files, any apps that require more than a location descriptor have a settings file in `includes/settings`. For example, to -make changes to the Nuke Write Node app, all of the different configurations -(for all environments) are defined in the -`includes/settings/tk-nuke-writenode.yml` file. +make changes to the Nuke Write Node app, all of the different configurations +(for all environments) are defined in the +`includes/settings/tk-nuke-writenode.yml` file. The structure of these files is as follows: @@ -131,51 +131,51 @@ settings...: location: "@apps..location" ``` -The keys defined in this file are the ones referenced in the engine +The keys defined in this file are the ones referenced in the engine configuration files. Have a look at one of the app configuration files to see -a concrete example. +a concrete example. App & Engine Locations ---------------------- -One of the changes made for `tk-config-basic2` was to centralize the location -descriptors for apps and engines. By default, this configuration defines the -location for each app and engine being used in exactly one file. +One of the changes made for `tk-config-basic2` was to centralize the location +descriptors for apps and engines. By default, this configuration defines the +location for each app and engine being used in exactly one file. For engines, the `includes/engine_locations.yml` file defines location -descriptors for all engines. These location descriptors are then included and -referenced anywhere an engine is used. This can be overridden, of course, by +descriptors for all engines. These location descriptors are then included and +referenced anywhere an engine is used. This can be overridden, of course, by explicitly defining a location descriptor in one of the engine configuration -files. +files. Similarly, all app location descriptors are defined in the -`includes/app_locations.yml` file. This file is then included by any -engine or app configuration that need to define an app's location. +`includes/app_locations.yml` file. This file is then included by any +engine or app configuration that need to define an app's location. -Centralizing these location descriptors makes it extremely easy to test and -rollout new integrations onto production. +Centralizing these location descriptors makes it extremely easy to test and +rollout new integrations onto production. Frameworks ---------- -Like the app and engine locations file, the `includes/frameworks.yml` -file defines a single, top-level `@frameworks` key that can be included -and used wherever frameworks are required (typically in the top-level -enviornment configuration files). This is the only file that defines location -descriptors for frameworks. +Like the app and engine locations file, the `includes/frameworks.yml` +file defines a single, top-level `@frameworks` key that can be included +and used wherever frameworks are required (typically in the top-level +enviornment configuration files). This is the only file that defines location +descriptors for frameworks. Software Paths -------------- -The `paths.yml` file found in older configurations has been renamed to -`software_paths.yml` and lives in the `includes` folder. This file has -been significantly reduced in terms of content because of the new Software +The `paths.yml` file found in older configurations has been renamed to +`software_paths.yml` and lives in the `includes` folder. This file has +been significantly reduced in terms of content because of the new Software entity and the ability of many of the latest Toolkit engines to scan the user's -filesystem for installed software. What's left in this file is software that -does not have an engine that supports the new Software entity. +filesystem for installed software. What's left in this file is software that +does not have an engine that supports the new Software entity. -The file still defines software paths for various operating systems, but the -keys used has been modified for consistency. The file takes the form: +The file still defines software paths for various operating systems, but the +keys used has been modified for consistency. The file takes the form: ```yaml # @@ -187,8 +187,8 @@ path.windows.: C:\Path\to\the\Software.exe ... ``` -These paths are typically included and used by apps like `tk-multi-launchapp`. -See the `software_paths.yml` and +These paths are typically included and used by apps like `tk-multi-launchapp`. +See the `software_paths.yml` and `includes/settings/tk-multi-launchapp.yml` files to see concrete examples of how this file is used. @@ -196,5 +196,5 @@ Questions? ---------- If you have any questions or concerns about the structure of this configuration, -or if you have any ideas for how to improve it, please send an email to -[support@shotgunsoftware.com](mailto:support@shotgunsoftware.com). +or if you have any ideas for how to improve it, please send an email to +[support@shotgunsoftware.com](mailto:support@shotgunsoftware.com). diff --git a/env/includes/engine_locations.yml b/env/includes/engine_locations.yml index 4b7a357..0ce2cea 100644 --- a/env/includes/engine_locations.yml +++ b/env/includes/engine_locations.yml @@ -101,4 +101,4 @@ engines.tk-shotgun.location: engines.tk-vred.location: type: app_store name: tk-vred - version: v2.0.2 \ No newline at end of file + version: v2.0.2 diff --git a/env/includes/frameworks.yml b/env/includes/frameworks.yml index 32fd8f0..904a718 100644 --- a/env/includes/frameworks.yml +++ b/env/includes/frameworks.yml @@ -61,4 +61,4 @@ frameworks: location: version: v0.2.7 type: app_store - name: tk-framework-widget \ No newline at end of file + name: tk-framework-widget diff --git a/env/includes/settings/tk-alias.yml b/env/includes/settings/tk-alias.yml index 7d71480..e5cc041 100644 --- a/env/includes/settings/tk-alias.yml +++ b/env/includes/settings/tk-alias.yml @@ -61,4 +61,4 @@ settings.tk-alias.project: tk-multi-workfiles2: "@settings.tk-multi-workfiles2.alias" menu_favourites: - {app_instance: tk-multi-workfiles2, name: File Open...} - location: "@engines.tk-alias.location" \ No newline at end of file + location: "@engines.tk-alias.location" diff --git a/env/includes/settings/tk-desktop2.yml b/env/includes/settings/tk-desktop2.yml index 4d38766..73392a5 100644 --- a/env/includes/settings/tk-desktop2.yml +++ b/env/includes/settings/tk-desktop2.yml @@ -33,4 +33,4 @@ settings.tk-desktop2.all: tk-multi-launchmari: "@settings.tk-multi-launchapp.mari" tk-multi-launchmotionbuilder: "@settings.tk-multi-launchapp.motionbuilder" tk-multi-publish2: "@settings.tk-multi-publish2.standalone" - location: "@engines.tk-desktop2.location" \ No newline at end of file + location: "@engines.tk-desktop2.location" diff --git a/env/includes/settings/tk-hiero-export.yml b/env/includes/settings/tk-hiero-export.yml index 3ce096f..8ce42d5 100644 --- a/env/includes/settings/tk-hiero-export.yml +++ b/env/includes/settings/tk-hiero-export.yml @@ -24,4 +24,4 @@ settings.tk-hiero-export: template_plate_path: hiero_plate_path template_render_path: hiero_render_path template_version: hiero_version - location: "@apps.tk-hiero-export.location" \ No newline at end of file + location: "@apps.tk-hiero-export.location" diff --git a/env/includes/settings/tk-houdini-mantranode.yml b/env/includes/settings/tk-houdini-mantranode.yml index 4b7a310..defce23 100644 --- a/env/includes/settings/tk-houdini-mantranode.yml +++ b/env/includes/settings/tk-houdini-mantranode.yml @@ -41,4 +41,4 @@ settings.tk-houdini-mantranode.shot_step: output_ifd_template: houdini_shot_ifd output_dcm_template: houdini_shot_dcm output_extra_plane_template: houdini_shot_extra_plane - location: "@apps.tk-houdini-mantranode.location" \ No newline at end of file + location: "@apps.tk-houdini-mantranode.location" diff --git a/env/includes/settings/tk-houdini.yml b/env/includes/settings/tk-houdini.yml index d951774..1e00750 100644 --- a/env/includes/settings/tk-houdini.yml +++ b/env/includes/settings/tk-houdini.yml @@ -118,4 +118,3 @@ settings.tk-houdini.shot_step: - {app_instance: tk-multi-workfiles2, name: File Save...} - {app_instance: tk-multi-publish2, name: Publish...} location: '@engines.tk-houdini.location' - diff --git a/env/includes/settings/tk-mari.yml b/env/includes/settings/tk-mari.yml index d247508..dca3353 100644 --- a/env/includes/settings/tk-mari.yml +++ b/env/includes/settings/tk-mari.yml @@ -52,4 +52,4 @@ settings.tk-mari.project: location: "@apps.tk-multi-about.location" tk-multi-shotgunpanel: "@settings.tk-multi-shotgunpanel" tk-multi-workfiles: "@settings.tk-multi-workfiles.mari" - location: "@engines.tk-mari.location" \ No newline at end of file + location: "@engines.tk-mari.location" diff --git a/env/includes/settings/tk-maya.yml b/env/includes/settings/tk-maya.yml index e803fde..dfa1bfa 100644 --- a/env/includes/settings/tk-maya.yml +++ b/env/includes/settings/tk-maya.yml @@ -114,4 +114,4 @@ settings.tk-maya.shot_step: - {app_instance: tk-multi-workfiles2, name: File Save...} - {app_instance: tk-multi-publish2, name: Publish...} template_project: shot_work_area_maya - location: "@engines.tk-maya.location" \ No newline at end of file + location: "@engines.tk-maya.location" diff --git a/env/includes/settings/tk-motionbuilder.yml b/env/includes/settings/tk-motionbuilder.yml index f3cdff2..234e119 100644 --- a/env/includes/settings/tk-motionbuilder.yml +++ b/env/includes/settings/tk-motionbuilder.yml @@ -89,7 +89,7 @@ settings.tk-motionbuilder.shot: apps: tk-multi-about: location: '@apps.tk-multi-about.location' - tk-multi-shotgunpanel: + tk-multi-shotgunpanel: location: '@apps.tk-multi-shotgunpanel.location' tk-multi-screeningroom: "@settings.tk-multi-screeningroom.rv" tk-multi-workfiles2: diff --git a/env/includes/settings/tk-multi-breakdown.yml b/env/includes/settings/tk-multi-breakdown.yml index 7af21c3..b707cf1 100644 --- a/env/includes/settings/tk-multi-breakdown.yml +++ b/env/includes/settings/tk-multi-breakdown.yml @@ -28,4 +28,4 @@ settings.tk-multi-breakdown.alias: # VRED settings.tk-multi-breakdown.vred: hook_scene_operations: '{engine}/tk-multi-breakdown/basic/scene_operations.py' - location: "@apps.tk-multi-breakdown.location" \ No newline at end of file + location: "@apps.tk-multi-breakdown.location" diff --git a/env/includes/settings/tk-multi-launchapp.yml b/env/includes/settings/tk-multi-launchapp.yml index 8db7987..2d7d894 100644 --- a/env/includes/settings/tk-multi-launchapp.yml +++ b/env/includes/settings/tk-multi-launchapp.yml @@ -60,4 +60,3 @@ settings.tk-multi-launchapp.motionbuilder: windows_path: "@path.windows.motionbuilder" menu_name: MotionBuilder location: "@apps.tk-multi-launchapp.location" - diff --git a/env/includes/settings/tk-multi-loader2.yml b/env/includes/settings/tk-multi-loader2.yml index e422f95..ba2a3e0 100644 --- a/env/includes/settings/tk-multi-loader2.yml +++ b/env/includes/settings/tk-multi-loader2.yml @@ -363,5 +363,3 @@ settings.tk-multi-loader2.vred: actions_hook: "{engine}/tk-multi-loader2/basic/scene_actions.py" publish_filters: [["sg_status_list", "is_not", null]] location: "@apps.tk-multi-loader2.location" - - diff --git a/env/includes/settings/tk-multi-publish2.yml b/env/includes/settings/tk-multi-publish2.yml index 91c6b05..bc4b9f2 100644 --- a/env/includes/settings/tk-multi-publish2.yml +++ b/env/includes/settings/tk-multi-publish2.yml @@ -555,4 +555,3 @@ settings.tk-multi-publish2.vred.asset_step: settings: {} help_url: *help_url location: "@apps.tk-multi-publish2.location" - diff --git a/env/includes/settings/tk-multi-screeningroom.yml b/env/includes/settings/tk-multi-screeningroom.yml index b5d56f1..49891f8 100644 --- a/env/includes/settings/tk-multi-screeningroom.yml +++ b/env/includes/settings/tk-multi-screeningroom.yml @@ -24,4 +24,4 @@ settings.tk-multi-screeningroom.rv: rv_path_linux: "@path.linux.rv" rv_path_mac: "@path.mac.rv" rv_path_windows: "@path.windows.rv" - init_hook: "{self}/init.py" \ No newline at end of file + init_hook: "{self}/init.py" diff --git a/env/includes/settings/tk-multi-shotgunpanel.yml b/env/includes/settings/tk-multi-shotgunpanel.yml index 928096e..cb3d666 100644 --- a/env/includes/settings/tk-multi-shotgunpanel.yml +++ b/env/includes/settings/tk-multi-shotgunpanel.yml @@ -315,4 +315,4 @@ settings.tk-multi-shotgunpanel.vred: - actions: [quicktime_clipboard, sequence_clipboard, add_to_playlist] filters: {} actions_hook: "{engine}/tk-multi-shotgunpanel/basic/scene_actions.py" - location: "@apps.tk-multi-shotgunpanel.location" \ No newline at end of file + location: "@apps.tk-multi-shotgunpanel.location" diff --git a/env/includes/settings/tk-multi-snapshot.yml b/env/includes/settings/tk-multi-snapshot.yml index 1114b53..1c3f0ee 100644 --- a/env/includes/settings/tk-multi-snapshot.yml +++ b/env/includes/settings/tk-multi-snapshot.yml @@ -155,4 +155,4 @@ settings.tk-multi-snapshot.vred.asset_step: template_snapshot: vred_asset_snapshot template_work: vred_asset_work hook_scene_operation: "{engine}/tk-multi-snapshot/basic/scene_operation.py" - location: "@apps.tk-multi-snapshot.location" \ No newline at end of file + location: "@apps.tk-multi-snapshot.location" diff --git a/env/includes/settings/tk-multi-workfiles2.yml b/env/includes/settings/tk-multi-workfiles2.yml index 90bceab..6310722 100644 --- a/env/includes/settings/tk-multi-workfiles2.yml +++ b/env/includes/settings/tk-multi-workfiles2.yml @@ -616,4 +616,4 @@ settings.tk-multi-workfiles2.vred.asset_step: - [task_assignees.Group.users, is, '{context.user}'] - [task_assignees, is, '{context.user}'] hook_scene_operation: "{engine}/tk-multi-workfiles2/basic/scene_operation.py" - location: "@apps.tk-multi-workfiles2.location" \ No newline at end of file + location: "@apps.tk-multi-workfiles2.location" diff --git a/env/includes/settings/tk-nuke-writenode.yml b/env/includes/settings/tk-nuke-writenode.yml index 734c9ee..26bcf71 100644 --- a/env/includes/settings/tk-nuke-writenode.yml +++ b/env/includes/settings/tk-nuke-writenode.yml @@ -67,4 +67,4 @@ settings.tk-nuke-writenode.shot: settings: {} tank_type: Rendered Image tile_color: [] - location: "@apps.tk-nuke-writenode.location" \ No newline at end of file + location: "@apps.tk-nuke-writenode.location" diff --git a/env/includes/settings/tk-photoshopcc.yml b/env/includes/settings/tk-photoshopcc.yml index afc696f..ad046c1 100644 --- a/env/includes/settings/tk-photoshopcc.yml +++ b/env/includes/settings/tk-photoshopcc.yml @@ -105,4 +105,4 @@ settings.tk-photoshopcc.shot_step: - {app_instance: tk-multi-snapshot, name: Snapshot...} - {app_instance: tk-multi-workfiles2, name: File Save...} - {app_instance: tk-multi-publish2, name: Publish...} - location: '@engines.tk-photoshopcc.location' \ No newline at end of file + location: '@engines.tk-photoshopcc.location' diff --git a/env/includes/settings/tk-shotgun-launchfolder.yml b/env/includes/settings/tk-shotgun-launchfolder.yml index 576d831..1e9b99d 100644 --- a/env/includes/settings/tk-shotgun-launchfolder.yml +++ b/env/includes/settings/tk-shotgun-launchfolder.yml @@ -18,4 +18,4 @@ includes: settings.tk-shotgun-launchfolder: deny_permissions: [] deny_platforms: [] - location: "@apps.tk-shotgun-launchfolder.location" \ No newline at end of file + location: "@apps.tk-shotgun-launchfolder.location" diff --git a/env/includes/settings/tk-vred.yml b/env/includes/settings/tk-vred.yml index a2be4a4..484f4dd 100644 --- a/env/includes/settings/tk-vred.yml +++ b/env/includes/settings/tk-vred.yml @@ -63,4 +63,4 @@ settings.tk-vred.project: menu_favourites: - {app_instance: tk-multi-workfiles2, name: File Open...} file_usage_hook: "{tk-framework-locking_v0.x.x}/apps/vred_file_usage.py" - location: "@engines.tk-vred.location" \ No newline at end of file + location: "@engines.tk-vred.location" diff --git a/hooks/snapshot_history_post_quickdaily.py b/hooks/snapshot_history_post_quickdaily.py index a71df1c..0cd5fd3 100644 --- a/hooks/snapshot_history_post_quickdaily.py +++ b/hooks/snapshot_history_post_quickdaily.py @@ -11,8 +11,8 @@ from tank import Hook from tank import TankError -class SnapshotHistoryPostQuickdaily(Hook): +class SnapshotHistoryPostQuickdaily(Hook): def execute(self, mov_path, version_id, comments, **kwargs): app = self.parent # get app diff --git a/hooks/tk-multi-launchapp/before_register_command.py b/hooks/tk-multi-launchapp/before_register_command.py index a1472b9..421ceec 100644 --- a/hooks/tk-multi-launchapp/before_register_command.py +++ b/hooks/tk-multi-launchapp/before_register_command.py @@ -1,25 +1,27 @@ # Copyright (c) 2017 Shotgun Software Inc. -# +# # CONFIDENTIAL AND PROPRIETARY -# -# This work is provided "AS IS" and subject to the Shotgun Pipeline Toolkit +# +# This work is provided "AS IS" and subject to the Shotgun Pipeline Toolkit # Source Code License included in this distribution package. See LICENSE. -# By accessing, using, copying or modifying this work you indicate your -# agreement to the Shotgun Pipeline Toolkit Source Code License. All rights +# By accessing, using, copying or modifying this work you indicate your +# agreement to the Shotgun Pipeline Toolkit Source Code License. All rights # not expressly granted therein are reserved by Shotgun Software Inc. import sgtk HookBaseClass = sgtk.get_hook_baseclass() + class BeforeRegisterCommand(HookBaseClass): """ Before Register Command Hook This hook is run prior to launchapp registering launcher commands with - the parent engine. Note: this hook is only run for Software entity + the parent engine. Note: this hook is only run for Software entity launchers. """ + def determine_engine_instance_name(self, software_version, engine_instance_name): """ Hook method to intercept SoftwareLauncher and engine instance name data prior to @@ -42,4 +44,3 @@ class BeforeRegisterCommand(HookBaseClass): engine_instance_name = "tk-nukestudio" return engine_instance_name -