Skip to content

Commit

Permalink
Release v1.2.1
Browse files Browse the repository at this point in the history
  • Loading branch information
staceyoue authored Mar 8, 2024
2 parents 2af94aa + 9096890 commit ad3e310
Show file tree
Hide file tree
Showing 68 changed files with 51 additions and 12 deletions.
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
[![Python 3.7 3.9](https://img.shields.io/badge/python-3.7%20%7C%203.9-blue.svg)](https://www.python.org/)
[![VFX Platform](https://img.shields.io/badge/vfxplatform-2023%20%7C%202022%20%7C%202021-blue.svg)](http://www.vfxplatform.com/)
[![Python](https://img.shields.io/badge/python-3.10%20%7C%203.9%20%7C%203.7-blue.svg)](https://www.python.org/)
[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
[![Build Status](https://dev.azure.com/shotgun-ecosystem/Toolkit/_apis/build/status%2Ftk-framework-alias?repoName=shotgunsoftware%2Ftk-framework-alias&branchName=main)](https://dev.azure.com/shotgun-ecosystem/Toolkit/_build/latest?definitionId=120&repoName=shotgunsoftware%2Ftk-framework-alias&branchName=main)

Expand All @@ -10,7 +11,7 @@ The main use of this framework is by the [Alias Engine](https://github.com/shotg

### <a name="support"></a>Support

- Alias >= 2021
- 2022.2 <= Alias <= 2024
- Windows only

<br/>
Expand Down
Binary file added dist/Alias/python3.10/2021.3/alias_api.pyd
Binary file not shown.
Binary file added dist/Alias/python3.10/2021.3/alias_api_om.pyd
Binary file not shown.
Binary file added dist/Alias/python3.10/2021.3/shotgun.plugin
Binary file not shown.
Binary file added dist/Alias/python3.10/2022.1/alias_api.pyd
Binary file not shown.
Binary file added dist/Alias/python3.10/2022.1/alias_api_om.pyd
Binary file not shown.
Binary file added dist/Alias/python3.10/2022.1/shotgun.plugin
Binary file not shown.
Binary file added dist/Alias/python3.10/2022.2/alias_api.pyd
Binary file not shown.
Binary file added dist/Alias/python3.10/2022.2/alias_api_om.pyd
Binary file not shown.
Binary file added dist/Alias/python3.10/2022.2/shotgrid.plugin
Binary file not shown.
Binary file added dist/Alias/python3.10/2023.0.1/alias_api.pyd
Binary file not shown.
Binary file added dist/Alias/python3.10/2023.0.1/alias_api_om.pyd
Binary file not shown.
Binary file added dist/Alias/python3.10/2023.0.1/shotgrid.plugin
Binary file not shown.
Binary file added dist/Alias/python3.10/2023.0/alias_api.pyd
Binary file not shown.
Binary file added dist/Alias/python3.10/2023.0/alias_api_om.pyd
Binary file not shown.
Binary file added dist/Alias/python3.10/2023.0/shotgrid.plugin
Binary file not shown.
Binary file added dist/Alias/python3.10/2023.1.1/alias_api.pyd
Binary file not shown.
Binary file added dist/Alias/python3.10/2023.1.1/alias_api_om.pyd
Binary file not shown.
Binary file added dist/Alias/python3.10/2023.1.1/shotgrid.plugin
Binary file not shown.
Binary file added dist/Alias/python3.10/2023.1/alias_api.pyd
Binary file not shown.
Binary file added dist/Alias/python3.10/2023.1/alias_api_om.pyd
Binary file not shown.
Binary file added dist/Alias/python3.10/2023.1/shotgrid.plugin
Binary file not shown.
Binary file modified dist/Alias/python3.7/2021.3/alias_api.pyd
Binary file not shown.
Binary file modified dist/Alias/python3.7/2021.3/alias_api_om.pyd
Binary file not shown.
Binary file modified dist/Alias/python3.7/2022.1/alias_api.pyd
Binary file not shown.
Binary file modified dist/Alias/python3.7/2022.1/alias_api_om.pyd
Binary file not shown.
Binary file modified dist/Alias/python3.7/2022.2/alias_api.pyd
Binary file not shown.
Binary file modified dist/Alias/python3.7/2022.2/alias_api_om.pyd
Binary file not shown.
Binary file modified dist/Alias/python3.7/2023.0.1/alias_api.pyd
Binary file not shown.
Binary file modified dist/Alias/python3.7/2023.0.1/alias_api_om.pyd
Binary file not shown.
Binary file modified dist/Alias/python3.7/2023.0/alias_api.pyd
Binary file not shown.
Binary file modified dist/Alias/python3.7/2023.0/alias_api_om.pyd
Binary file not shown.
Binary file modified dist/Alias/python3.7/2023.1.1/alias_api.pyd
Binary file not shown.
Binary file modified dist/Alias/python3.7/2023.1.1/alias_api_om.pyd
Binary file not shown.
Binary file modified dist/Alias/python3.7/2023.1/alias_api.pyd
Binary file not shown.
Binary file modified dist/Alias/python3.7/2023.1/alias_api_om.pyd
Binary file not shown.
Binary file modified dist/Alias/python3.7/2024.0/alias_api.pyd
Binary file not shown.
Binary file modified dist/Alias/python3.7/2024.0/alias_api_om.pyd
Binary file not shown.
Binary file modified dist/Alias/python3.7/2024.1/alias_api.pyd
Binary file not shown.
Binary file modified dist/Alias/python3.7/2024.1/alias_api_om.pyd
Binary file not shown.
Binary file modified dist/Alias/python3.9/2021.3/alias_api.pyd
Binary file not shown.
Binary file modified dist/Alias/python3.9/2021.3/alias_api_om.pyd
Binary file not shown.
Binary file modified dist/Alias/python3.9/2022.1/alias_api.pyd
Binary file not shown.
Binary file modified dist/Alias/python3.9/2022.1/alias_api_om.pyd
Binary file not shown.
Binary file modified dist/Alias/python3.9/2022.2/alias_api.pyd
Binary file not shown.
Binary file modified dist/Alias/python3.9/2022.2/alias_api_om.pyd
Binary file not shown.
Binary file modified dist/Alias/python3.9/2023.0.1/alias_api.pyd
Binary file not shown.
Binary file modified dist/Alias/python3.9/2023.0.1/alias_api_om.pyd
Binary file not shown.
Binary file modified dist/Alias/python3.9/2023.0/alias_api.pyd
Binary file not shown.
Binary file modified dist/Alias/python3.9/2023.0/alias_api_om.pyd
Binary file not shown.
Binary file modified dist/Alias/python3.9/2023.1.1/alias_api.pyd
Binary file not shown.
Binary file modified dist/Alias/python3.9/2023.1.1/alias_api_om.pyd
Binary file not shown.
Binary file modified dist/Alias/python3.9/2023.1/alias_api.pyd
Binary file not shown.
Binary file modified dist/Alias/python3.9/2023.1/alias_api_om.pyd
Binary file not shown.
Binary file removed dist/Alias/python3.9/2024.0/alias_api.pyd
Binary file not shown.
Binary file removed dist/Alias/python3.9/2024.0/alias_api_om.pyd
Binary file not shown.
Binary file removed dist/Alias/python3.9/2024.0/alias_py3.9.plugin
Binary file not shown.
Binary file removed dist/Alias/python3.9/2024.1/alias_api.pyd
Binary file not shown.
Binary file removed dist/Alias/python3.9/2024.1/alias_api_om.pyd
Binary file not shown.
Binary file removed dist/Alias/python3.9/2024.1/alias_py3.9.plugin
Binary file not shown.
Binary file added dist/Python/Python310/packages/c_extensions.zip
Binary file not shown.
18 changes: 18 additions & 0 deletions dist/Python/Python310/packages/frozen_requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
bidict==0.22.1
certifi==2024.2.2
cffi==1.16.0
charset-normalizer==3.3.2
cryptography==42.0.2
dnspython==2.5.0
eventlet==0.35.1
greenlet==3.0.3
h11==0.14.0
idna==3.6
pycparser==2.21
python-engineio==4.9.0
python-socketio==5.11.1
requests==2.31.0
simple-websocket==1.0.0
urllib3==2.2.0
websocket-client==1.7.0
wsproto==1.2.0
Binary file added dist/Python/Python310/packages/pkgs.zip
Binary file not shown.
15 changes: 15 additions & 0 deletions dist/Python/Python310/requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Copyright (c) 2024 Autodesk Inc.
#
# CONFIDENTIAL AND PROPRIETARY
#
# This work is provided "AS IS" and subject to the ShotGrid 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 ShotGrid Pipeline Toolkit Source Code License. All rights
# not expressly granted therein are reserved by Autodesk Inc.

cryptography
eventlet
python-socketio
requests
websocket-client
2 changes: 2 additions & 0 deletions dist/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ The framework includes distributed files:
- [Required python packages](#required-python-packages) running the framework with 3.7
- Python39
- [Required python packages](#required-python-packages) running the framework with 3.9
- Python310
- [Required python packages](#required-python-packages) running the framework with 3.10

The Alias distributed files are maintained by the ShotGrid Automotive Team.

Expand Down
1 change: 1 addition & 0 deletions python/tk_framework_alias_utils/environment_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -405,4 +405,5 @@ def get_framework_supported_python_versions():
return [
(3, 7),
(3, 9),
(3, 10),
]
14 changes: 7 additions & 7 deletions python/tk_framework_alias_utils/plugin_bootstrap.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,31 +51,31 @@ def toolkit_plugin_bootstrap(
log_handler = log.get_sgtk_logger(sgtk)
logger.debug("Added bootstrap log hander to root logger...")

# set up the toolkit bootstrap manager

# TODO For standalone workflows, need to handle authentication here
# this includes workflows for logging in and out (see maya plugin).
# For now, assume that we are correctly authenticated.
# Also, need to check that the SHOTGUN_SITE env var matches
# the currently logged in site.

# ---- set up the toolkit bootstrap manager
toolkit_mgr = sgtk.bootstrap.ToolkitManager()
# run the default init which sets plugin id, base config and bundle cache path
logger.debug("Initializing Toolkit Manager: %s" % toolkit_mgr)
manifest.initialize_manager(toolkit_mgr, plugin_root_path)

# Set the pipeline configuration id to use, if given
if pipeline_config_id:
toolkit_mgr.pipeline_configuration = int(pipeline_config_id)

# set up progress reporting
# toolkit_mgr.progress_callback = _progress_handler
logger.debug("Toolkit Manager: %s" % toolkit_mgr)

entity = toolkit_mgr.get_entity_from_environment()
logger.debug("Will launch the engine with entity: %s" % entity)

logger.info("Bootstrapping toolkit...")
toolkit_mgr.bootstrap_engine("tk-alias", entity=entity)
try:
toolkit_mgr.bootstrap_engine("tk-alias", entity=entity)
except Exception as e:
logger.exception("Error bootstrapping toolkit: %s" % e)
return -1

# ---- tear down logging
sgtk.LogManager().root_logger.removeHandler(log_handler)
Expand Down
8 changes: 5 additions & 3 deletions python/tk_framework_alias_utils/startup.py
Original file line number Diff line number Diff line change
Expand Up @@ -460,7 +460,7 @@ def __ensure_python_c_extension_packages_installed(python_version=None, logger=N
)
if not os.path.exists(framework_c_ext_zip):
logger.debug(f"No C extensions found to install {framework_c_ext_zip}")
return True
continue

python_packages_path = environment_utils.get_python_packages_dir(
major_version, minor_version
Expand All @@ -475,8 +475,10 @@ def __ensure_python_c_extension_packages_installed(python_version=None, logger=N
install_c_ext_zip_path = f"{install_c_ext_path}.zip"
if os.path.exists(install_c_ext_zip_path):
if verify_file(framework_c_ext_zip, install_c_ext_zip_path):
logger.debug("C extensions already up to date.")
return True # Packages already exist and no change.
logger.debug(
"C extensions already up to date at {install_c_ext_zip_path}."
)
continue # Packages already exist and no change.

if os.path.exists(install_c_ext_path):
shutil.rmtree(install_c_ext_path)
Expand Down

0 comments on commit ad3e310

Please sign in to comment.