maintain alphabetical order

Author: Samuel Moors

easybuild/tools/config.py

@@ -519,9 +519,9 @@ class ConfigurationVariables(BaseConfigurationVariables):
         'failed_install_build_dirs_path',
         'failed_install_logs_path',
         'installpath',
+        'installpath_data',
         'installpath_modules',
         'installpath_software',
-        'installpath_data',
         'job_backend',
         'logfile_format',
         'moduleclasses',
@@ -535,9 +535,9 @@ class ConfigurationVariables(BaseConfigurationVariables):
         'repositorypath',
         'sourcepath',
         'sourcepath_data',
+        'subdir_data',
         'subdir_modules',
         'subdir_software',
-        'subdir_data',
         'tmp_logdir',
     ]
     KNOWN_KEYS = REQUIRED  # KNOWN_KEYS must be defined for FrozenDictKnownKeys functionality

easybuild/tools/options.py

@@ -611,12 +611,12 @@ def config_options(self):
                                    'strlist', 'store', []),
             'installpath': ("Install path for software and modules",
                             None, 'store', mk_full_default_path('installpath')),
+            'installpath-data': ("Install path for data (if None, combine --installpath and --subdir-data)",
+                                 None, 'store', None),
             'installpath-modules': ("Install path for modules (if None, combine --installpath and --subdir-modules)",
                                     None, 'store', None),
             'installpath-software': ("Install path for software (if None, combine --installpath and --subdir-software)",
                                      None, 'store', None),
-            'installpath-data': ("Install path for data (if None, combine --installpath and --subdir-data)",
-                                 None, 'store', None),
             'job-backend': ("Backend to use for submitting jobs", 'choice', 'store',
                             DEFAULT_JOB_BACKEND, sorted(avail_job_backends().keys())),
             # purposely take a copy for the default logfile format
@@ -665,11 +665,11 @@ def config_options(self):
                            None, 'store', mk_full_default_path('sourcepath')),
             'sourcepath-data': ("Path(s) to where data sources should be downloaded (string, colon-separated) "
                                 "(same as sourcepath if not specified)", None, 'store', None),
+            'subdir-data': ("Installpath subdir for data",
+                            None, 'store', DEFAULT_PATH_SUBDIRS['subdir_data']),
             'subdir-modules': ("Installpath subdir for modules", None, 'store', DEFAULT_PATH_SUBDIRS['subdir_modules']),
             'subdir-software': ("Installpath subdir for software",
                                 None, 'store', DEFAULT_PATH_SUBDIRS['subdir_software']),
-            'subdir-data': ("Installpath subdir for data",
-                            None, 'store', DEFAULT_PATH_SUBDIRS['subdir_data']),
             'subdir-user-modules': ("Base path of user-specific modules relative to --envvars-user-modules",
                                     None, 'store', None),
             'suffix-modules-path': ("Suffix for module files install path", None, 'store', GENERAL_CLASS),