X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=setup.py;h=856dd50fa53e38ca065b65c33c426e079970f28a;hb=b85b6bac3e3a786e818243d32099146bed05d163;hp=1ad4af1fb46caab7ed462c72eaf2fb171b252fbc;hpb=cc3ac621eb776cc8d2e46009c7f9af1f81ce6107;p=m_lib.git

diff --git a/setup.py b/setup.py
index 1ad4af1..856dd50 100755
--- a/setup.py
+++ b/setup.py
@@ -1,35 +1,46 @@
 #! /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
-
-kw = {}
-if is_setuptools:
-    kw['extras_require'] = {
-        'Metakit': ['Mk4py'],
-        'ZODB': ['ZODB'],
-        'mx': ['mx.DateTime', 'mx.Misc'],
-        }
+from setuptools import setup
 
 setup(name = "m_lib",
-    version = "2.1.0",
+    version = "3.1.0",
     description = "Broytman Library for Python",
-    long_description = "Broytman Library for Python, Copyright (C) 1996-2013 PhiloSoft Design",
+    long_description = "Broytman Library for Python, Copyright (C) 1996-2018 PhiloSoft Design",
     author = "Oleg Broytman",
     author_email = "phd@phdru.name",
     url = "http://phdru.name/Software/Python/#m_lib",
+    project_urls={
+        'Homepage': 'http://phdru.name/Software/Python/#m_lib',
+        'Download': 'https://pypi.python.org/pypi/m_lib',
+        'Git repo': 'http://git.phdru.name/m_lib.git/',
+    },
     license = "GPL",
-    platforms = "All",
+    classifiers=[
+        'Development Status :: 5 - Production/Stable',
+        'Intended Audience :: Developers',
+        'License :: OSI Approved :: GNU General Public License (GPL)',
+        'Operating System :: OS Independent',
+        'Programming Language :: Python :: 2',
+        'Programming Language :: Python :: 2.6',
+        'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
+        'Topic :: Software Development :: Libraries',
+        'Topic :: Software Development :: Libraries :: Python Modules',
+    ],
+    platforms = "Any",
     packages = ["m_lib", "m_lib.clock", "m_lib.flad",
         "m_lib.hash", "m_lib.lazy",
         "m_lib.net", "m_lib.net.ftp", "m_lib.net.www",
         "m_lib.pbar", "m_lib.rus",
     ],
-    **kw
+    namespace_packages = ["m_lib"],
+    python_requires='>=2.6, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*',
+    extras_require={
+        'Metakit': ['Mk4py'],
+        'ZODB': ['ZODB'],
+        'mx': ['mx.DateTime', 'mx.Misc'],
+    },
 )