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.

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

fix: Changed submitter option dropdown for Cameras dropdown option to "All Renderable Cameras" #244

Merged
merged 6 commits into from
Feb 26, 2025

Conversation

skarpree
Copy link
Contributor

Fixes: #219

What was the problem/requirement? (What/Why)

In the Maya submitter cameras dropdown - Change the wording in Cameras dropdown from "All Cameras" to "All Renderable Cameras" - it's confusing and it's inconsistent with the Render Layers dropdown wording.

What was the solution? (How)

Change the wording in the submitter's cameras dropdown from "All Cameras" to "All Renderable Cameras".

What is the impact of this change?

Removes the confusion on it will render all renderable cameras and not every camera in the scene.

How was this change tested?

Replaced the cameras.py file with the code fixed one locally on a submitter machine. The dropdown option showed "All Renderable Cameras"

  • Have you run the unit tests?
    92 unit test passed, but 1 test failed on "src\deadline\maya_submitter_version.py". It couldn't find the a valid Amazon.com copyright header in the top.
---------- coverage: platform win32, python 3.10.11-final-0 ----------
Name                                                                           Stmts   Miss Branch BrPart  Cover   Missing
--------------------------------------------------------------------------------------------------------------------------
src\deadline\maya_adaptor\MayaAdaptor\__init__.py                                  3      0      0      0   100%
src\deadline\maya_adaptor\MayaAdaptor\adaptor.py                                 235      5     58      4    97%   61->exit, 302, 318-320, 528->531, 600, 607->616
src\deadline\maya_adaptor\MayaClient\__init__.py                                   3      0      0      0   100%
src\deadline\maya_adaptor\MayaClient\dir_map.py                                   42     19      2      0    52%   21-24, 27, 30, 33, 39-40, 46, 52, 55-58, 61, 71, 75, 79
src\deadline\maya_adaptor\MayaClient\maya_client.py                               40      2      4      0    95%   56-58
src\deadline\maya_adaptor\MayaClient\render_handlers\__init__.py                  13      3      6      3    68%   22, 24, 26
src\deadline\maya_adaptor\MayaClient\render_handlers\arnold_handler.py            46     36     16      0    16%   29-81, 92-93, 105-107
src\deadline\maya_adaptor\MayaClient\render_handlers\default_maya_handler.py     103     65     34      0    31%   15, 45-58, 61-80, 93-127, 139, 166-168, 177, 201-205, 217-219, 229-230, 241-251
src\deadline\maya_adaptor\MayaClient\render_handlers\renderman_handler.py         42     26     14      1    30%   28-30, 68-108
src\deadline\maya_adaptor\MayaClient\render_handlers\vray_handler.py              65     51     30      2    17%   27-39, 57-120, 129-131, 143-145
src\deadline\maya_adaptor\__init__.py                                              0      0      0      0   100%
src\deadline\maya_submitter\__init__.py                                            6      0      0      0   100%
src\deadline\maya_submitter\assets.py                                             79     36     40      4    48%   26-51, 59-65, 91->89, 98-99, 111-122, 131-133, 160, 165, 168->167
src\deadline\maya_submitter\cameras.py                                            10      4      0      0    60%   19-22, 33
src\deadline\maya_submitter\data_classes.py                                       46     19      8      0    50%   44-71, 74-83
src\deadline\maya_submitter\file_path_editor.py                                   33     17     10      0    37%   37-38, 45-84
src\deadline\maya_submitter\job_bundle_output_test_runner.py                     145    118     42      0    14%   38-47, 53-54, 61-69, 74, 79-111, 116, 123, 131-206, 210-304
src\deadline\maya_submitter\logging.py                                            48     26     10      0    38%   26, 32-38, 43-79
src\deadline\maya_submitter\maya_render_submitter.py                             252    210    108      0    12%   71-311, 320-444, 450-687
src\deadline\maya_submitter\mel_commands.py                                       36      4     10      3    85%   36->exit, 48-54, 59, 88
src\deadline\maya_submitter\render_layers.py                                      33     16      0      0    52%   26-41, 45, 49, 53, 60, 68-71, 79-81
src\deadline\maya_submitter\renderers.py                                          24     13      6      0    37%   16, 23, 34-37, 44-57
src\deadline\maya_submitter\scene.py                                             105     39     18      0    59%   38, 45, 52, 59, 66, 73-76, 86-96, 109, 116, 123-126, 152-156, 163-167, 175-179, 183-189
src\deadline\maya_submitter\utils.py                                              28      0      4      2    94%   62->73, 63->66
--------------------------------------------------------------------------------------------------------------------------
TOTAL                                                                           1437    709    420     19    44%
Coverage HTML written to dir build/coverage
Coverage XML written to file build/coverage/coverage.xml

Required test coverage of 41.0% reached. Total coverage: 44.43%
======================================================================================= slowest 5 durations ========================================================================================
0.16s call     test/unit/deadline_adaptor_for_maya/MayaAdaptor/test_adaptor.py::TestMayaAdaptor_on_start::test_maya_init_timeout
0.10s call     test/unit/deadline_adaptor_for_maya/MayaAdaptor/test_adaptor.py::TestMayaAdaptor_on_cleanup::test_on_cleanup
0.09s call     test/unit/deadline_adaptor_for_maya/MayaAdaptor/test_adaptor.py::TestMayaAdaptor_on_run::test_on_run
0.09s call     test/unit/deadline_adaptor_for_maya/MayaAdaptor/test_adaptor.py::TestMayaAdaptor_on_run::test_on_run_render_fail
0.07s call     test/unit/deadline_adaptor_for_maya/MayaAdaptor/test_adaptor.py::TestMayaAdaptor_on_start::test_arnold_pathmapping_called[vray-False]
===================================================================================== short test summary info ======================================================================================
FAILED test/test_copyright_headers.py::test_copyright_headers - Exception: Could not find a valid Amazon.com copyright header in the top of C:\Users\skarpree\Documents\KP's\deadline-cloud-for-maya\src\deadline\maya_submitter\_version.py. Please add one.
================================================================================== 1 failed, 92 passed in 13.66s ===================================================================================

Did you run the "Job Bundle Output Tests"? If not, why not? If so, paste the test results here.

The UI change for submitter wording doesn't change anything in the job bundle so skipped the Job Bundle Output Tests

Was this change documented?

No

Is this a breaking change?

No

image

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.

Added error regex to the adaptor for capturing render failure for Maya. I have picked some Deadline 10 regex handler for fatal error Maya reports.
…o "All Renderable Cameras" in the submitter

fixed the wording in the submitter from "All Cameras" to "All Renderable Cameras" in the Cameras dropdown under "Job-specific settings"
@skarpree skarpree requested a review from a team as a code owner February 24, 2025 19:58
jairaws
jairaws previously approved these changes Feb 24, 2025
@jericht
Copy link
Contributor

jericht commented Feb 25, 2025

@skarpree can you rebase onto latest mainline? There's a fix for the broken unit test now

sakshie95
sakshie95 previously approved these changes Feb 25, 2025
@jericht
Copy link
Contributor

jericht commented Feb 25, 2025

@skarpree can you sign your commit? There is a DCO check failing. e.g. you can run something like this on your branch:

git commit -s --amend --no-edit && git push --force

@skarpree skarpree dismissed stale reviews from sakshie95 and jairaws via 2725d2b February 26, 2025 16:44
@skarpree skarpree force-pushed the skarpree-submitter-cameras branch from de0fe80 to 2725d2b Compare February 26, 2025 16:44
…o "All Renderable Cameras" in the submitter

fixed the wording in the submitter from "All Cameras" to "All Renderable Cameras" in the Cameras dropdown under "Job-specific settings"
…om/skarpree/deadline-cloud-for-maya into skarpree-submitter-cameras"

This reverts commit 86a0523, reversing
changes made to 33238c6.

Signed-off-by: Karpreet Sethi <[email protected]>
@skarpree skarpree force-pushed the skarpree-submitter-cameras branch from 3f4cdab to 5c9a99d Compare February 26, 2025 22:32
Copy link

@sakshie95 sakshie95 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we have to merge with Rebase because this has many commits from mainline. Rest looks good to me

@skarpree skarpree merged commit 6cc323d into aws-deadline:mainline Feb 26, 2025
15 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants