Merge branch 'master' into feature/git_descriptor

Author: mathbou

.flake8

@@ -43,6 +43,9 @@ exclude =
     # Skip the auto-generated ui file.
     python/tank/authentication/ui/login_dialog.py,
     python/tank/authentication/ui/resources_rc.py,
+    python/tank/platform/qt/ui_busy_dialog.py,
+    python/tank/platform/qt/ui_item.py,
+    python/tank/platform/qt/ui_tank_dialog.py,
     python/tank/authentication/sso_saml2/*,
     tests/python
 

README.md

@@ -1,26 +1,26 @@
-[![VFX Platform](https://img.shields.io/badge/vfxplatform-2020-yellow.svg)](http://www.vfxplatform.com/)
-[![Python 2.7 3.7](https://img.shields.io/badge/python-2.7%20%7C%203.7-blue.svg)](https://www.python.org/)
+[![VFX Platform](https://img.shields.io/badge/vfxplatform-2024%20%7C%202023%20%7C%202022%20%7C%202021-blue.svg)](http://www.vfxplatform.com/)
+[![Python](https://img.shields.io/badge/python-3.11%20%7C%203.10%20%7C%203.9%20%7C%203.7-blue.svg)](https://www.python.org/)
 [![Reference Documentation](http://img.shields.io/badge/doc-reference-blue.svg)](http://developer.shotgridsoftware.com/tk-core)
 [![Build Status](https://dev.azure.com/shotgun-ecosystem/Toolkit/_apis/build/status/shotgunsoftware.tk-core?branchName=master)](https://dev.azure.com/shotgun-ecosystem/Toolkit/_build/latest?definitionId=38&branchName=master)
 [![codecov](https://codecov.io/gh/shotgunsoftware/tk-core/branch/master/graph/badge.svg)](https://codecov.io/gh/shotgunsoftware/tk-core)
 [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
 [![Linting](https://img.shields.io/badge/PEP8%20by-Hound%20CI-a873d1.svg)](https://houndci.com)
 
-# ShotGrid Pipeline Toolkit Core API
+# Flow Production Tracking Core API
 
-This repository represents the ShotGrid Pipeline Toolkit Core API.
+This repository represents the Flow Production Tracking Core API.
 
-## Getting started with the ShotGrid Pipeline Toolkit
+## Getting started with the Flow Production Tracking
 
-Installing the ShotGrid Pipeline Toolkit is normally done via our
-ShotGrid App Store. For detailed instructions on how to get started
+Installing the Flow Production Tracking is normally done via our
+Flow Production Tracking App Store. For detailed instructions on how to get started
 with Toolkit, head over to our support site:
-https://developer.shotgridsoftware.com/e95205a8/?title=An+Overview+of+Toolkit
+https://help.autodesk.com/view/SGDEV/ENU/?contextId=PG_INTEGRATIONS_TOOLKIT_OVERVIEW
 
 ## Reference Documentation and Release Notes
 
 For our *latest released API Documentation*, head over to the Toolkit App Store:
-https://developer.shotgridsoftware.com/d587be80/?title=Integrations+User+Guide
+https://help.autodesk.com/view/SGDEV/ENU/?contextId=SA_INTEGRATIONS_USER_GUIDE
 
 Release Notes for the Core API are also maintained as a wiki document
 and can be found here: https://github.com/shotgunsoftware/tk-core/wiki/Release-Notes

SECURITY.md

@@ -0,0 +1,35 @@
+# 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).

codecov.yml

@@ -3,3 +3,6 @@ ignore:
   # ignore generated QT files
   - "**tank/authentication/ui/login_dialog.py"
   - "**tank/authentication/ui/resources_rc.py"
+
+  # disable PySide6 code coverage for now
+  - "**tank/util/pyside6_patcher.py"

developer/README.md

@@ -1,4 +1,4 @@
-# Shotgun Pipeline Toolkit Core API
+# Flow Production Tracking Core API
 
 ## How to upgrade pyyaml
 
@@ -14,3 +14,13 @@ If you need to upgrade this package you can use the script `upgrade_pyyaml.py`.
 cd tk-core/developer
 python upgrade_pyyaml.py
 ```
+
+
+## The requirements.txt file
+
+The file `developer/requirements.txt` is not used to install any packages,
+however exists so that automated checks for CVEs in dependencies will know about
+bundled packages in `python/tank_vendor`.
+
+For this reason, it's important to add any newly bundled packages to this file,
+and to keep the file up to date if the bundled version of a module changes.

developer/bake_config.py

@@ -294,7 +294,7 @@ def main():
     try:
         sg_connection.find_one("HumanUser", [])
     except Exception as e:
-        logger.error("Could not communicate with ShotGrid: %s" % e)
+        logger.error("Could not communicate with Flow Production Tracking: %s" % e)
         return 3
 
     # Strip any extra whitespaces and make sure every bundle type exists.

developer/build_plugin.py

@@ -815,7 +815,7 @@ def main():
     try:
         sg_connection.find_one("HumanUser", [])
     except Exception as e:
-        logger.error("Could not communicate with ShotGrid: %s" % e)
+        logger.error("Could not communicate with Flow Production Tracking: %s" % e)
         return 3
 
     # we are all set.

developer/requirements.txt

@@ -0,0 +1,14 @@
+#
+# This file aims to reflect the list of python packages installed in the
+# python/tank_vendor folder.
+#
+# Not designed to be run in a PIP install command but rather, it's goal is to
+# provide a list of package+version readable for code scan bot so we can collect
+# security reports.
+#
+
+distro==1.4.0
+ordereddict==1.1
+pyyaml==5.4.1
+ruamel_yaml==0.10.10
+six==1.13.0

developer/shotgun_api_update.sh

@@ -86,6 +86,9 @@ echo "Copying Shotgun API to the required location..."
 # Copy the files to the destination
 cp -R $DEST_REPO/shotgun_api3 $DEST/..
 
+# Copy the software_credits file
+cp $DEST_REPO/software_credits $DEST/software_credits
+
 # Move to the git repo to generate the sha and write it to the $DEST
 pushd $DEST_REPO
 git rev-parse HEAD > $DEST/commit_id

developer/utils/authentication.py

@@ -38,9 +38,9 @@ def add_authentication_options(parser):
     """
     group = optparse.OptionGroup(
         parser,
-        "SG Authentication",
+        "PTR Authentication",
         "In order to download content from the Toolkit app store, the script will need to authenticate "
-        "against any SG site. By default, it will use the toolkit authentication APIs stored "
+        "against any PTR site. By default, it will use the toolkit authentication APIs stored "
         "credentials, and if such are not found, it will prompt for site, username and password.",
     )
 
@@ -49,7 +49,7 @@ def add_authentication_options(parser):
         "--shotgun-host",
         default=None,
         action="store",
-        help="SG host to authenticate with.",
+        help="PTR host to authenticate with.",
     )
 
     group.add_option(
@@ -101,7 +101,7 @@ def authenticate(options):
         sg_user = sg_auth.create_script_user(script_name, script_key, shotgun_host)
 
     else:
-        logger.info("Connect to any SG site to collect AppStore keys.")
+        logger.info("Connect to any PTR site to collect AppStore keys.")
         # get user, prompt if necessary
         sg_user = sg_auth.get_user()