Merge lp:~lifeless/python-oops-tools/deps into lp:python-oops-tools

[Robert Collins]

Update to newer deps across the board. Also switch to using the lp dep tree as per recent thread on lp-dev.

Update to newer deps across the board. Also switch to using the lp dep tree as per recent thread on lp-dev.

[Robert Collins (lifeless)]

simples

review: Approve

[Launchpad PQM Bot (launchpad-pqm)]

The attempt to merge lp:~lifeless/python-oops-tools/deps into lp:python-oops-tools failed.Below is the output from the failed tests.

find . -type f -name '*.py[co]' -exec rm -f {} \;
rm -f bin/buildout
rm -f src/oopstools/settings.py
bzr clean-tree --unknown --force
bzr up download-cache
python bootstrap.py \
  --setup-source=download-cache/ez_setup.py \
  --download-base=download-cache/dist --eggs=eggs

W: line 3 [buildbot-staging]: Deprecated key 'location' used
I: This option will be removed in the future; please update your configuration
W: line 1 [pqm]: Deprecated key 'location' used
I: This option will be removed in the future; please update your configuration
W: line 2 [pqm-oops-tools]: Deprecated key 'location' used
I: This option will be removed in the future; please update your configuration
I: [pqm-oops-tools chroot] Running command: "cd /home/pqm/pqm-workdir/oops-tools && make check"
Nothing to delete.
Tree is up to date at revision 51 of branch http://bazaar.launchpad.net/~launchpad/lazr-source-dependencies/download-cache
Traceback (most recent call last):
  File "bootstrap.py", line 164, in <module>
    options.setup_source).read().replace('\r\n', '\n')
  File "/usr/lib/python2.6/urllib2.py", line 126, in urlopen
    return _opener.open(url, data, timeout)
  File "/usr/lib/python2.6/urllib2.py", line 391, in open
    response = self._open(req, data)
  File "/usr/lib/python2.6/urllib2.py", line 409, in _open
    '_open', req)
  File "/usr/lib/python2.6/urllib2.py", line 369, in _call_chain
    result = func(*args)
  File "/usr/lib/python2.6/urllib2.py", line 1257, in file_open
    return self.open_local_file(req)
  File "/usr/lib/python2.6/urllib2.py", line 1294, in open_local_file
    raise URLError(msg)
urllib2.URLError: <urlopen error [Errno 2] No such file or directory: '/home/pqm/pqm-workdir/oops-tools/download-cache/ez_setup.py'>
make: *** [bin/buildout] Error 1

[Robert Collins (lifeless)]

