From b4ab4c561b9b627dcb1f8ecfde587ed73558f910 Mon Sep 17 00:00:00 2001 From: Vasileios Karakasis Date: Sun, 29 Nov 2020 17:24:31 +0100 Subject: [PATCH 1/2] Remove deprecated fields --- reframe/core/pipeline.py | 32 -------------------------------- 1 file changed, 32 deletions(-) diff --git a/reframe/core/pipeline.py b/reframe/core/pipeline.py index 9b9ab59425..64a3180812 100644 --- a/reframe/core/pipeline.py +++ b/reframe/core/pipeline.py @@ -275,14 +275,6 @@ def pipeline_hooks(cls): #: :default: ``[]`` prebuild_cmds = fields.TypedField('prebuild_cmds', typ.List[str]) - #: .. deprecated:: 3.0 - #: - #: Use :attr:`prebuild_cmds` instead. - prebuild_cmd = fields.DeprecatedField( - fields.TypedField('prebuild_cmds', typ.List[str]), - "'prebuild_cmd' is deprecated; please use 'prebuild_cmds' instead" - ) - #: .. versionadded:: 3.0 #: #: List of shell commands to be executed after a successful compilation. @@ -295,14 +287,6 @@ def pipeline_hooks(cls): #: :default: ``[]`` postbuild_cmds = fields.TypedField('postbuild_cmds', typ.List[str]) - #: .. deprecated:: 3.0 - #: - #: Use :attr:`postbuild_cmds` instead. - postbuild_cmd = fields.DeprecatedField( - fields.TypedField('postbuild_cmds', typ.List[str]), - "'postbuild_cmd' is deprecated; please use 'postbuild_cmds' instead" - ) - #: The name of the executable to be launched during the run phase. #: #: :type: :class:`str` @@ -352,14 +336,6 @@ def pipeline_hooks(cls): #: :default: ``[]`` prerun_cmds = fields.TypedField('prerun_cmds', typ.List[str]) - #: .. deprecated:: 3.0 - #: - #: Use :attr:`prerun_cmds` instead. - pre_run = fields.DeprecatedField( - fields.TypedField('prerun_cmds', typ.List[str]), - "'pre_run' is deprecated; please use 'prerun_cmds' instead" - ) - #: .. versionadded:: 3.0 #: #: List of shell commands to execute after launching this job. @@ -371,14 +347,6 @@ def pipeline_hooks(cls): #: :default: ``[]`` postrun_cmds = fields.TypedField('postrun_cmds', typ.List[str]) - #: .. deprecated:: 3.0 - #: - #: Use :attr:`postrun_cmds` instead. - post_run = fields.DeprecatedField( - fields.TypedField('postrun_cmds', typ.List[str]), - "'post_run' is deprecated; please use 'postrun_cmds' instead" - ) - #: List of files to be kept after the test finishes. #: #: By default, the framework saves the standard output, the standard error From 095e13ed489a28f6d0722a5dc44275d01fa3e72a Mon Sep 17 00:00:00 2001 From: Vasileios Karakasis Date: Sun, 29 Nov 2020 17:37:44 +0100 Subject: [PATCH 2/2] Remove unused import and update migration guide --- docs/migration_2_to_3.rst | 3 +++ reframe/core/pipeline.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/docs/migration_2_to_3.rst b/docs/migration_2_to_3.rst index 6d0fa857ea..e8296c0faa 100644 --- a/docs/migration_2_to_3.rst +++ b/docs/migration_2_to_3.rst @@ -171,6 +171,9 @@ Other deprecations The :attr:`prebuild_cmd` and :attr:`postbuild_cmd` test attributes are replaced by the :attr:`prebuild_cmds` and :attr:`postbuild_cmds` respectively. Similarly, the :attr:`pre_run` and :attr:`post_run` test attributes are replaced by the :attr:`prerun_cmds` and :attr:`postrun_cmds` respectively. +.. warning:: + .. versionchanged:: 3.4 + The :attr:`prebuild_cmd`, :attr:`postbuild_cmd`, :attr:`pre_run` and :attr:`post_run` attributes have been removed. Suppressing deprecation warnings diff --git a/reframe/core/pipeline.py b/reframe/core/pipeline.py index 64a3180812..435aded76b 100644 --- a/reframe/core/pipeline.py +++ b/reframe/core/pipeline.py @@ -32,7 +32,7 @@ import reframe.utility.udeps as udeps from reframe.core.backends import (getlauncher, getscheduler) from reframe.core.buildsystems import BuildSystemField -from reframe.core.containers import ContainerPlatform, ContainerPlatformField +from reframe.core.containers import ContainerPlatformField from reframe.core.deferrable import _DeferredExpression from reframe.core.exceptions import (BuildError, DependencyError, PipelineError, SanityError,