Merge branch 'master' of git@github.com:djmitche/buildbot

* 'master' of git@github.com:djmitche/buildbot: Add new sqlite3 dependency
djmitche · Feb 15, 2010 · 950bc5c · 950bc5c
2 parents b458737 + 641fea4
commit 950bc5c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/README b/README
@@ -55,6 +55,11 @@ REQUIREMENTS:
    Buildbot requires python-2.4 or later. It is also tested against
    python-2.5 and python-2.6.
 
+ sqlite3: http://pypi.python.org/pypi/pysqlite
+
+  sqlite3 is required for python-2.4 and earlier (already included
+  in python-2.5 and later)
+
  simplejson: http://pypi.python.org/pypi/simplejson
 
   simplejson is required for python-2.5 and earlier (already included

diff --git a/setup.py b/setup.py
@@ -246,6 +246,9 @@ def finalize_options(self):
         'twisted >= 2.0.0',
         'Jinja2',
     ]
+    # Python-2.5 and up includes sqlite3
+    if not py_25:
+        setup_args['install_requires'].append('sqlite3')
     # Python-2.6 and up includes json
     if not py_26:
         setup_args['install_requires'].append('simplejson')