X-Git-Url: https://git.phdru.name/?p=mimedecode.git;a=blobdiff_plain;f=setup.py;h=c2c0d30c02e69e87706164cc9c332ba8fc8f7664;hp=e4f9a5fcc9d531caad4f386a28d00bbff94aca0a;hb=972bae8625e655e34170c588561eed078ceb37d9;hpb=2bd28759a77b4763a69d7f6dc770eb25937e72d5

diff --git a/setup.py b/setup.py
index e4f9a5f..c2c0d30 100755
--- a/setup.py
+++ b/setup.py
@@ -1,8 +1,6 @@
 #! /usr/bin/env python
 
 try:
-    from ez_setup import use_setuptools
-    use_setuptools()
     from setuptools import setup
     is_setuptools = True
 except ImportError:
@@ -11,25 +9,38 @@ except ImportError:
 
 kw = {}
 if is_setuptools:
-    kw['setup_requires'] = ['m_lib']
-    kw['install_requires'] = ['m_lib']
-    kw['dependency_links'] = [
-        'http://phdru.name/Software/Python/#egg=m_lib',
-        'git+http://git.phdru.name/m_lib.git#egg=m_lib',
-    ]
+    kw['install_requires'] = ['m_lib.defenc>=1.0']
+    kw['tests_require'] = ['m_lib>=3.1']
 
 from mimedecode_version import __version__, __copyright__, __license__
 
-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 :: 2 :: Only',
+        '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
 )