Skip to content

Commit

Permalink
Merge branch 'mainline' into rmvh/addPurposeToCallback
Browse files Browse the repository at this point in the history
  • Loading branch information
rmv authored Nov 16, 2023
2 parents 377c846 + 2480fac commit 39f90da
Show file tree
Hide file tree
Showing 5 changed files with 2 additions and 2 deletions.
Binary file modified job_bundle_output_tests/cube/scene/deadline_logo_48x48.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified maya_submitter_plugin/icons/deadline_cloud_job_bundle_tests.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified maya_submitter_plugin/icons/deadline_render_submitter.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ license = ""
requires-python = ">=3.7"

dependencies = [
"deadline == 0.32.*",
"deadline == 0.34.*",
"openjd-adaptor-runtime == 0.3.*",
]

Expand Down
2 changes: 1 addition & 1 deletion requirements-testing.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ pytest-cov ~= 4.1
pytest-xdist ~= 3.3
twine ~= 4.0
mypy ~= 1.6
black ~= 23.10
black ~= 23.11
ruff ~= 0.1.4
moto[s3,sts] ~= 4.2

0 comments on commit 39f90da

Please sign in to comment.