From: Oleg Broytman Date: Mon, 9 May 2016 21:07:00 +0000 (+0300) Subject: Require SQLObject >= 2.2.1 for CONCAT X-Git-Tag: 0.0.4~6 X-Git-Url: https://git.phdru.name/?p=m_librarian.git;a=commitdiff_plain;h=a21abd3790a2bd7d83f0ae5d61364a87e25d2333 Require SQLObject >= 2.2.1 for CONCAT --- diff --git a/requirements.txt b/requirements.txt index 88acdf5..40340c0 100644 --- 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 6d5b3cc..6b6f99f 100755 --- 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 )