fix: maya 2025 submitter failed to load due to qt setMargin being rem…

…oved (#192) Signed-off-by: Morgan Epp <[email protected]>
aws-deadline · Oct 30, 2024 · 39ca5fc · 39ca5fc
1 parent b054dd4
commit 39ca5fc
Show file tree

Hide file tree

Showing 12 changed files with 27 additions and 7 deletions.
diff --git a/.github/workflows/code_quality.yml b/.github/workflows/code_quality.yml
@@ -15,7 +15,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest]
-        python-version: ['3.9', '3.10', '3.11']
+        python-version: ['3.9', '3.10', '3.11', '3.12']
     uses: aws-deadline/.github/.github/workflows/reusable_python_build.yml@mainline
     with:
       os: ${{ matrix.os }}

diff --git a/depsBundle.py b/depsBundle.py
@@ -9,7 +9,7 @@
 from tempfile import TemporaryDirectory
 from typing import Any
 
-SUPPORTED_PYTHON_VERSIONS = ["3.7", "3.8", "3.9", "3.10", "3.11"]
+SUPPORTED_PYTHON_VERSIONS = ["3.9", "3.10", "3.11", "3.12"]
 SUPPORTED_PLATFORMS = ["win_amd64", "manylinux2014_x86_64", "macosx_10_9_x86_64"]
 NATIVE_DEPENDENCIES = ["xxhash"]
 

diff --git a/job_bundle_output_tests/cube/scene/cube.ma b/job_bundle_output_tests/cube/scene/cube.ma
@@ -113,6 +113,7 @@ createNode renderLayer -n "defaultRenderLayer";
 	setAttr ".g" yes;
 createNode aiOptions -s -n "defaultArnoldRenderOptions";
 	rename -uid "6B7909BC-4FCB-0BB1-D4A7-5296F3C7DA96";
+	setAttr ".abort_on_license_fail" yes;
 	setAttr ".version" -type "string" "5.1.0";
 createNode aiAOVFilter -s -n "defaultArnoldFilter";
 	rename -uid "DFD4CBFF-4AFB-E12B-F851-6689C247A620";

diff --git a/job_bundle_output_tests/layers/scene/layers.ma b/job_bundle_output_tests/layers/scene/layers.ma
@@ -176,6 +176,7 @@ createNode renderLayer -n "defaultRenderLayer";
 	setAttr ".adjs[0].val" 0;
 createNode aiOptions -s -n "defaultArnoldRenderOptions";
 	rename -uid "6EBFD1EE-4AF3-6A01-F40D-2E8896F9ED86";
+	setAttr ".abort_on_license_fail" no;
 	setAttr ".version" -type "string" "5.1.0";
 createNode aiAOVFilter -s -n "defaultArnoldFilter";
 	rename -uid "19DDC798-46DC-CE52-B92C-88A1CF1F111E";

diff --git a/job_bundle_output_tests/layers_no_variation/expected_job_bundle/parameter_values.yaml b/job_bundle_output_tests/layers_no_variation/expected_job_bundle/parameter_values.yaml
@@ -16,7 +16,7 @@ parameterValues:
 - name: RenderSetupIncludeLights
   value: 'true'
 - name: ArnoldErrorOnLicenseFailure
-  value: 'false'
+  value: 'true'
 - name: deadline:targetTaskRunStatus
   value: READY
 - name: deadline:maxFailedTasksCount

diff --git a/job_bundle_output_tests/layers_no_variation/scene/layers_no_variation.ma b/job_bundle_output_tests/layers_no_variation/scene/layers_no_variation.ma
@@ -123,6 +123,7 @@ createNode renderLayer -n "defaultRenderLayer";
 	setAttr ".g" yes;
 createNode aiOptions -s -n "defaultArnoldRenderOptions";
 	rename -uid "59A3EEE2-49F1-07DE-4FDD-8EBEB0A6DD31";
+	setAttr ".abort_on_license_fail" yes;
 	setAttr ".version" -type "string" "5.1.0";
 createNode aiAOVFilter -s -n "defaultArnoldFilter";
 	rename -uid "96D5B79B-41E5-8DA7-2D18-E3A4482B2713";

