diff --git a/flamenco_worker/commands.py b/flamenco_worker/commands.py index b169a7dc13d9597e19830639bf0068f08a73a1d3..42c75f8312f54a24a7a44ea44088cfb84daa7e01 100644 --- a/flamenco_worker/commands.py +++ b/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 += [ diff --git a/flamenco_worker/merge-exr.blend b/flamenco_worker/resources/merge-exr.blend similarity index 100% rename from flamenco_worker/merge-exr.blend rename to flamenco_worker/resources/merge-exr.blend diff --git a/setup.py b/setup.py index 5003a59a245ee3da9f8ae0d5500292fab47e8488..e5f69858869467c2ec2c1e1b6d58c35107a31889 100755 --- a/setup.py +++ b/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: