Merge branch 'master' into pubmaster

Author: gplsteph

.pre-commit-config.yaml

@@ -35,7 +35,7 @@ repos:
     - id: trailing-whitespace
   # Leave black at the bottom so all touchups are done before it is run.
   - repo: https://github.com/ambv/black
-    rev: 20.8b1
+    rev: 22.3.0
     hooks:
     - id: black
       language_version: python3

SECURITY.md

@@ -0,0 +1,36 @@
+# Security Policy
+
+## Security
+
+At Autodesk, we know that the security of your data is critical to your studio’s
+operation.
+As the industry shifts to the cloud, Flow Production Tracking knows that security
+and service models are more important than ever.
+
+The confidentiality, integrity, and availability of your content is at the top
+of our priority list.
+Not only do we have a team of Flow Production Tracking engineers dedicated to
+platform security and performance, we are also backed by Autodesk’s security team,
+also invests heavily in the security for broad range of industries and customers.
+We constantly reassess, develop, and improve our risk management program because
+we know that the landscape of security is ever-changing.
+
+If you believe you have found a security vulnerability in any
+Flow Production Tracking-owned repository, please report it to us as described
+below.
+
+
+## Reporting Security Issues
+
+**Please do not report security vulnerabilities through public GitHub issues.**
+
+Instead, please report them by sending a message to
+[Autodesk Trust Center](https://www.autodesk.com/trust/contact-us).
+
+Please include as much information as you can provide such as locations,
+configurations, reproduction steps, exploit code, impact, etc.
+
+
+## Additional Information
+
+Please check out the [Flow Production Tracking Security White Paper](https://help.autodesk.com/view/SGSUB/ENU/?guid=SG_Administrator_ar_general_security_ar_security_white_paper_html).

core/core_api.yml

@@ -14,4 +14,4 @@
 location:
   type: app_store
   name: tk-core
-  version: v0.20.12
+  version: v0.21.4

core/hooks/README

@@ -1,6 +1,6 @@
 This location is for core hook override files.
 
-The ShotGrid Pipeline Toolkit comes with a series of Core Hooks, essentially snippets of python
+The Flow Production Tracking 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.

core/hooks/bootstrap.py

@@ -1,5 +1,9 @@
-# This file is provided by Epic Games, Inc. and is subject to the license
-# file included in this repository.
+# Copyright 2020 GPL Solutions, LLC.  All rights reserved.
+#
+# Use of this software is subject to the terms of the GPL Solutions license
+# agreement provided at the time of installation or download, or which otherwise
+# accompanies this software in either electronic or hard copy form.
+#
 
 """
 This hook is used override some of the functionality of the :class:`~sgtk.bootstrap.ToolkitManager`.
@@ -27,11 +31,11 @@
 
 class Bootstrap(get_hook_baseclass()):
     """
-    Override the bootstrap core hook to cache some bundles ourselves.
+    Override the bootstrap core hook to cache ourself some bundles.
     http://developer.shotgunsoftware.com/tk-core/core.html#bootstrap.Bootstrap
     """
-    # List of github repos for which we download releases, with a github token to
-    # do the download if the repo is private
+    # List of github repos for which we download releases, with a token to do
+    # the download
     _download_release_from_github = [
         ("ue4plugins/tk-framework-unrealqt", ""),
         ("GPLgithub/tk-framework-unrealqt", ""),
@@ -97,7 +101,7 @@ def populate_bundle_cache_entry(self, destination, descriptor, **kwargs):
             if self.shotgun.config.proxy_handler:
                 # Re-use proxy settings from the Shotgun connection
                 opener = url2.build_opener(
-                    self.parent.shotgun.config.proxy_handler,
+                    self.shotgun.config.proxy_handler,
                 )
                 url2.install_opener(opener)
 
@@ -138,7 +142,7 @@ def populate_bundle_cache_entry(self, destination, descriptor, **kwargs):
             for asset in response_d["assets"]:
                 name = asset["name"]
                 m = re.match(
-                    r"%s-py\d.\d-%s.zip" % (version, pname),
+                    r"%s-py\d.\d+-%s.zip" % (version, pname),
                     name
                 )
                 if m:
@@ -229,7 +233,7 @@ def _download_zip_github_asset(self, asset, destination, token):
         if self.shotgun.config.proxy_handler:
             # Re-use proxy settings from the Shotgun connection
             opener = url2.build_opener(
-                self.parent.shotgun.config.proxy_handler,
+                self.shotgun.config.proxy_handler,
                 auth_handler
             )
         else:

env/asset_step.yml

@@ -36,7 +36,6 @@ engines:
   tk-shell: '@shell.asset_step'
   tk-photoshopcc: '@photoshopcc.asset_step'
   tk-aftereffects: '@aftereffects.asset_step'
-  tk-3dsmaxplus: '@3dsmaxplus.asset_step'
   tk-3dsmax: '@3dsmax.asset_step'
   tk-alias: '@alias.asset_step'
   tk-vred: '@vred.asset_step'

env/includes/3dsmax/apps.yml

@@ -16,9 +16,7 @@ includes:
 - ../common/apps.yml
 - ../common/settings/tk-multi-publish2.yml
 
-# tk-3dsmaxplus app settings
-
-3dsmaxplus.apps.tk-multi-publish2: &3dsmaxplus_apps_tk-multi-publish2
+3dsmax.apps.tk-multi-publish2:
   help_url: "@common.apps.tk-multi-publish2.help_url"
   collector: "{self}/collector.py:{engine}/tk-multi-publish2/basic/collector.py"
   publish_plugins:
@@ -27,19 +25,19 @@ includes:
     - name: Begin file versioning
       hook: "{engine}/tk-multi-publish2/basic/start_version_control.py"
       settings: {}
-    - name: Publish to ShotGrid
+    - name: Publish to Flow Production Tracking
       hook: "{self}/publish_file.py:{engine}/tk-multi-publish2/basic/publish_session.py"
       settings: {}
   location: "@common.apps.tk-multi-publish2.location"
 
-3dsmaxplus.apps.tk-multi-loader2: &3dsmaxplus_apps_tk-multi-loader2
+3dsmax.apps.tk-multi-loader2:
   action_mappings:
     3dsmax Scene: [import, reference]
     Alembic Cache: [import]
     Image: [texture_node]
     Rendered Image: [texture_node]
     Texture: [texture_node]
-  actions_hook: '{self}/tk-3dsmaxplus_actions.py'
+  actions_hook: "{engine}/tk-multi-loader2/basic/scene_actions.py"
   download_thumbnails: true
   entities:
   - caption: Current Project
@@ -60,10 +58,13 @@ includes:
   publish_filters: [["sg_status_list", "is_not", null]]
   location: "@common.apps.tk-multi-loader2.location"
 
-3dsmaxplus.apps.tk-multi-shotgunpanel: &3dsmaxplus_apps_tk-multi-shotgunpanel
+3dsmax.apps.tk-multi-shotgunpanel:
   shotgun_fields_hook: '{self}/shotgun_fields.py'
-  actions_hook: '{self}/general_actions.py:{self}/tk-3dsmaxplus_actions.py'
+  actions_hook: "{engine}/tk-multi-shotgunpanel/basic/scene_actions.py"
   action_mappings:
+    Note:
+    - actions: [ note_to_ip, note_to_closed ]
+      filters: { }
     PublishedFile:
     - actions: [import]
       filters: {published_file_type: Alembic Cache}
@@ -91,14 +92,6 @@ includes:
   enable_context_switch: true
   location: "@common.apps.tk-multi-shotgunpanel.location"
 
-# tk-3dsmax app settings
 3dsmax.apps.tk-multi-setframerange:
   hook_frame_operation: "{engine}/tk-multi-setframerange/basic/frame_operations.py"
   location: "@common.apps.tk-multi-setframerange.location"
-3dsmax.apps.tk-multi-publish2: *3dsmaxplus_apps_tk-multi-publish2
-3dsmax.apps.tk-multi-loader2:
-  <<: *3dsmaxplus_apps_tk-multi-loader2
-  actions_hook: "{engine}/tk-multi-loader2/basic/scene_actions.py"
-3dsmax.apps.tk-multi-shotgunpanel:
-  <<: *3dsmaxplus_apps_tk-multi-shotgunpanel
-  actions_hook: "{engine}/tk-multi-shotgunpanel/basic/scene_actions.py"

env/includes/3dsmax/asset_step.yml

@@ -17,23 +17,6 @@ includes:
 - ../common/apps.yml
 - apps.yml
 
-3dsmaxplus.asset_step:
-  apps:
-    tk-multi-about: '@common.apps.tk-multi-about'
-
-    tk-multi-pythonconsole: '@common.apps.tk-multi-pythonconsole'
-
-    tk-multi-publish2: '@3dsmaxplus.apps.tk-multi-publish2'
-
-    tk-multi-loader2: '@3dsmaxplus.apps.tk-multi-loader2'
-
-    tk-multi-shotgunpanel: '@3dsmaxplus.apps.tk-multi-shotgunpanel'
-
-  location: "@common.engines.tk-3dsmaxplus.location"
-  menu_favourites: []
-  launch_builtin_plugins: [basic]
-
-
 3dsmax.asset_step:
   apps:
     tk-multi-about: '@common.apps.tk-multi-about'

env/includes/3dsmax/project.yml

@@ -17,22 +17,6 @@ includes:
 - ../common/apps.yml
 - apps.yml
 
-3dsmaxplus.project:
-  apps:
-    tk-multi-about: '@common.apps.tk-multi-about'
-
-    tk-multi-pythonconsole: '@common.apps.tk-multi-pythonconsole'
-
-    tk-multi-publish2: '@3dsmaxplus.apps.tk-multi-publish2'
-
-    tk-multi-loader2: '@3dsmaxplus.apps.tk-multi-loader2'
-
-    tk-multi-shotgunpanel: '@3dsmaxplus.apps.tk-multi-shotgunpanel'
-
-  location: "@common.engines.tk-3dsmaxplus.location"
-  menu_favourites: []
-  launch_builtin_plugins: [basic]
-
 3dsmax.project:
   apps:
     tk-multi-about: '@common.apps.tk-multi-about'

env/includes/3dsmax/shot.yml

@@ -17,24 +17,6 @@ includes:
 - ../common/apps.yml
 - apps.yml
 
-3dsmaxplus.shot:
-  apps:
-    tk-multi-about: '@common.apps.tk-multi-about'
-
-    tk-multi-pythonconsole: '@common.apps.tk-multi-pythonconsole'
-
-    tk-multi-setframerange: '@common.apps.tk-multi-setframerange'
-
-    tk-multi-publish2: '@3dsmaxplus.apps.tk-multi-publish2'
-
-    tk-multi-loader2: '@3dsmaxplus.apps.tk-multi-loader2'
-
-    tk-multi-shotgunpanel: '@3dsmaxplus.apps.tk-multi-shotgunpanel'
-
-  location: "@common.engines.tk-3dsmaxplus.location"
-  menu_favourites: []
-  launch_builtin_plugins: [basic]
-
 3dsmax.shot:
   apps:
     tk-multi-about: '@common.apps.tk-multi-about'