Add support for Python 3.5 and 3.6

[m_librarian.git] / setup.py

diff --git a/setup.py b/setup.py
index 9417ce487c86dbfd1e28cc4e1885f7f5858ea55d..dc076b26c5e10cb1952d0e60cc8bc50370fe1c7b 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -3,21 +3,10 @@
 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
 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)
@@ -46,6 +35,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': [
@@ -55,5 +46,4 @@ setup(name='m_librarian',
       },
       scripts=['scripts/ml-import.py', 'scripts/ml-initdb.py',
                'scripts/ml-search.py'],
-      **kw
       )