tarmac needs its cached area removed (because it doesn't use clean builds :(...)

[Launchpad PQM Bot (launchpad-pqm)]

The attempt to merge lp:~lifeless/python-oops-tools/deps into lp:python-oops-tools failed.Below is the output from the failed tests.

find . -type f -name '*.py[co]' -exec rm -f {} \;
rm -f bin/buildout
rm -f src/oopstools/settings.py
bzr clean-tree --unknown --force
bzr checkout --lightweight lp:lp-source-dependencies download-cache
mkdir eggs
bzr up download-cache
python bootstrap.py \
  --setup-source=download-cache/ez_setup.py \
  --download-base=download-cache/dist --eggs=eggs
Downloading file:///home/pqm/pqm-workdir/oops-tools/download-cache/dist/setuptools-0.6c11-py2.6.egg
Download error: [Errno 101] Network is unreachable -- Some packages may not be found!
Download error: [Errno 101] Network is unreachable -- Some packages may not be found!
Creating directory '/home/pqm/pqm-workdir/oops-tools/bin'.
Creating directory '/home/pqm/pqm-workdir/oops-tools/parts'.
Creating directory '/home/pqm/pqm-workdir/oops-tools/develop-eggs'.
Generated script '/home/pqm/pqm-workdir/oops-tools/bin/buildout'.
bin/buildout configuration:db-port=5433
Develop: '/home/pqm/pqm-workdir/oops-tools/.'

W: line 3 [buildbot-staging]: Deprecated key 'location' used
I: This option will be removed in the future; please update your configuration
W: line 1 [pqm]: Deprecated key 'location' used
I: This option will be removed in the future; please update your configuration
W: line 2 [pqm-oops-tools]: Deprecated key 'location' used
I: This option will be removed in the future; please update your configuration
I: [pqm-oops-tools chroot] Running command: "cd /home/pqm/pqm-workdir/oops-tools && make check"
Nothing to delete.
You have not informed bzr of your Launchpad ID, and you must do this to
write to Launchpad or access private data. See "bzr help launchpad-login".
Tree is up to date at revision 417 of branch http://bazaar.launchpad.net/~launchpad/lp-source-dependencies/trunk
Traceback (most recent call last):
  File "/tmp/tmphmGYTn", line 11, in <module>
    execfile('/home/pqm/pqm-workdir/oops-tools/./setup.py')
  File "/home/pqm/pqm-workdir/oops-tools/./setup.py", line 18, in <module>
    import ez_setup
ImportError: No module named ez_setup
While:
  Installing.
  Processing develop directory '/home/pqm/pqm-workdir/oops-tools/.'.

An internal error occurred due to a bug in either zc.buildout or in a
recipe being used:
Traceback (most recent call last):
  File "/home/pqm/pqm-workdir/oops-tools/eggs/zc.buildout-1.5.2-py2.6.egg/zc/buildout/buildout.py", line 1805, in main
    getattr(buildout, command)(args)
  File "/home/pqm/pqm-workdir/oops-tools/eggs/zc.buildout-1.5.2-py2.6.egg/zc/buildout/buildout.py", line 446, in install
    installed_develop_eggs = self._develop()
  File "/home/pqm/pqm-workdir/oops-tools/eggs/zc.buildout-1.5.2-py2.6.egg/zc/buildout/buildout.py", line 686, in _develop
    zc.buildout.easy_install.develop(setup, dest)
  File "/home/pqm/pqm-workdir/oops-tools/eggs/zc.buildout-1.5.2-py2.6.egg/zc/buildout/easy_install.py", line 1189, in develop
    *args) == 0
AssertionError
make: *** [bin/buildout] Error 1

[Launchpad PQM Bot (launchpad-pqm)]

The attempt to merge lp:~lifeless/python-oops-tools/deps into lp:python-oops-tools failed.Below is the output from the failed tests.

find . -type f -name '*.py[co]' -exec rm -f {} \;
rm -f bin/buildout
rm -f src/oopstools/settings.py
bzr clean-tree --unknown --force
bzr up download-cache
python bootstrap.py \
  --setup-source=download-cache/ez_setup.py \
  --download-base=download-cache/dist --eggs=eggs
Download error: [Errno 101] Network is unreachable -- Some packages may not be found!
Download error: [Errno 101] Network is unreachable -- Some packages may not be found!
Generated script '/home/pqm/pqm-workdir/oops-tools/bin/buildout'.
bin/buildout configuration:db-port=5433
Develop: '/home/pqm/pqm-workdir/oops-tools/.'
Getting distribution for 'zc.recipe.egg==1.3.2'.
Got zc.recipe.egg 1.3.2.
Getting distribution for 'z3c.recipe.filetemplate==2.1.0'.
Got z3c.recipe.filetemplate 2.1.0.
Getting distribution for 'zope.testbrowser==3.8.0'.
Got zope.testbrowser 3.8.0.
Getting distribution for 'zope.cachedescriptors==3.5.0'.
Got zope.cachedescriptors 3.5.0.
Getting distribution for 'testtools==0.9.12'.
warning: no files found matching 'HACKING'
warning: no files found matching 'MANUAL'
no previously-included directories found matching 'doc/_build'
zip_safe flag not set; analyzing archive contents...
testtools.tests.test_distutilscmd: module references __path__
testtools.tests.test_run: module references __path__
Got testtools 0.9.12.
Getting distribution for 'sqlparse==0.1.2'.
zip_safe flag not set; analyzing archive contents...
Got sqlparse 0.1.2.
Getting distribution for 'South==0.7.3-r929'.
zip_safe flag not set; analyzing archive contents...
south.migration.base: module references __file__
south.tests.__init__: module references __file__
Got South 0.7.3-r929.
Getting distribution for 'pytz'.
Got pytz 2011n.
Getting distribution for 'psycopg2==2.4.1'.
warning: no files found matching '*.html' under directory 'doc'
warning: no files found matching '*.js' under directory 'doc'
warning: no files found matching '*' under directory 'doc/html'
no previously-included directories found matching 'doc/src/_build'
warning: no files found matching 'MANIFEST'
zip_safe flag not set; analyzing archive contents...
psycopg2.tests.types_basic: module references __file__
Got psycopg2 2.4.1.
Getting distribution for 'oops-datedir-repo==0.0.15'.
zip_safe flag not set; analyzing archive contents...
Got oops-datedir-repo 0.0.15.
Getting distribution for 'oops-amqp==0.0.4'.
zip_safe flag not set; analyzing archive contents...
Got oops-amqp 0.0.4.
Getting distribution for 'oops==0.0.10'.
zip_safe flag not set; analyzing archive contents...
Got oops 0.0.10.
Getting distribution for 'lazr.config==1.1.3'.
Got lazr.config 1.1.3.
Getting distribution for 'launchpadlib==1.9.11'.
Got launchpadlib 1.9.11.
Getting distribution for 'fixtures'.
zip_safe flag not set; analyzing archive contents...
fixtures._fixtures.packagepath: module references __path__
fixtures.tests._fixtures.test_packagepath: module references __path__
Got fixtures 0.3.8.
Getting distribution for 'BeautifulSoup==3.2.0'.
zip_safe flag not set; analyzing archive contents...
Got BeautifulSoup 3.2.0.
Getting dis...

[Launchpad PQM Bot (launchpad-pqm)]

The attempt to merge lp:~lifeless/python-oops-tools/deps into lp:python-oops-tools failed.Below is the output from the failed tests.

find . -type f -name '*.py[co]' -exec rm -f {} \;
rm -f bin/buildout
rm -f src/oopstools/settings.py
bzr clean-tree --unknown --force
bzr up download-cache

W: line 3 [buildbot-staging]: Deprecated key 'location' used
I: This option will be removed in the future; please update your configuration
W: line 1 [pqm]: Deprecated key 'location' used
I: This option will be removed in the future; please update your configuration
W: line 2 [pqm-oops-tools]: Deprecated key 'location' used
I: This option will be removed in the future; please update your configuration
I: [pqm-oops-tools chroot] Running command: "cd /home/pqm/pqm-workdir/oops-tools && make check"
Nothing to delete.
+N django-1.3.tar.gz
Conflict adding file django-1.3.tar.gz. Moved existing file to django-1.3.tar.gz.moved.
1 conflicts encountered.
Updated to revision 418 of branch http://bazaar.launchpad.net/~launchpad/lp-source-dependencies/trunk
make: *** [bin/buildout] Error 1

[lp:~lifeless/python-oops-tools/deps]

25. By Robert Collins on 2011-12-08

Update to newer deps across the board. Also switch to using the lp dep tree as per recent thread on lp-dev.

=== modified file 'Makefile'
--- Makefile	2011-10-13 20:18:51 +0000
+++ Makefile	2011-12-08 05:30:29 +0000
@@ -11,8 +11,8 @@
 	CREATE_DOWNLOAD_CACHE_COMMAND=ln -s $(LAZR_SOURCEDEPS_DIR)/download-cache
 else
 	CREATE_EGGS_COMMAND=mkdir eggs
