remove master-side support for old-style source steps

Fixes #2842.
buildbot · Jul 31, 2014 · 94a8652 · 94a8652
1 parent f209176
commit 94a8652
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 1,503 deletions.
diff --git a/master/buildbot/steps/source/__init__.py b/master/buildbot/steps/source/__init__.py
@@ -14,28 +14,5 @@
 # Copyright Buildbot Team Members
 
 from buildbot.steps.source.base import Source
-from buildbot.steps.source.oldsource import BK
-from buildbot.steps.source.oldsource import Bzr
-from buildbot.steps.source.oldsource import CVS
-from buildbot.steps.source.oldsource import Darcs
-from buildbot.steps.source.oldsource import Git
-from buildbot.steps.source.oldsource import Mercurial
-from buildbot.steps.source.oldsource import Monotone
-from buildbot.steps.source.oldsource import P4
-from buildbot.steps.source.oldsource import Repo
-from buildbot.steps.source.oldsource import SVN
-from twisted.python.deprecate import deprecatedModuleAttribute
-from twisted.python.versions import Version
 
-warningString = "The slave-side %s step is deprecated and will be removed in a future version.  Please switch to the corresponding master-side step."
-
-oldClasses = ["CVS", "SVN", "Git", "Darcs", "Repo", "Bzr", "Mercurial", "P4",
-              "Monotone", "BK"]
-
-for oldClass in oldClasses:
-    deprecatedModuleAttribute(Version("Buildbot", 0, 8, 9),
-                              warningString % (oldClass),
-                              "buildbot.steps.source", oldClass)
-
-_hush_pyflakes = [Source, CVS, SVN,
-                  Git, Darcs, Repo, Bzr, Mercurial, P4, Monotone, BK]
+_hush_pyflakes = [Source]
diff --git a/master/buildbot/steps/source/oldsource.py b/master/buildbot/steps/source/oldsource.py
diff --git a/master/buildbot/test/regressions/test_oldpaths.py b/master/buildbot/test/regressions/test_oldpaths.py
@@ -158,56 +158,6 @@ def test_steps_source_Source(self):
         from buildbot.steps.source import Source
         assert Source
 
-    @deprecatedImport
-    def test_steps_source_CVS(self):
-        from buildbot.steps.source import CVS
-        assert CVS
-
-    @deprecatedImport
-    def test_steps_source_SVN(self):
-        from buildbot.steps.source import SVN
-        assert SVN
-
-    @deprecatedImport
-    def test_steps_source_Git(self):
-        from buildbot.steps.source import Git
-        assert Git
-
-    @deprecatedImport
-    def test_steps_source_Darcs(self):
-        from buildbot.steps.source import Darcs
-        assert Darcs
-
-    @deprecatedImport
-    def test_steps_source_Repo(self):
-        from buildbot.steps.source import Repo
-        assert Repo
-
-    @deprecatedImport
-    def test_steps_source_Bzr(self):
-        from buildbot.steps.source import Bzr
-        assert Bzr
-
-    @deprecatedImport
-    def test_steps_source_Mercurial(self):
-        from buildbot.steps.source import Mercurial
-        assert Mercurial
-
-    @deprecatedImport
-    def test_steps_source_P4(self):
-        from buildbot.steps.source import P4
-        assert P4
-
-    @deprecatedImport
-    def test_steps_source_Monotone(self):
-        from buildbot.steps.source import Monotone
-        assert Monotone
-
-    @deprecatedImport
-    def test_steps_source_BK(self):
-        from buildbot.steps.source import BK
-        assert BK
-
     def test_buildstep_remotecommand(self):
         from buildbot.process.buildstep import RemoteCommand, \
             LoggedRemoteCommand, RemoteShellCommand

diff --git a/master/buildbot/test/unit/test_steps_source_oldsource.py b/master/buildbot/test/unit/test_steps_source_oldsource.py
diff --git a/master/buildbot/test/unit/test_steps_source_oldsource_ComputeRepositoryURL.py b/master/buildbot/test/unit/test_steps_source_oldsource_ComputeRepositoryURL.py
diff --git a/master/buildbot/test/unit/test_steps_source_oldsource_Repo.py b/master/buildbot/test/unit/test_steps_source_oldsource_Repo.py
diff --git a/master/docs/relnotes/0.8.7.rst b/master/docs/relnotes/0.8.7.rst
@@ -150,7 +150,7 @@ Deprecations, Removals, and Non-Compatible Changes
 
 * The undocumented renderable ``_ComputeRepositoryURL`` is no longer imported to
   :py:mod:`buildbot.steps.source`. It is still available at
-  :py:mod:`buildbot.steps.source.oldsource`.
+  ``buildbot.steps.source.oldsource``.
 
 * ``IProperties.render`` now returns a deferred, so any code rendering properties
   by hand will need to take this into account.

diff --git a/master/docs/relnotes/index.rst b/master/docs/relnotes/index.rst
@@ -147,6 +147,11 @@ Requirements
 * Bulider names are now restricted to unicode strings or ASCII bytestrings.
   Encoded bytestrings are not accepted.
 
+Steps
+.....
+
+* Old-style source steps (imported directly from ``buildbot.steps.source``) are no longer supported on the master.
+
 Changes and Removals
 ....................
 
@@ -249,6 +254,10 @@ Fixes
 Deprecations, Removals, and Non-Compatible Changes
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+* While the buildmaster no longer supports old-style source steps, the buildslave still does.
+  Buildbot-slave-0.9.0 will still run successfully against Buildbot-0.8.9 or earlier, configured to use old-style steps.
+  However, the support is stlil deprecated and will be removed as soon as it is inconvenient for developers.
+
 Details
 -------