diff --git a/job_bundle_output_tests/referenced_layers/expected_job_bundle/parameter_values.yaml b/job_bundle_output_tests/referenced_layers/expected_job_bundle/parameter_values.yaml
@@ -16,7 +16,7 @@ parameterValues:
 - name: RenderSetupIncludeLights
   value: 'true'
 - name: ArnoldErrorOnLicenseFailure
-  value: 'false'
+  value: 'true'
 - name: deadline:targetTaskRunStatus
   value: READY
 - name: deadline:maxFailedTasksCount

diff --git a/job_bundle_output_tests/referenced_layers/scene/referenced_layers.ma b/job_bundle_output_tests/referenced_layers/scene/referenced_layers.ma
@@ -109,6 +109,7 @@ createNode renderLayer -n "defaultRenderLayer";
 	setAttr ".g" yes;
 createNode aiOptions -s -n "defaultArnoldRenderOptions";
 	rename -uid "9A138AC0-0948-F5B6-6486-93B7C51BB0B6";
+	setAttr ".abort_on_license_fail" yes;
 	setAttr ".version" -type "string" "5.1.0";
 createNode aiAOVFilter -s -n "defaultArnoldFilter";
 	rename -uid "34BABCDD-D041-35C1-8012-4E91D4182313";

diff --git a/job_bundle_output_tests/referenced_layers/scene/scene_file_to_reference.ma b/job_bundle_output_tests/referenced_layers/scene/scene_file_to_reference.ma
@@ -100,6 +100,7 @@ createNode renderLayer -n "defaultRenderLayer";
 	setAttr ".g" yes;
 createNode aiOptions -s -n "defaultArnoldRenderOptions";
 	rename -uid "1F4DD6D2-4959-340B-8B09-9C999ED675EF";
+	setAttr ".abort_on_license_fail" yes;
 	setAttr ".version" -type "string" "5.1.0";
 createNode aiAOVFilter -s -n "defaultArnoldFilter";
 	rename -uid "B8FC15B5-4212-07EC-0570-A6BE7223DC9B";

diff --git a/job_bundle_output_tests/renderman/scene/renderman.ma b/job_bundle_output_tests/renderman/scene/renderman.ma
@@ -264,6 +264,7 @@ createNode renderLayer -n "defaultRenderLayer";
 	setAttr ".g" yes;
 createNode aiOptions -s -n "defaultArnoldRenderOptions";
 	rename -uid "6B7909BC-4FCB-0BB1-D4A7-5296F3C7DA96";
+	setAttr ".abort_on_license_fail" yes;
 	setAttr ".version" -type "string" "5.1.0";
 createNode aiAOVFilter -s -n "defaultArnoldFilter";
 	rename -uid "DFD4CBFF-4AFB-E12B-F851-6689C247A620";

diff --git a/scripts/install_dev_submitter.py b/scripts/install_dev_submitter.py
@@ -18,6 +18,7 @@ class MayaVersion:
     PYTHON_VERSIONS = {
         "2023": "3.9",
         "2024": "3.10",
+        "2025": "3.11",
     }
 
     def __init__(self, arg_version: Optional[str]):
@@ -107,13 +108,27 @@ def _build_deps_env(destination: Path, python_version: str, local_deps: list[Pat
         "install",
         "--target",
         str(destination),
-        "--platform",
-        get_pip_platform(platform.system()),
         "--python-version",
         python_version,
         "--only-binary=:all:",
         *resolved_dependencies,
     ]
+    if python_version == "3.9":
+        # maya 2023 on mac relies on rosetta
+        # should probably swap to maya's pip to avoid specifying platform
+        args = [
+            "pip",
+            "install",
+            "--target",
+            str(destination),
+            "--platform",
+            get_pip_platform(platform.system()),
+            "--python-version",
+            python_version,
+            "--only-binary=:all:",
+            *resolved_dependencies,
+        ]
+
     subprocess.run(args, check=True)
 
 

diff --git a/src/deadline/maya_submitter/ui/components/scene_settings_tab.py b/src/deadline/maya_submitter/ui/components/scene_settings_tab.py
@@ -40,7 +40,6 @@ def __init__(self, file_format=None, directory_only=False, parent=None):
 
         lyt = QHBoxLayout(self)
         lyt.setContentsMargins(0, 0, 0, 0)
-        lyt.setMargin(0)
 
         self.edit = QLineEdit(self)
         self.btn = QPushButton("...", parent=self)