Merge pull request #42 from ericmehl/Jan2023-update

Jan2023 update

Changes.md

@@ -1,3 +1,10 @@
+# 0.56.1.0
+
+- Added Alfred style progress (commonly used by Houdini renderers) updates in the Deadline plugin.
+- Added support for Gaffer 0.61.1.2, 1.2.0.0a1 and 1.2.0.0a2.
+- Added the ability to use `pathlib.Path` objects in auxiliary files. This can be done, for example, in a prespool signal handler that modifies the jobs auxiliary files via `setAuxFiles()`.
+- DeadlineDispatcherTest : Removed support for Python 2.
+
 # 0.56.0.1
 ## Bugs Squished
 - Fixed error "This application failed to start because no Qt platform plugin could be initialized." when running `dispatch` app on a headless system.

custom/Gaffer/Gaffer.param

@@ -112,6 +112,32 @@ Label=Gaffer 0.60.8.0 Render Executable
 Default=%HOME%/gaffer_0.60.8.0;~/gaffer_0.60.8.0
 Description=The path to the Gaffer 0.60.8.0 executable (gaffer.bat on Windows) file used for executing. Enter alternative paths on separate lines.
 
+[Executable0_61_1_2]
+Type=multilinemultifilename
+Category=Gaffer 0.61.1.2 Executables
+CategoryOrder=0
+CategoryIndex=0
+Label=Gaffer 0.61.1.2 Render Executable
+Default=%HOME%/gaffer_0.61.1.2;~/gaffer_0.61.1.2
+Description=The path to the Gaffer 0.61.1.2 executable (gaffer.bat on Windows) file used for executing. Enter alternative paths on separate lines.
+
+[Executable1_2_0_0a1]
+Type=multilinemultifilename
+Category=Gaffer 1.2.0.0a1 Executables
+CategoryOrder=0
+CategoryIndex=0
+Label=Gaffer 1.2.0.0a1 Render Executable
+Default=%HOME%/gaffer_1.2.0.0a1;~/gaffer_1.2.0.0a1
+Description=The path to the Gaffer 1.2.0.0a1 executable (gaffer.cmd on Windows) file used for executing. Enter alternative paths on separate lines.
+
+[Executable1_2_0_0a2]
+Type=multilinemultifilename
+Category=Gaffer 1.2.0.0a2 Executables
+CategoryOrder=0
+CategoryIndex=0
+Label=Gaffer 1.2.0.0a2 Render Executable
+Default=%HOME%/gaffer_1.2.0.0a2;~/gaffer_1.2.0.0a2
+Description=The path to the Gaffer 1.2.0.0a2 executable (gaffer.cmd on Windows) file used for executing. Enter alternative paths on separate lines.
 
 [EnablePathMapping]
 Type=boolean

custom/Gaffer/Gaffer.py

@@ -91,6 +91,9 @@ def InitializeProcess(self):
         # Generic Gaffer progress and error
         self.AddStdoutHandlerCallback(".*Progress: (\d+)%.*").HandleCallback += self.HandleProgress
 
+        # Alfred style progress from Houdini
+        self.AddStdoutHandlerCallback(".*ALF_PROGRESS\s*(\d+)%.*").HandleCallback += self.HandleProgress
+
         # Vray's ply2vrmesh prints out lines for each frame and also each voxel within the frame
         self.AddStdoutHandlerCallback(".*Subdividing frame ([0-9]+) of ([0-9]+).*").HandleCallback += self.HandlePly2VrmeshFrameProgress
         self.AddStdoutHandlerCallback(".*Processing voxel ([0-9]+) of ([0-9]+).*").HandleCallback += self.HandlePly2VrmeshVoxelProgress