diff --git a/beat/web/backend/management/commands/qsetup.py b/beat/web/backend/management/commands/qsetup.py index f903d45240bf62d11a3dc97edec4426fe2c6b575..837d93ce7ce3d618576b7fcfd0bf99f11f4255a8 100755 --- a/beat/web/backend/management/commands/qsetup.py +++ b/beat/web/backend/management/commands/qsetup.py @@ -43,7 +43,7 @@ import socket CORES = psutil.cpu_count() RAM = psutil.virtual_memory().total/(1024*1024) ENVIRONMENT = {'name': 'environment', 'version': '1'} -CXX_ENVIRONMENT = {'name': 'cxx_environment', 'version': '1'} +CXX_ENVIRONMENT = {'name': 'Cxx backend', 'version': '1.0.0'} ENVKEY = '%(name)s (%(version)s)' % ENVIRONMENT CXX_ENVKEY = '%(name)s (%(version)s)' % CXX_ENVIRONMENT HOSTNAME = socket.gethostname() diff --git a/beat/web/backend/models.py b/beat/web/backend/models.py index 9e0ba49db2dbcfdc305a38f6e5a1a85ca35b85e9..d7a62713d32b7890ead7dfb99107b06ef66ca7ef 100755 --- a/beat/web/backend/models.py +++ b/beat/web/backend/models.py @@ -1391,6 +1391,12 @@ class JobSplit(models.Model): config = simplejson.loads(str(self.job.block.command)) + if settings.DATASETS_UID is not None: + config['datasets_uid'] = settings.DATASETS_UID + + if settings.DATASETS_ROOT_PATH is not None: + config['datasets_root_path'] = settings.DATASETS_ROOT_PATH + # setup range if necessary if self.job.block.required_slots > 1: diff --git a/beat/web/settings/settings.py b/beat/web/settings/settings.py old mode 100644 new mode 100755 index 26f3eb470a148dc055aff1f3ed75eaec4c005ffa..17a7b1d25b1d807ac7ea186406fd9b2e03126c96 --- a/beat/web/settings/settings.py +++ b/beat/web/settings/settings.py @@ -199,6 +199,16 @@ EXPERIMENTS_ROOT = os.path.join(PREFIX, 'experiments') CACHE_ROOT = os.path.join(PREFIX, 'cache') +############################################################################## +# +# IF ACCESS TO THE DATASETS IS RESTRICTED TO A SPECIFIC USER +# +############################################################################## + +DATASETS_UID = None +DATASETS_ROOT_PATH = None + + ############################################################################## # # ACCOUNTS diff --git a/setup.py b/setup.py old mode 100644 new mode 100755 index fe2ad78948d2cff7ab29eef61706a8b6cbee7ca6..432261f68c3788a4671a4da71771fde62074cd3b --- a/setup.py +++ b/setup.py @@ -32,7 +32,7 @@ from setuptools import setup, find_packages setup( name='beat.web', - version='1.2.0rc3', + version='1.2.0rc4', description='Biometrics Evaluation and Testing Platform (Web Modules)', url='https://gitlab.idiap.ch/beat/beat.web', license='AGPLv3',