X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=setup.py;h=083617bc99f5adafda81e31a32b58ea4dba000af;hb=846a57b4391aaf0fb82b176c4b5ace204ce67215;hp=fd400eda1f87dc53d3381c9a6f17290722627af6;hpb=82b2d39d697f1f98b00a6eb343ef76a313982a83;p=m_lib.git

diff --git a/setup.py b/setup.py
index fd400ed..083617b 100755
--- a/setup.py
+++ b/setup.py
@@ -1,29 +1,22 @@
 #! /usr/bin/env python
 
-try:
-    from setuptools import setup
-    is_setuptools = True
-except ImportError:
-    from distutils.core import setup
-    is_setuptools = False
+from setuptools import setup
 
-kw = {}
-if is_setuptools:
-    kw['extras_require'] = {
-        'Metakit': ['Mk4py'],
-        'ZODB': ['ZODB'],
-        'mx': ['mx.DateTime', 'mx.Misc'],
-        }
-
-setup(name = "m_lib",
-    version = "3.0.2",
+setup(
+    name = "m_lib",
+    version = "3.1.0",
     description = "Broytman Library for Python",
-    long_description = "Broytman Library for Python, Copyright (C) 1996-2016 PhiloSoft Design",
+    long_description = "Broytman Library for Python, Copyright (C) 1996-2018 PhiloSoft Design",
+    long_description_content_type="text/plain",
     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.org/project/m_lib/',
+        'Git repo': 'http://git.phdru.name/m_lib.git/',
+    },
     license = "GPL",
-    keywords=[''],
     classifiers=[
         'Development Status :: 5 - Production/Stable',
         'Intended Audience :: Developers',
@@ -34,14 +27,22 @@ setup(name = "m_lib",
         '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 = "All",
+    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'],
+    },
 )