[Buildbot-commits] buildbot/buildbot/process factory.py, 1.13, 1.14 process_twisted.py, 1.46, 1.47

Brian Warner warner at users.sourceforge.net
Fri Sep 15 14:47:43 UTC 2006 

Update of /cvsroot/buildbot/buildbot/buildbot/process
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv20685/buildbot/process

Modified Files:
	factory.py process_twisted.py 
Log Message:
[project @ update docs, factories, and tests to use new buildbot/steps/* definitions]

Original author: warner at lothar.com
Date: 2006-09-08 21:25:42

Index: factory.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/process/factory.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- factory.py	17 Apr 2006 19:22:33 -0000	1.13
+++ factory.py	15 Sep 2006 14:47:41 -0000	1.14
@@ -2,7 +2,9 @@
 
 from buildbot import util
 from buildbot.process.base import Build
-from buildbot.process import step
+from buildbot.process.step import BuildStep
+from buildbot.steps.source import CVS, SVN
+from buildbot.steps.shell import Configure, Compile, Test
 
 # deprecated, use BuildFactory.addStep
 def s(steptype, **kwargs):
@@ -46,7 +48,7 @@
                  compile=["make", "all"],
                  test=["make", "check"]):
         assert isinstance(source, tuple)
-        assert issubclass(source[0], step.BuildStep)
+        assert issubclass(source[0], BuildStep)
         BuildFactory.__init__(self, [source])
         if configure is not None:
             # we either need to wind up with a string (which will be
@@ -61,29 +63,29 @@
             else:
                 assert isinstance(configure, (list, tuple))
                 command = configure + configureFlags
-            self.addStep(step.Configure, command=command, env=configureEnv)
+            self.addStep(Configure, command=command, env=configureEnv)
         if compile is not None:
-            self.addStep(step.Compile, command=compile)
+            self.addStep(Compile, command=compile)
         if test is not None:
-            self.addStep(step.Test, command=test)
+            self.addStep(Test, command=test)
 
 class CPAN(BuildFactory):
     def __init__(self, source, perl="perl"):
         assert isinstance(source, tuple)
-        assert issubclass(source[0], step.BuildStep)
+        assert issubclass(source[0], BuildStep)
         BuildFactory.__init__(self, [source])
-        self.addStep(step.Configure, command=[perl, "Makefile.PL"])
-        self.addStep(step.Compile, command=["make"])
-        self.addStep(step.Test, command=["make", "test"])
+        self.addStep(Configure, command=[perl, "Makefile.PL"])
+        self.addStep(Compile, command=["make"])
+        self.addStep(Test, command=["make", "test"])
 
 class Distutils(BuildFactory):
     def __init__(self, source, python="python", test=None):
         assert isinstance(source, tuple)
-        assert issubclass(source[0], step.BuildStep)
+        assert issubclass(source[0], BuildStep)
         BuildFactory.__init__(self, [source])
-        self.addStep(step.Compile, command=[python, "./setup.py", "build"])
+        self.addStep(Compile, command=[python, "./setup.py", "build"])
         if test is not None:
-            self.addStep(step.Test, command=test)
+            self.addStep(Test, command=test)
 
 class Trial(BuildFactory):
     """Build a python module that uses distutils and trial. Set 'tests' to
@@ -106,7 +108,7 @@
                  tests=None,  useTestCaseNames=False, env=None):
         BuildFactory.__init__(self, [source])
         assert isinstance(source, tuple)
-        assert issubclass(source[0], step.BuildStep)
+        assert issubclass(source[0], BuildStep)
         assert tests or useTestCaseNames, "must use one or the other"
         if trial is not None:
             self.trial = trial
@@ -115,10 +117,10 @@
         if recurse is not None:
             self.recurse = recurse
 
-        from buildbot.process import step_twisted
+        from buildbot.steps.python_twisted import Trial
         buildcommand = buildpython + ["./setup.py", "build"]
-        self.addStep(step.Compile, command=buildcommand, env=env)
-        self.addStep(step_twisted.Trial,
+        self.addStep(Compile, command=buildcommand, env=env)
+        self.addStep(Trial,
                      python=trialpython, trial=self.trial,
                      testpath=testpath,
                      tests=tests, testChanges=useTestCaseNames,
@@ -144,7 +146,7 @@
         mode = "clobber"
         if cvsCopy:
             mode = "copy"
-        source = s(step.CVS, cvsroot=cvsroot, cvsmodule=cvsmodule, mode=mode)
+        source = s(CVS, cvsroot=cvsroot, cvsmodule=cvsmodule, mode=mode)
         GNUAutoconf.__init__(self, source,
                              configure=configure, configureEnv=configureEnv,
                              compile=compile,
@@ -158,7 +160,7 @@
                  compile="make all",
                  test="make check", cvsCopy=False):
         mode = "update"
-        source = s(step.CVS, cvsroot=cvsroot, cvsmodule=cvsmodule, mode=mode)
+        source = s(CVS, cvsroot=cvsroot, cvsmodule=cvsmodule, mode=mode)
         GNUAutoconf.__init__(self, source,
                              configure=configure, configureEnv=configureEnv,
                              compile=compile,
@@ -170,7 +172,7 @@
                  configure=None, configureEnv={},
                  compile="make all",
                  test="make check"):
-        source = s(step.SVN, svnurl=svnurl, mode="update")
+        source = s(SVN, svnurl=svnurl, mode="update")
         GNUAutoconf.__init__(self, source,
                              configure=configure, configureEnv=configureEnv,
                              compile=compile,

Index: process_twisted.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/process/process_twisted.py,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- process_twisted.py	21 May 2006 19:51:35 -0000	1.46
+++ process_twisted.py	15 Sep 2006 14:47:41 -0000	1.47
@@ -4,8 +4,8 @@
 
 from buildbot.process.base import Build
 from buildbot.process.factory import BuildFactory
-from buildbot.process import step
-from buildbot.process.step_twisted import HLint, ProcessDocs, BuildDebs, \
+from buildbot.steps import shell
+from buildbot.steps.python_twisted import HLint, ProcessDocs, BuildDebs, \
      Trial, RemovePYCs
 
 class TwistedBuild(Build):
@@ -47,7 +47,7 @@
         self.addStep(RemovePYCs)
         for p in python:
             cmd = [p, "setup.py", "build_ext", "-i"]
-            self.addStep(step.Compile, command=cmd, flunkOnFailure=True)
+            self.addStep(shell.Compile, command=cmd, flunkOnFailure=True)
             self.addStep(TwistedTrial, python=p, testChanges=True)
 
 class FullTwistedBuildFactory(TwistedBaseFactory):
@@ -67,7 +67,7 @@
         cmd = (python + compileOpts + ["setup.py", "build_ext"]
                + compileOpts2 + ["-i"])
 
-        self.addStep(step.Compile, command=cmd, flunkOnFailure=True)
+        self.addStep(shell.Compile, command=cmd, flunkOnFailure=True)
         self.addStep(RemovePYCs)
         self.addStep(TwistedTrial, python=python, randomly=runTestsRandomly)
 
@@ -94,7 +94,7 @@
         cmd = (python + compileOpts + ["setup.py", "build_ext"]
                + compileOpts2 + ["-i"])
 
-        self.addStep(step.Compile, command=cmd, warnOnFailure=True)
+        self.addStep(shell.Compile, command=cmd, warnOnFailure=True)
 
         if reactors == None:
             reactors = [

More information about the Commits mailing list