X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=setup.py;h=9f9614d75e5f26d0e0340d25a1d3755a373397c0;hb=675166d0f4ef7f58e7b732097c6bf45fe4f67c9a;hp=a9462507c6eda7a70cca5cafa8db5a17b33f99ae;hpb=964363c38b1d7f155bbdca0062397743db8dce3e;p=m_librarian.git

diff --git a/setup.py b/setup.py
index a946250..9f9614d 100755
--- a/setup.py
+++ b/setup.py
@@ -3,11 +3,6 @@
 from imp import load_source
 from os.path import abspath, dirname, join
 
-try:
-    from ez_setup import use_setuptools
-    use_setuptools()
-except ImportError:
-    pass
 try:
     from setuptools import setup
     is_setuptools = True
@@ -17,22 +12,26 @@ except ImportError:
 
 kw = {}
 if is_setuptools:
-    kw['install_requires'] = ['SQLObject>=2.2.1', 'm_lib>=2.0']
+    kw['python_requires'] = '>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*'
+    kw['install_requires'] = ['m_lib.defenc>=1.0']
+    kw['extras_require'] = {
+        'm_lib': ['m_lib>=3.1'],
+        'pbar': ['m_lib>=3.1'],
+    }
 
 versionpath = join(abspath(dirname(__file__)), 'm_librarian', '__version__.py')
-load_source('m_librarian_version', versionpath)
-from m_librarian_version import __version__
+m_librarian_version = load_source('m_librarian_version', versionpath)
 
 setup(name='m_librarian',
-      version=__version__,
+      version=m_librarian_version.__version__,
       description='m_Librarian for LibRusEc/Flibusta libraries',
       long_description=open('README.txt', 'rtU').read(),
       author='Oleg Broytman',
       author_email='phd@phdru.name',
       url='http://phdru.name/Software/Python/m_librarian/',
       license='GPL',
-      platforms=['POSIX'],
       keywords=['books', 'library', 'Flibusta', 'LibRusEc', 'lib.rus.ec'],
+      platforms="Any",
       classifiers=[
           'Development Status :: 2 - Pre-Alpha',
           'Environment :: Console',
@@ -43,10 +42,17 @@ setup(name='m_librarian',
           'Operating System :: POSIX',
           'Programming Language :: Python :: 2',
           'Programming Language :: Python :: 2.7',
-          'Programming Language :: Python :: 2 :: Only',
+          'Programming Language :: Python :: 3',
+          'Programming Language :: Python :: 3.4',
+          'Programming Language :: Python :: 3.5',
+          'Programming Language :: Python :: 3.6',
       ],
       packages=['m_librarian'],
-      package_data={'m_librarian': ['glst/*.txt', 'glst/genres_*.glst']},
+      package_data={'m_librarian': [
+          'glst/*.txt', 'glst/genres_*.glst',
+          'translations/*.mo'
+          ]
+      },
       scripts=['scripts/ml-import.py', 'scripts/ml-initdb.py',
                'scripts/ml-search.py'],
       **kw