X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=setup.py;h=76e7f8dba9e5cac663eafebd45e2d6bc14e83652;hb=6939e690ec87f84951c0775e4bfb96121d6525a5;hp=5f8f84701322dc5be53a82e9ece219f8e39c7c08;hpb=6a06b351c7af9d290a81a35699b80a3ffdcfee93;p=m_librarian.git

diff --git a/setup.py b/setup.py
index 5f8f847..76e7f8d 100755
--- a/setup.py
+++ b/setup.py
@@ -1,37 +1,22 @@
 #!/usr/bin/env python
 
-import sys
 from imp import load_source
 from os.path import abspath, dirname, join
-
-try:
-    from setuptools import setup
-    is_setuptools = True
-except ImportError:
-    from distutils.core import setup
-    is_setuptools = False
-
-kw = {}
-if is_setuptools:
-    kw['install_requires'] = ['SQLObject>=2.2.1', 'm_lib.defenc>=1.0']
-    if (sys.version_info[:2] == (2, 6)):
-        kw['install_requires'].append('argparse')
+from setuptools import setup
 
 versionpath = join(abspath(dirname(__file__)), 'm_librarian', '__version__.py')
-load_source('m_librarian_version', versionpath)
-# Ignore: E402 module level import not at top of file
-from m_librarian_version import __version__  # noqa
+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',
@@ -44,6 +29,8 @@ setup(name='m_librarian',
           'Programming Language :: Python :: 2.7',
           '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': [
@@ -53,5 +40,10 @@ setup(name='m_librarian',
       },
       scripts=['scripts/ml-import.py', 'scripts/ml-initdb.py',
                'scripts/ml-search.py'],
-      **kw
+      python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*',
+      install_requires=['m_lib.defenc>=1.0'],
+      extras_require={
+          'm_lib': ['m_lib>=3.1'],
+          'pbar': ['m_lib>=3.1'],
+      },
       )