X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=setup.py;h=4f5b083c82dde229649c5d185b17d54feb0996e4;hb=79295a9c468490cd2168a552c563b79838b98643;hp=f98336b3a7ea9b40d9d3bc0623527e26914db642;hpb=dcbe68b3f9fb23ef380346201cf4d8be8864c7fe;p=mimedecode.git

diff --git a/setup.py b/setup.py
index f98336b..4f5b083 100755
--- a/setup.py
+++ b/setup.py
@@ -1,30 +1,45 @@
 #! /usr/bin/env python
 
 try:
-    from ez_setup import use_setuptools
-    use_setuptools()
     from setuptools import setup
     is_setuptools = True
 except ImportError:
     from distutils.core import setup
     is_setuptools = False
 
+from mimedecode_version import __version__, __copyright__, __license__
+
 kw = {}
 if is_setuptools:
-    kw['install_requires'] = ['m_lib>=2.0']
-
-from mimedecode_version import __version__, __copyright__, __license__
+    kw['install_requires'] = ['m_lib.defenc>=1.0']
+    kw['tests_require'] = ['m_lib>=3.1']
 
-setup(name = "mimedecode",
-   version = __version__,
-   description = "A program to decode MIME messages",
-   long_description = "A program to decode MIME messages. " + __copyright__,
-   author = "Oleg Broytman",
-   author_email = "phd@phdru.name",
-   url = "http://phdru.name/Software/Python/#mimedecode",
-   license = __license__,
-   platforms = "All",
-   py_modules = ['mimedecode_version'],
-   scripts = ['mimedecode.py'],
-   **kw
+setup(
+    name="mimedecode",
+    version=__version__,
+    description="A program to decode MIME messages",
+    long_description="A program to decode MIME messages. " + __copyright__,
+    author="Oleg Broytman",
+    author_email="phd@phdru.name",
+    url="http://phdru.name/Software/Python/#mimedecode",
+    license=__license__,
+    keywords=['email', 'MIME'],
+    platforms="Any",
+    classifiers=[
+        'Development Status :: 5 - Production/Stable',
+        'Environment :: Console',
+        'Intended Audience :: End Users/Desktop',
+        'License :: OSI Approved :: GNU General Public License (GPL)',
+        'Operating System :: OS Independent',
+        'Programming Language :: Python :: 2',
+        'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.3',
+        'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
+    ],
+    py_modules=['formatparam_27', 'mimedecode_version'],
+    scripts=['mimedecode.py'],
+    **kw
 )