diff options
Diffstat (limited to 'devel/buildbot/files/patch-setup.py')
| -rw-r--r-- | devel/buildbot/files/patch-setup.py | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/devel/buildbot/files/patch-setup.py b/devel/buildbot/files/patch-setup.py index d59eab29b2a3..f4a1732930af 100644 --- a/devel/buildbot/files/patch-setup.py +++ b/devel/buildbot/files/patch-setup.py @@ -1,17 +1,29 @@ ---- setup.py.orig 2009-03-03 01:13:03.000000000 +0800 -+++ setup.py 2009-06-26 23:28:27.000000000 +0800 -@@ -107,19 +107,6 @@ - 'cmdclass': {'install_data': install_data_twisted}, - } +--- setup.py.orig 2010-07-07 13:45:16.000000000 +0800 ++++ setup.py 2010-08-06 11:28:28.000000000 +0800 +@@ -233,31 +233,6 @@ + py_25 = sys.version_info[0] > 2 or (sys.version_info[0] == 2 and sys.version_info[1] >= 5) + py_26 = sys.version_info[0] > 2 or (sys.version_info[0] == 2 and sys.version_info[1] >= 6) -try: - # If setuptools is installed, then we'll add setuptools-specific arguments - # to the setup args. -- import setuptools +- import setuptools #@UnusedImport -except ImportError: - pass -else: -- setup_args['install_requires'] = ['twisted >= 2.0.0'] +- ## dependencies +- setup_args['install_requires'] = [ +- 'twisted >= 2.0.0', +- 'Jinja2', +- ] +- # Python-2.6 and up includes json +- if not py_26: +- setup_args['install_requires'].append('simplejson') +- +- # Python-2.6 and up includes a working A sqlite (py25's is broken) +- if not py_26: +- setup_args['install_requires'].append('pysqlite') +- - entry_points={ - 'console_scripts': [ - 'buildbot = buildbot.scripts.runner:run'], |