-	CREATE_DOWNLOAD_CACHE_COMMAND=bzr checkout \
-    lp:lazr-source-dependencies download-cache
+	CREATE_DOWNLOAD_CACHE_COMMAND=bzr checkout --lightweight \
+    lp:lp-source-dependencies download-cache
 endif
 
 .PHONY: test build lint check clean tags run dbreset harness
@@ -22,7 +22,7 @@
 bin/buildout: buildout.cfg versions.cfg setup.py download-cache eggs
 	bzr up download-cache
 	$(PYTHON) bootstrap.py \
-		--setup-source=ez_setup.py \
+		--setup-source=download-cache/ez_setup.py \
 		--download-base=download-cache/dist --eggs=eggs
 	bin/buildout configuration:db-port=$(DBPORT)
 	@touch bin/buildout

=== modified file '_bootstrap/bootstrap.py' (properties changed: -x to +x)
--- _bootstrap/bootstrap.py	2011-10-13 20:18:51 +0000
+++ _bootstrap/bootstrap.py	2011-12-08 05:30:29 +0000
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
 ##############################################################################
 #
 # Copyright (c) 2006 Zope Foundation and Contributors.

=== removed file 'ez_setup.py'
--- ez_setup.py	2011-10-13 20:18:51 +0000
+++ ez_setup.py	1970-01-01 00:00:00 +0000
@@ -1,275 +0,0 @@
-#!python
-"""Bootstrap setuptools installation
-
-If you want to use setuptools in your package's setup.py, just include this
-file in the same directory with it, and add this to the top of your setup.py::
-
-    from ez_setup import use_setuptools
-    use_setuptools()
-
-If you want to require a specific version of setuptools, set a download
-mirror, or use an alternate download directory, you can do so by supplying
-the appropriate options to ``use_setuptools()``.
-
-This file can also be run as a script to install or upgrade setuptools.
-"""
-import sys
-DEFAULT_VERSION = "0.6c11"
-DEFAULT_URL     = "http://pypi.python.org/packages/%s/s/setuptools/" % sys.version[:3]
-
-md5_data = {
-    'setuptools-0.6b1-py2.3.egg': '8822caf901250d848b996b7f25c6e6ca',
-    'setuptools-0.6b1-py2.4.egg': 'b79a8a403e4502fbb85ee3f1941735cb',
-    'setuptools-0.6b2-py2.3.egg': '5657759d8a6d8fc44070a9d07272d99b',
-    'setuptools-0.6b2-py2.4.egg': '4996a8d169d2be661fa32a6e52e4f82a',
-    'setuptools-0.6b3-py2.3.egg': 'bb31c0fc7399a63579975cad9f5a0618',
-    'setuptools-0.6b3-py2.4.egg': '38a8c6b3d6ecd22247f179f7da669fac',
-    'setuptools-0.6b4-py2.3.egg': '62045a24ed4e1ebc77fe039aa4e6f7e5',
-    'setuptools-0.6b4-py2.4.egg': '4cb2a185d228dacffb2d17f103b3b1c4',
-    'setuptools-0.6c1-py2.3.egg': 'b3f2b5539d65cb7f74ad79127f1a908c',
-    'setuptools-0.6c1-py2.4.egg': 'b45adeda0667d2d2ffe14009364f2a4b',
-    'setuptools-0.6c2-py2.3.egg': 'f0064bf6aa2b7d0f3ba0b43f20817c27',
-    'setuptools-0.6c2-py2.4.egg': '616192eec35f47e8ea16cd6a122b7277',
-    'setuptools-0.6c3-py2.3.egg': 'f181fa125dfe85a259c9cd6f1d7b78fa',
-    'setuptools-0.6c3-py2.4.egg': 'e0ed74682c998bfb73bf803a50e7b71e',
-    'setuptools-0.6c3-py2.5.egg': 'abef16fdd61955514841c7c6bd98965e',
-    'setuptools-0.6c4-py2.3.egg': 'b0b9131acab32022bfac7f44c5d7971f',
-    'setuptools-0.6c4-py2.4.egg': '2a1f9656d4fbf3c97bf946c0a124e6e2',
-    'setuptools-0.6c4-py2.5.egg': '8f5a052e32cdb9c72bcf4b5526f28afc',
-    'setuptools-0.6c5-py2.3.egg': 'ee9fd80965da04f2f3e6b3576e9d8167',
-    'setuptools-0.6c5-py2.4.egg': 'afe2adf1c01701ee841761f5bcd8aa64',
-    'setuptools-0.6c5-py2.5.egg': 'a8d3f61494ccaa8714dfed37bccd3d5d',
-    'setuptools-0.6c6-py2.3.egg': '35686b78116a668847237b69d549ec20',
-    'setuptools-0.6c6-py2.4.egg': '3c56af57be3225019260a644430065ab',
-    'setuptools-0.6c6-py2.5.egg': 'b2f8a7520709a5b34f80946de5f02f53',
-    'setuptools-0.6c7-py2.3.egg': '209fdf9adc3a615e5115b725658e13e2',
-    'setuptools-0.6c7-py2.4.egg': '5a8f954807d46a0fb67cf1f26c55a82e',
-    'setuptools-0.6c7-py2.5.egg': '45d2ad28f9750e7434111fde831e8372',
-    'setuptools-0.6c8-py2.3.egg': '50759d29b349db8cfd807ba8303f1902',
-    'setuptools-0.6c8-py2.4.egg': 'cba38d74f7d483c06e9daa6070cce6de',
-    'setuptools-0.6c8-py2.5.egg': '1721747ee329dc150590a58b3e1ac95b',
-    'setuptools-0.6c9-py2.3.egg': 'a83c4020414807b496e4cfbe08507c03',
-    'setuptools-0.6c9-py2.4.egg': '260a2be2e5388d66bdaee06abec6342a',
-    'setuptools-0.6c9-py2.5.egg': 'fe67c3e5a17b12c0e7c541b7ea43a8e6',
-    'setuptools-0.6c9-py2.6.egg': 'ca37b1ff16fa2ede6e19383e7b59245a',
-}
-
-import sys, os
-try: from hashlib import md5
-except ImportError: from md5 import md5
-
-def _validate_md5(egg_name, data):
-    if egg_name in md5_data:
-        digest = md5(data).hexdigest()
-        if digest != md5_data[egg_name]:
-            print >>sys.stderr, (
-                "md5 validation of %s failed!  (Possible download problem?)"
-                % egg_name
-            )
-            sys.exit(2)
-    return data
-
-def use_setuptools(
-    version=DEFAULT_VERSION, download_base=DEFAULT_URL, to_dir=os.curdir,
-    download_delay=15
-):
-    """Automatically find/download setuptools and make it available on sys.path
-
-    `version` should be a valid setuptools version number that is available
-    as an egg for download under the `download_base` URL (which should end with
-    a '/').  `to_dir` is the directory where setuptools will be downloaded, if
-    it is not already available.  If `download_delay` is specified, it should
-    be the number of seconds that will be paused before initiating a download,
-    should one be required.  If an older version of setuptools is installed,
-    this routine will print a message to ``sys.stderr`` and raise SystemExit in
-    an attempt to abort the calling script.
-    """
-    was_imported = 'pkg_resources' in sys.modules or 'setuptools' in sys.modules
-    def do_download():
-        egg = download_setuptools(version, download_base, to_dir, download_delay)
-        sys.path.insert(0, egg)
-        import setuptools; setuptools.bootstrap_install_from = egg
-    try:
-        import pkg_resources
-    except ImportError:
-        return do_download()       
-    try:
-        pkg_resources.require("setuptools>="+version); return
-    except pkg_resources.VersionConflict, e:
-        if was_imported:
-            print >>sys.stderr, (
-            "The required version of setuptools (>=%s) is not available, and\n"
-            "can't be installed while this script is running. Please install\n"
-            " a more recent version first, using 'easy_install -U setuptools'."
-            "\n\n(Currently using %r)"
-            ) % (version, e.args[0])
-            sys.exit(2)
-        else:
-            del pkg_resources, sys.modules['pkg_resources']    # reload ok
-            return do_download()
-    except pkg_resources.DistributionNotFound:
-        return do_download()
-
-def download_setuptools(
-    version=DEFAULT_VERSION, download_base=DEFAULT_URL, to_dir=os.curdir,
-    delay = 15
-):
-    """Download setuptools from a specified location and return its filename
-
-    `version` should be a valid setuptools version number that is available
-    as an egg for download under the `download_base` URL (which should end
-    with a '/'). `to_dir` is the directory where the egg will be downloaded.
-    `delay` is the number of seconds to pause before an actual download attempt.
-    """
-    import urllib2, shutil
-    egg_name = "setuptools-%s-py%s.egg" % (version,sys.version[:3])
-    url = download_base + egg_name
-    saveto = os.path.join(to_dir, egg_name)
-    src = dst = None
-    if not os.path.exists(saveto):  # Avoid repeated downloads
-        try:
-            from distutils import log
-            if delay:
-                log.warn("""
----------------------------------------------------------------------------
-This script requires setuptools version %s to run (even to display
-help).  I will attempt to download it for you (from
-%s), but
-you may need to enable firewall access for this script first.
-I will start the download in %d seconds.
-
-(Note: if this machine does not have network access, please obtain the file
-
-   %s
-
-and place it in this directory before rerunning this script.)
----------------------------------------------------------------------------""",
-                    version, download_base, delay, url
-                ); from time import sleep; sleep(delay)
-            log.warn("Downloading %s", url)
-            src = urllib2.urlopen(url)
-            # Read/write all in one block, so we don't create a corrupt file
-            # if the download is interrupted.
-            data = _validate_md5(egg_name, src.read())
-            dst = open(saveto,"wb"); dst.write(data)
-        finally:
-            if src: src.close()
-            if dst: dst.close()
-    return os.path.realpath(saveto)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-def main(argv, version=DEFAULT_VERSION):
-    """Install or upgrade setuptools and EasyInstall"""
-    try:
-        import setuptools
-    except ImportError:
-        egg = None
-        try:
-            egg = download_setuptools(version, delay=0)
-            sys.path.insert(0,egg)
-            from setuptools.command.easy_install import main
-            return main(list(argv)+[egg])   # we're done here
-        finally:
-            if egg and os.path.exists(egg):
-                os.unlink(egg)
-    else:
-        if setuptools.__version__ == '0.0.1':
-            print >>sys.stderr, (
-            "You have an obsolete version of setuptools installed.  Please\n"
-            "remove it from your system entirely before rerunning this script."
-            )
-            sys.exit(2)
-
-    req = "setuptools>="+version
-    import pkg_resources
-    try:
-        pkg_resources.require(req)
-    except pkg_resources.VersionConflict:
-        try:
-            from setuptools.command.easy_install import main
-        except ImportError:
-            from easy_install import main
-        main(list(argv)+[download_setuptools(delay=0)])
-        sys.exit(0) # try to force an exit
-    else:
-        if argv:
-            from setuptools.command.easy_install import main
-            main(argv)
-        else:
-            print "Setuptools version",version,"or greater has been installed."
-            print '(Run "ez_setup.py -U setuptools" to reinstall or upgrade.)'
-
-def update_md5(filenames):
-    """Update our built-in md5 registry"""
-
-    import re
-
-    for name in filenames:
-        base = os.path.basename(name)
-        f = open(name,'rb')
-        md5_data[base] = md5(f.read()).hexdigest()
-        f.close()
-
-    data = ["    %r: %r,\n" % it for it in md5_data.items()]
-    data.sort()
-    repl = "".join(data)
-
-    import inspect
-    srcfile = inspect.getsourcefile(sys.modules[__name__])
-    f = open(srcfile, 'rb'); src = f.read(); f.close()
-
-    match = re.search("\nmd5_data = {\n([^}]+)}", src)
-    if not match:
-        print >>sys.stderr, "Internal error!"
-        sys.exit(2)
-
-    src = src[:match.start(1)] + repl + src[match.end(1):]
-    f = open(srcfile,'w')
-    f.write(src)
-    f.close()
-
-
-if __name__=='__main__':
-    if len(sys.argv)>2 and sys.argv[1]=='--md5update':
-        update_md5(sys.argv[2:])
-    else:
-        main(sys.argv[1:])
-
-
-
-
-

=== modified file 'setup.py'
--- setup.py	2011-11-30 17:06:23 +0000
+++ setup.py	2011-12-08 05:30:29 +0000
@@ -15,9 +15,6 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import ez_setup
-ez_setup.use_setuptools()
-
 import sys
 from setuptools import setup, find_packages
 

=== modified file 'src/oopstools/NEWS.txt'
--- src/oopstools/NEWS.txt	2011-11-21 04:50:37 +0000
+++ src/oopstools/NEWS.txt	2011-12-08 05:30:29 +0000
@@ -25,6 +25,9 @@
 * Mixed case OOPS reports can now be looked up in the web UI without their
   OOPS-prefix (if they had one). (Robert Collins, #884571)
 
+* Now uses the lp source dependencies rather than lazr, as part of simplifying
+  the maintenance of the many related LP projects. (Robert Collins)
+
 * Old OOPS reports can be cleaned out using the new script bin/prune.
   (Robert Collins)
 

=== modified file 'versions.cfg'
--- versions.cfg	2011-11-30 17:06:23 +0000
+++ versions.cfg	2011-12-08 05:30:29 +0000
@@ -2,38 +2,39 @@
 versions = versions
 
 [versions]
-BeautifulSoup = 3.0.7a
+BeautifulSoup = 3.2.0
 ClientForm = 0.2.10
-Jinja2 = 2.1.1
-Pygments = 1.0
+Jinja2 = 2.5.5
+Pygments = 1.4
 # XXX 20011-06-15 matsubara: Using South trunk up to r929 because changeset:
 # http://south.aeracode.org/changeset/21a63523132712eead38df6f3e43f7e616c114be
 # is necessary due to a Django 1.3 incompatibility. Once 0.7.4 is released,
 # this can be changed and package in the download-cache can be deleted.
 South = 0.7.3-r929
-Sphinx = 0.6.2
+Sphinx = 1.0.7
 sqlparse = 0.1.2
 djangorecipe = 0.19.2
 distribute = 0.6.12
 docutils = 0.6
-launchpadlib = 1.6.0
+launchpadlib = 1.9.11
 lazr.config = 1.1.3
 mechanize = 0.1.11
 oops = 0.0.10
 oops-amqp = 0.0.4
-oops-datedir-repo = 0.0.14
+oops-datedir-repo = 0.0.15
 # XXX: 2011-11-17 GavinPanella bug=891249: pyscopg2 2.4.2 is
 # incompatible with Django 1.3, but 2.4.1 works fine.
 psycopg2 = 2.4.1
 setuptools = 0.6c11
-z3c.recipe.filetemplate = 2.0.3
+testtools = 0.9.12
+z3c.recipe.filetemplate = 2.1.0
 z3c.recipe.sphinxdoc = 0.0.8
-z3c.recipe.tag = 0.2.0
-zc.buildout = 1.4.1
-zc.recipe.egg = 1.2.2
+z3c.recipe.tag = 0.4.0
+zc.buildout = 1.5.2
+zc.recipe.egg = 1.3.2
 zope.cachedescriptors = 3.5.0
 zope.event = 3.4.1
-zope.i18nmessageid = 3.4.3
-zope.interface = 3.5.1
+zope.i18nmessageid = 3.5.0
+zope.interface = 3.8.0
 zope.schema = 3.5.4
-zope.testbrowser = 3.5.1
+zope.testbrowser = 3.8.0