Merge branch 'develop'

This commit is contained in:
Florent Guiotte 2018-10-13 19:01:44 +02:00
commit 5ae55c5411
2 changed files with 28 additions and 1 deletions

20
setup.py Normal file
View File

@ -0,0 +1,20 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
# \file setup.py
# \brief TODO
# \author Florent Guiotte <florent.guiotte@gmail.com>
# \version 0.1
# \date 2 oct. 2018
#
# TODO details
from distutils.core import setup
setup(name='minigrida',
version='1.11',
description='Simple and decentralized computing grid',
author='Florent Guiotte',
author_email='florent.guiotte@uhb.fr',
url='https://git.guiotte.fr/Florent/minigrida',
packages=['cvgenerators', 'descriptors', 'protocols'],
)

View File

@ -164,6 +164,9 @@ class ExpePath:
def _get_complete_name(self): def _get_complete_name(self):
return self._get_hash_name() + '.yml' return self._get_hash_name() + '.yml'
def exists(self):
return self._actual.exists()
def stage(self, expe): def stage(self, expe):
log.info('Staging {}'.format(self._base_name)) log.info('Staging {}'.format(self._base_name))
self._check_hash(expe) self._check_hash(expe)
@ -219,7 +222,11 @@ def main():
watch_folder() watch_folder()
continue continue
try: try:
run(queue.pop()['expe_file']) expe_file = queue.pop()['expe_file']
while(not expe_file.exists() and queue):
expe_file = queue.pop()['expe_file']
if expe_file.exists():
run(expe_file)
except TestError: except TestError:
log.warning('Test failed, error logged. Resuming') log.warning('Test failed, error logged. Resuming')
except Exception: except Exception: