Switch branch before setting umask

[m_lib.git] / setup.py

diff --git a/setup.py b/setup.py
index d9f45a7a79f7c45cb0621447e1e75ade7e33aa50..4b66dbf6f3cec86e5e07fe3d1be64b9850aedf51 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -1,9 +1,24 @@
 #! /usr/bin/env python
 
-from distutils.core import setup
+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'],
+        }
 
 setup(name = "m_lib",
-    version = "2.0",
+    version = "2.1.1",
     description = "Broytman Library for Python",
     long_description = "Broytman Library for Python, Copyright (C) 1996-2013 PhiloSoft Design",
     author = "Oleg Broytman",
@@ -11,14 +26,10 @@ setup(name = "m_lib",
     url = "http://phdru.name/Software/Python/#m_lib",
     license = "GPL",
     platforms = "All",
-    packages = ["m_lib", "m_lib.clock", "m_lib.flad", "m_lib.flad.test",
-        "m_lib.hash", "m_lib.hash.test", "m_lib.lazy",
+    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.pbar.test", "m_lib.rus",
+        "m_lib.pbar", "m_lib.rus",
     ],
-    data_files = [("%s/m_lib/flad/test" % python_lib, [
-        "m_lib/flad/test/test.cfg",
-        "m_lib/flad/test/test.txt",
-        "m_lib/flad/test/comment.txt",
-    ])]
+    **kw
 )