Require SQLObject >= 2.2.1 for CONCAT

diff --git a/requirements.txt b/requirements.txt
index 88acdf5347f53771842d05d6c964a1576e181044..40340c02568483aabfd975da6977e4a5ea47ac29 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,2 +1,2 @@
-SQLObject
+SQLObject>=2.2.1
 m_lib

diff --git a/setup.py b/setup.py
index 6d5b3cca19d8857e888e07c62e23e563a5f4ba26..6b6f99ff81571c243d802686d3ecb46825c4e8ea 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -15,6 +15,10 @@ except ImportError:
     from distutils.core import setup
     is_setuptools = False
 
+kw = {}
+if is_setuptools:
+    kw['install_requires'] = ['SQLObject>=2.2.1', 'm_lib>=2.0']
+
 versionpath = join(abspath(dirname(__file__)), 'm_librarian', '__version__.py')
 load_source('m_librarian_version', versionpath)
 from m_librarian_version import __version__
@@ -44,5 +48,5 @@ setup(name='m_librarian',
       package_data={'m_librarian': ['glst/*.txt', 'glst/genres_*.glst']},
       scripts=['scripts/ml-import.py', 'scripts/ml-initdb.py',
                'scripts/ml-search.py'],
-      requires=['SQLObject', 'm_lib'],
+      **kw
       )