Permalink
Browse files

cleanup top level

  • Loading branch information...
Dustin J. Mitchell
Dustin J. Mitchell committed Jun 6, 2010
1 parent e3080dc commit 2803e4e5b396fb49591269f9a53bce546ccfdad7
Showing with 20 additions and 13,543 deletions.
  1. +0 −1,814 ChangeLog-0.7.10
  2. +0 −1,722 ChangeLog-0.7.11
  3. +0 −2,132 ChangeLog-0.7.12
  4. +0 −7,727 ChangeLog-0.8.0
  5. +5 −63 Makefile
  6. +1 −1 { → common}/pylintrc
  7. +3 −0 master/Makefile
  8. +3 −0 slave/Makefile
  9. +8 −4 slave/buildslave/scripts/runner.py
  10. +0 −40 test-dist.sh
  11. +0 −40 twisted/plugins/buildbot_trial.py
View

Large diffs are not rendered by default.

Oops, something went wrong.
View

Large diffs are not rendered by default.

Oops, something went wrong.
View

Large diffs are not rendered by default.

Oops, something went wrong.
View

Large diffs are not rendered by default.

Oops, something went wrong.
View
@@ -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
@@ -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]
View
@@ -0,0 +1,3 @@
+# developer utilities
+pylint:
+ pylint --rcfile=../common/pylintrc buildbot
View
@@ -0,0 +1,3 @@
+# developer utilities
+pylint:
+ pylint --rcfile=../common/pylintrc buildslave
@@ -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
View
@@ -1,40 +0,0 @@
-#! /bin/sh
-
-# Make a source distribution, and verify that all files git knows about are
-# also in the source dist
-
-if ! test -d buildbot || ! test -d docs; then
- echo "not in the buildbot base dir"
- exit 1
-fi
-
-test -d dist || mkdir dist
-
-existing=`ls -1 dist/ 2>/dev/null`
-if test -n "$existing"; then
- echo "dist files already exist:"
- echo $existing
- echo "OK to delete? [Y/n] "
- read YN
- if test -n "$YN" && test "$YN" != "y"; then
- exit 1
- fi
- rm dist/*
-fi
-
-python setup.py sdist || exit 1
-
-tar -ztf dist/*.tar.gz > distfiles || exit 1
-
-for f in `git ls-files`; do
- echo $f | grep -q "\.mailmap" && continue
- echo $f | grep -q "\.git" && continue
- echo $f | grep -q "^docs/PyCon" && continue
- echo $f | grep -q "^twisted" && continue
- echo $f | grep -q "^buildbot/broken_test" && continue
- if ! grep -q $f distfiles; then
- echo "NOT FOUND: $f";
- fi
-done
-
-rm distfiles
@@ -1,40 +0,0 @@
-
-from zope.interface import implements
-from twisted.trial.itrial import IReporter
-from twisted.plugin import IPlugin
-
-# register a plugin that can create our CoverageReporter. The reporter itself
-# lives separately, in buildbot/test/trial_figleaf.py
-
-# note that this buildbot_trial.py file is *not* in a package: there is no
-# __init__.py in our parent directory. This is important, because otherwise
-# ours would fight with Twisted's. When trial looks for plugins, it merely
-# executes all the *.py files it finds in any twisted/plugins/ subdirectories
-# of anything on sys.path . The namespace that results from executing these
-# .py files is examined for instances which provide both IPlugin and the
-# target interface (in this case, trial is looking for IReporter instances).
-# Each such instance tells the application how to create a plugin by naming
-# the module and class that should be instantiated.
-
-# When installing our package via setup.py, arrange for this file to be
-# installed to the system-wide twisted/plugins/ directory.
-
-class _Reporter(object):
- implements(IPlugin, IReporter)
-
- def __init__(self, name, module, description, longOpt, shortOpt, klass):
- self.name = name
- self.module = module
- self.description = description
- self.longOpt = longOpt
- self.shortOpt = shortOpt
- self.klass = klass
-
-
-bwcov = _Reporter("Code-Coverage Reporter (colorless)",
- "buildbot.test.trial_coverage",
- description="Colorless verbose output (with 'coverage' coverage)",
- longOpt="bwverbose-coverage",
- shortOpt=None,
- klass="CoverageTextReporter")
-

0 comments on commit 2803e4e

Please sign in to comment.