From 883c4853cb354d9a3eceaf71328603bb52d18f8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= <sybren@stuvel.eu>
Date: Thu, 31 Jan 2019 11:29:28 +0100
Subject: [PATCH] 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 | 2 +-
flamenco_worker/{ => resources}/merge-exr.blend | Bin
setup.py | 2 +-
3 files changed, 2 insertions(+), 2 deletions(-)
rename flamenco_worker/{ => resources}/merge-exr.blend (100%)
diff --git a/flamenco_worker/commands.py b/flamenco_worker/commands.py
index b169a7dc..42c75f83 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 5003a59a..e5f69858 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:
--
GitLab