Commit aa5a0991 authored by Julien Muchembled's avatar Julien Muchembled

buildout-testing: use same version of setuptools

parent 7ead3646
...@@ -4,6 +4,7 @@ import argparse, os, re, subprocess, sys ...@@ -4,6 +4,7 @@ import argparse, os, re, subprocess, sys
from time import gmtime, strftime, time from time import gmtime, strftime, time
from erp5.util import taskdistribution from erp5.util import taskdistribution
from erp5.util.testsuite import SubprocessError, TestSuite from erp5.util.testsuite import SubprocessError, TestSuite
from setuptools.version import __version__ as setuptools_version
from zc.buildout.buildout import Buildout from zc.buildout.buildout import Buildout
slapos_buildout = {{repr(slapos_buildout)}} slapos_buildout = {{repr(slapos_buildout)}}
...@@ -97,6 +98,7 @@ develop =%s ...@@ -97,6 +98,7 @@ develop =%s
parts = test parts = test
[versions] [versions]
setuptools = %s
%s %s
[bootstrap] [bootstrap]
...@@ -111,6 +113,7 @@ scripts = ...@@ -111,6 +113,7 @@ scripts =
zope-testrunner zope-testrunner
""" % (os.path.join(slapos_buildout, 'buildout.cfg'), """ % (os.path.join(slapos_buildout, 'buildout.cfg'),
''.join('\n ' + x for x in test_dict.itervalues()), ''.join('\n ' + x for x in test_dict.itervalues()),
setuptools_version,
'\n'.join(x + ' =' for x in test_dict))) '\n'.join(x + ' =' for x in test_dict)))
finally: finally:
os.close(fd) os.close(fd)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment