Skip to content

Commit e13848b

Browse files
committed
Move deprecation to 5.1
We need to fix our own easyblocks first but that requires this change. So allow until 5.1 or remove after updating the easyblocks.
1 parent b89b717 commit e13848b

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

easybuild/framework/easyconfig/easyconfig.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ def new_ec_method(self, key, *args, **kwargs):
122122
# map deprecated parameters to their replacements, issue deprecation warning(/error)
123123
if key == 'parallel':
124124
_log.deprecated("Easyconfig parameter 'parallel' is deprecated, "
125-
"use 'maxparallel' or the parallel property instead.", '5.0')
125+
"use 'maxparallel' or the parallel property instead.", '5.1')
126126
# Use a "hidden" property for now to match behavior as closely as possible
127127
key = '_parallelLegacy'
128128
elif key in ALTERNATIVE_EASYCONFIG_PARAMETERS:
@@ -149,7 +149,7 @@ def is_local_var_name(name):
149149
"""
150150
res = False
151151
if name.startswith(LOCAL_VAR_PREFIX) or name.startswith('_'):
152-
# Remove with EasyBuild 5.0
152+
# Remove with EasyBuild 5.1
153153
if name != '_parallelLegacy':
154154
res = True
155155
# __builtins__ is always defined as a 'local' variables
@@ -506,7 +506,7 @@ def __init__(self, path, extra_options=None, build_specs=None, validate=True, hi
506506

507507
# Storage for parallel property. Mark as unset initially
508508
self._parallel = None
509-
# Legacy value, remove with EasyBuild 5.0
509+
# Legacy value, remove with EasyBuild 5.1
510510
self._config['_parallelLegacy'] = [None, '', ('', )]
511511

512512
# parse easyconfig file
@@ -711,7 +711,7 @@ def parse(self):
711711

712712
if 'parallel' in ec_vars:
713713
# Replace value and issue better warning for EC params (as opposed to warnings meant for easyblocks)
714-
self.log.deprecated("Easyconfig parameter 'parallel' is deprecated, use 'maxparallel' instead.", '5.0')
714+
self.log.deprecated("Easyconfig parameter 'parallel' is deprecated, use 'maxparallel' instead.", '5.1')
715715
ec_vars['_parallelLegacy'] = ec_vars.pop('parallel')
716716

717717
# provide suggestions for typos. Local variable names are excluded from this check
@@ -1233,7 +1233,7 @@ def parallel(self, value):
12331233
# Update backstorage and template value
12341234
self._parallel = value
12351235
self.template_values['parallel'] = value
1236-
# Backwards compat only. Remove with EasyBuild 5.0
1236+
# Backwards compat only. Remove with EasyBuild 5.1
12371237
self._config['_parallelLegacy'][0] = value
12381238

12391239
def dump(self, fp, always_overwrite=True, backup=False, explicit_toolchains=False):

0 commit comments

Comments
 (0)