Merge remote-tracking branch 'upstream/master'

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()

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:
 

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

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',