Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat!: update licensing configuration and instructions #52

Merged
merged 1 commit into from
Mar 30, 2024
Merged

feat!: update licensing configuration and instructions #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,9 @@ This package has two active branches:
```
set DEADLINE_CLOUD_PYTHONPATH=C:/Users/<USER>/workervenv/Lib/site-packages/openjd;C:/Users/<USER>/workervenv/Lib/site-packages/deadline;C:/Users/<USER>/workervenv/Lib/site-packages/pywin32_system32;C:/Users/<USER>/workervenv/Lib/site-packages/win32;C:/Users/<USER>/workervenv/Lib/site-packages/win32/lib;C:/Users/<USER>/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=<PORT>:<ADDRESS>` to point towards the license server to use
e.g. `setx LUXION_LICENSE_FILE "[email protected]"`
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%"`

Expand Down
2 changes: 1 addition & 1 deletion keyshot_script/Submit to AWS Deadline Cloud.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 0 additions & 4 deletions src/deadline/keyshot_adaptor/KeyShotAdaptor/adaptor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
7 changes: 5 additions & 2 deletions src/deadline/keyshot_submitter/default_keyshot_job_template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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=<PORT>:<ADDRESS>
keyshot_headless -progress -floating_feature keyshot2 '{{Param.KeyShotFile}}' -script '{{Task.File.headlessScript}}'