Delete deprecated BuildStatusGenerator subject parameter

master/buildbot/reporters/generators/build.py

@@ -20,7 +20,6 @@
 from buildbot.reporters import utils
 from buildbot.reporters.message import MessageFormatter
 from buildbot.reporters.message import MessageFormatterRenderable
-from buildbot.warnings import warn_deprecated
 
 from .utils import BuildStatusGeneratorMixin
 
@@ -40,21 +39,12 @@ def __init__(
         builders=None,
         schedulers=None,
         branches=None,
-        subject=None,
         add_logs=False,
         add_patch=False,
         report_new=False,
         message_formatter=None,
     ):
-        if subject is not None:
-            warn_deprecated(
-                '3.5.0',
-                'BuildStatusGenerator subject parameter has been '
-                + 'deprecated: please configure subject in the message formatter',
-            )
-        else:
-            subject = "Buildbot %(result)s in %(title)s on %(builder)s"
-
+        subject = "Buildbot %(result)s in %(title)s on %(builder)s"
         super().__init__(mode, tags, builders, schedulers, branches, subject, add_logs, add_patch)
         self.formatter = message_formatter
         if self.formatter is None:

master/buildbot/reporters/generators/buildset.py

@@ -20,7 +20,6 @@
 from buildbot.process.results import statusToString
 from buildbot.reporters import utils
 from buildbot.reporters.message import MessageFormatter
-from buildbot.warnings import warn_deprecated
 
 from .utils import BuildStatusGeneratorMixin
 
@@ -45,15 +44,7 @@ def __init__(
         add_patch=False,
         message_formatter=None,
     ):
-        if subject is not None:
-            warn_deprecated(
-                '3.5.0',
-                'BuildSetStatusGenerator subject parameter has been '
-                + 'deprecated: please configure subject in the message formatter',
-            )
-        else:
-            subject = "Buildbot %(result)s in %(title)s on %(builder)s"
-
+        subject = "Buildbot %(result)s in %(title)s on %(builder)s"
         super().__init__(mode, tags, builders, schedulers, branches, subject, add_logs, add_patch)
         self.formatter = message_formatter
         if self.formatter is None:

master/buildbot/test/unit/reporters/test_generators_build.py

@@ -28,8 +28,6 @@
 from buildbot.test.reactor import TestReactorMixin
 from buildbot.test.util.config import ConfigErrorsMixin
 from buildbot.test.util.reporter import ReporterTestMixin
-from buildbot.test.util.warnings import assertProducesWarning
-from buildbot.warnings import DeprecatedApiWarning
 
 
 class TestBuildGenerator(ConfigErrorsMixin, TestReactorMixin, unittest.TestCase, ReporterTestMixin):
@@ -132,11 +130,6 @@ def test_build_message_no_result(self):
             },
         )
 
-    @defer.inlineCallbacks
-    def test_build_subject_deprecated(self):
-        with assertProducesWarning(DeprecatedApiWarning, "subject parameter"):
-            yield self.setup_generator(subject='subject')
-
     @defer.inlineCallbacks
     def test_build_message_no_result_formatter_no_subject(self):
         message = {

master/buildbot/test/unit/reporters/test_generators_buildset.py

@@ -27,8 +27,6 @@
 from buildbot.test.reactor import TestReactorMixin
 from buildbot.test.util.config import ConfigErrorsMixin
 from buildbot.test.util.reporter import ReporterTestMixin
-from buildbot.test.util.warnings import assertProducesWarning
-from buildbot.warnings import DeprecatedApiWarning
 
 
 class TestBuildSetGeneratorBase(
@@ -151,11 +149,6 @@ def test_buildset_message_no_result(self):
             },
         )
 
-    @defer.inlineCallbacks
-    def test_buildset_subject_deprecated(self):
-        with assertProducesWarning(DeprecatedApiWarning, "subject parameter"):
-            yield self.setup_generator(subject='subject')
-
     @defer.inlineCallbacks
     def test_buildset_message_no_result_formatter_no_subject(self):
         message = {