Move hard requirements from tox.ini to requirements.txt

[m_librarian.git] / setup.py

diff --git a/setup.py b/setup.py
index ad9062701c3ca1ef7fa8e9c90dfa9c77627a9759..259c9298a0f75686083c6a8304c4c2b79b688b6d 100755 (executable)
--- 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,7 +12,7 @@ except ImportError:
 
 kw = {}
 if is_setuptools:
-    kw['install_requires'] = ['SQLObject>=2.2.1', 'm_lib>=2.0']
+    kw['install_requires'] = ['SQLObject>=2.2.1', 'm_lib.defenc>=1.0']
 
 versionpath = join(abspath(dirname(__file__)), 'm_librarian', '__version__.py')
 load_source('m_librarian_version', versionpath)
@@ -44,7 +39,8 @@ 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',
       ],
       packages=['m_librarian'],
       package_data={'m_librarian': [