cleanup top level

Makefile

@@ -1,70 +1,12 @@
-# this is just a convenience for developers, and to automate the release
-# process a little bit. This Makefile is not included in the source tarball.
-
-BBBASE = $(PWD)
-TRIALARGS=
-ifdef SVN
-T=~/stuff/python/twisted/Twisted
-TRIALARGS=--reporter=verbose
-else
-T=
-endif
-ifdef T13
-T=~/stuff/python/twisted/Twisted-1.3.0
-TRIALARGS=-v
-endif
-PP = PYTHONPATH=$(BBBASE):$(T)
-
-.PHONY: test
-TRIAL=trial
-TEST=buildbot.test
-test:
-	$(PP) $(TRIAL) $(TRIALARGS) $(TEST)
-
-test-coverage:
-	$(PP) $(TRIAL) --reporter=bwverbose-coverage $(TEST)
-
-PYTHON=python
-COVERAGE_OMIT = --omit /System,/Library,/usr/lib,buildbot/test,simplejson
-coverage-output-text:
-	$(PYTHON) contrib/coverage2text.py
-coverage-output:
-	rm -rf coverage-html
-	coverage html -d coverage-html $(COVERAGE_OMIT)
-	cp .coverage coverage-html/coverage.data
-	@echo "now point your browser at coverage-html/index.html"
-
-
-deb-snapshot:
-	debchange --newversion `PYTHONPATH=. python -c "import buildbot; print buildbot.version"`.`date +%Y.%m.%d.%H.%M.%S` \
-	 "snapshot build"
-	debuild binary
+# developer utilities
 
 .PHONY: docs apidocs some-apidocs paper
 docs:
 	$(MAKE) -C docs
 
-apidocs:
-	PYTHONPATH=.:$(T) python docs/epyrun -o docs/reference
-some-apidocs:
-	PYTHONPATH=.:$(T) python docs/epyrun -o docs/reference --modules $(EPYDOCS)
-paper:
-	$(MAKE) -C docs/PyCon-2003 all
-
-release: docs
-	chmod 0755 .
-	find buildbot contrib docs -type d -exec chmod 0755 {} \;
-	find bin buildbot contrib docs -type f -exec chmod 0644 {} \;
-	chmod 0644 MANIFEST* NEWS README* setup.py
-	chmod a+x bin/buildbot contrib/*.py contrib/windows/*.py
-	rm -rf _trial_temp
-	python ./setup.py clean
-	rm -f MANIFEST
-	python ./setup.py sdist --formats gztar,zip
-
-FLAKES=buildbot
-pyflakes:
-	pyflakes $(FLAKES) |sort |uniq
+reference:
+	cd docs; ./gen-reference
 
 pylint:
-	pylint buildbot
+	cd master; $(MAKE) pylint
+	cd slave; $(MAKE) pylint

pylintrc → common/pylintrc

@@ -79,7 +79,7 @@ load-plugins=
 # built-in.
 # W0704: Except doesn't do anything Used when an except clause does nothing but
 # "pass" and there is no "else" clause.
-disable=C0103,C0111,C0301,C0302,I0011,R0201,R0801,R0902,R0903,R0904,R0911,R0912,R0913,R0914,R0915,W0102,W0141,W0142,W0212,W0232,W0511,W0602,W0603,W0613,W0622,W0704
+disable-msg=C0103,C0111,C0301,C0302,I0011,R0201,R0801,R0902,R0903,R0904,R0911,R0912,R0913,R0914,R0915,W0102,W0141,W0142,W0212,W0232,W0511,W0602,W0603,W0613,W0622,W0704
 
 
 [REPORTS]

master/Makefile

@@ -0,0 +1,3 @@
+# developer utilities
+pylint:
+	pylint --rcfile=../common/pylintrc buildbot

slave/Makefile

@@ -0,0 +1,3 @@
+# developer utilities
+pylint:
+	pylint --rcfile=../common/pylintrc buildslave

slave/buildslave/scripts/runner.py

@@ -31,13 +31,15 @@ def mkdir(self):
             if not self.quiet:
                 print "updating existing installation"
             return
-        if not self.quiet: print "mkdir", self.basedir
+        if not self.quiet:
+            print "mkdir", self.basedir
         os.mkdir(self.basedir)
 
     def mkinfo(self):
         path = os.path.join(self.basedir, "info")
         if not os.path.exists(path):
-            if not self.quiet: print "mkdir", path
+            if not self.quiet:
+                print "mkdir", path
             os.mkdir(path)
         created = False
         admin = os.path.join(path, "admin")
@@ -64,7 +66,8 @@ def mkinfo(self):
             print "Please edit the files in %s appropriately." % path
 
     def chdir(self):
-        if not self.quiet: print "chdir", self.basedir
+        if not self.quiet:
+            print "chdir", self.basedir
         os.chdir(self.basedir)
 
     def makeTAC(self, contents, secret=False):
@@ -148,7 +151,8 @@ def createSlave(config):
     m.makeTAC(contents, secret=True)
     m.mkinfo()
 
-    if not m.quiet: print "buildslave configured in %s" % m.basedir
+    if not m.quiet:
+        print "buildslave configured in %s" % m.basedir