clarify warnings about builder categories

..and include builder categories in relnotes
buildbot · Jun 17, 2014 · ce301d9 · ce301d9
1 parent 4f0828d
commit ce301d9
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/master/buildbot/config.py b/master/buildbot/config.py
@@ -751,9 +751,11 @@ def __init__(self, name=None, slavename=None, slavenames=None,
         # remainder are optional
 
         if category and tags:
-            error("builder '%s': category is deprecated and replaced by tags; you should only specify tags" % (name,))
+            error("builder '%s': builder categories are deprecated and "
+                  "replaced by tags; you should only specify tags" % (name,))
         if category:
-            warnDeprecated("0.9", "category is deprecated and should be replaced with 'tags=[cat]'")
+            warnDeprecated("0.9", "builder categories are deprecated and "
+                                  "should be replaced with 'tags=[cat]'")
             if not isinstance(category, str):
                 error("builder '%s': category must be a string" % (name,))
             tags = [category]

diff --git a/master/buildbot/test/unit/test_config.py b/master/buildbot/test/unit/test_config.py
@@ -1144,7 +1144,7 @@ def test_tags_must_be_list_of_str(self):
 
     def test_tags_no_categories_too(self):
         self.assertRaisesConfigError(
-            "category is deprecated and replaced by tags; you should only specify tags",
+            "categories are deprecated and replaced by tags; you should only specify tags",
             lambda: config.BuilderConfig(tags=['abc'],
                                          category='def',
                                          name='a', slavenames=['a'], factory=self.factory))

diff --git a/master/docs/relnotes/index.rst b/master/docs/relnotes/index.rst
@@ -105,6 +105,9 @@ Requirements
 Changes and Removals
 ....................
 
+* Builders now have "tags" instead of a category.
+  Builders can have multiple tags, allowing more flexible builder displays.
+
 * :py:mod:`buildbot.schedulers.forcesched` has the following changes:
 
   - The default configuration no longer contains four ``AnyPropertyParameter`` instances.