Moved 'merge-exr.blend' into a 'resources' subdirectory

We'll be adding more resources, and this provides a suitable place for them.

flamenco_worker/commands.py

@@ -947,7 +947,7 @@ class MergeProgressiveRendersCommand(AbstractSubprocessCommand):
         return super().validate(settings)
 
     async def execute(self, settings: Settings):
-        blendpath = Path(__file__).with_name('merge-exr.blend')
+        blendpath = Path(__file__).parent / 'resources/merge-exr.blend'
 
         cmd = settings['blender_cmd'][:]
         cmd += [

setup.py

@@ -56,7 +56,7 @@ class ZipCommand(Command):
             add_to_root(Path('LICENSE.txt'))
             add_to_root(Path('README.md'))
             add_to_root(Path('CHANGELOG.md'))
-            add_to_root(Path('flamenco_worker/merge-exr.blend'))
+            add_to_root(Path('flamenco_worker/resources/merge-exr.blend'))
 
             paths = collections.deque([Path('system-integration')])
             while paths: