From ade964166b10195711bbf99b0ff9632e67b9884c Mon Sep 17 00:00:00 2001 From: Lucas Eckhardt <117225985+lucaseck@users.noreply.github.com> Date: Sat, 30 Mar 2024 03:51:14 +0000 Subject: [PATCH] feat!: update licensing configuration and instructions Signed-off-by: Lucas Eckhardt <117225985+lucaseck@users.noreply.github.com> --- README.md | 4 +++- keyshot_script/Submit to AWS Deadline Cloud.py | 2 +- src/deadline/keyshot_adaptor/KeyShotAdaptor/adaptor.py | 4 ---- .../keyshot_submitter/default_keyshot_job_template.yaml | 7 +++++-- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 6c63bdf..99ff265 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,9 @@ This package has two active branches: ``` set DEADLINE_CLOUD_PYTHONPATH=C:/Users//workervenv/Lib/site-packages/openjd;C:/Users//workervenv/Lib/site-packages/deadline;C:/Users//workervenv/Lib/site-packages/pywin32_system32;C:/Users//workervenv/Lib/site-packages/win32;C:/Users//workervenv/Lib/site-packages/win32/lib;C:/Users//workervenv/Lib/site-packages/pythonwin ``` -3. The adaptor expects the keyshot_headless executable is available through the PATH environment variable. +3. Configure licensing for KeyShot by setting the environment variable `LUXION_LICENSE_FILE=:
` to point towards the license server to use + e.g. `setx LUXION_LICENSE_FILE "2703@127.0.0.1"` +4. The adaptor expects the keyshot_headless executable is available through the PATH environment variable. e.g. Local install: `setx PATH "%LOCALAPPDATA%\KeyShot12\bin;%PATH%"` e.g. System install: `setx PATH "%PROGRAMFILES%\KeyShot12\bin;%PATH%"` diff --git a/keyshot_script/Submit to AWS Deadline Cloud.py b/keyshot_script/Submit to AWS Deadline Cloud.py index 4aa8cc6..8c791a2 100644 --- a/keyshot_script/Submit to AWS Deadline Cloud.py +++ b/keyshot_script/Submit to AWS Deadline Cloud.py @@ -20,7 +20,7 @@ if not DEADLINE_PYTHON: raise RuntimeError( - "Environment variable DEADLINE_PYTHON not set. Please set DEADLINE_PYTHON to point to an installed version of Python with Pyside2." + "Environment variable DEADLINE_PYTHON not set. Please set DEADLINE_PYTHON to point to an installation of Python with deadline and Pyside2 installed." ) if not DEADLINE_KEYSHOT: diff --git a/src/deadline/keyshot_adaptor/KeyShotAdaptor/adaptor.py b/src/deadline/keyshot_adaptor/KeyShotAdaptor/adaptor.py index 99189cf..853f1c9 100644 --- a/src/deadline/keyshot_adaptor/KeyShotAdaptor/adaptor.py +++ b/src/deadline/keyshot_adaptor/KeyShotAdaptor/adaptor.py @@ -337,10 +337,6 @@ def _start_keyshot_client(self) -> None: keyshot_client_path = self._get_keyshot_client_path() args.append("-progress") - # For now we will assume that a floating license server is being used - # with the default port and a pro license for KeyShot - args.append("-floating_license_server") - args.append("@localhost") args.append("-floating_feature") args.append("keyshot2") args.append("-script") diff --git a/src/deadline/keyshot_submitter/default_keyshot_job_template.yaml b/src/deadline/keyshot_submitter/default_keyshot_job_template.yaml index 1d9b962..63b8045 100644 --- a/src/deadline/keyshot_submitter/default_keyshot_job_template.yaml +++ b/src/deadline/keyshot_submitter/default_keyshot_job_template.yaml @@ -68,7 +68,8 @@ steps: script: actions: onRun: - command: '{{Task.File.Run}}' + command: powershell + args: ["-File", "{{Task.File.Run}}"] embeddedFiles: - name: headlessScript filename: headlessScript.py @@ -90,4 +91,6 @@ steps: filename: run.ps1 type: TEXT data: | - keyshot_headless -progress -floating_license_server '@localhost' -floating_feature keyshot2 '{{Param.KeyShotFile}}' -script '{{Task.File.headlessScript}}' + # Licensing should be configured using a floating license server specified + # by setting the environment variable LUXION_LICENSE_FILE=:
+ keyshot_headless -progress -floating_feature keyshot2 '{{Param.KeyShotFile}}' -script '{{Task.File.headlessScript}}'