setup: loosen the requirements -- you need argparse and pyutil only if you want the...

[tahoe-lafs/zfec.git] / zfec / setup.py

diff --git a/zfec/setup.py b/zfec/setup.py
index 3936694b8960376b8358154cb6ecd48f8b547951..a83f5b23fa6d0ce0d11b6d30c79a119c91fbaab1 100755 (executable)
--- a/zfec/setup.py
+++ b/zfec/setup.py
@@ -19,7 +19,7 @@ except ImportError:
     pass
 else:
     # On cygwin there was a permissions error that was fixed in 0.6c6.
-    use_setuptools(min_version='0.6c6', download_delay=0, to_dir=miscdeps)
+    use_setuptools(min_version='0.6c10', download_delay=0, to_dir=miscdeps)
 
 from setuptools import Extension, find_packages, setup
 
@@ -131,6 +131,10 @@ data_fnames=[ 'COPYING.GPL', 'changelog', 'COPYING.TGPPL.html', 'TODO', 'README.
 doc_loc = "share/doc/python-" + PKG
 data_files = [(doc_loc, data_fnames)]
 
+extras_require = {
+    'command_line_tools': ["argparse >= 0.8", "pyutil >= 1.3.19"]
+    }
+
 def _setup(test_suite):
     setup(name=PKG,
           version=verstr,
@@ -141,7 +145,7 @@ def _setup(test_suite):
           url='http://allmydata.org/trac/'+PKG,
           license='GNU GPL',
           dependency_links=dependency_links,
-          install_requires=["argparse >= 0.8", "pyutil >= 1.3.19"],
+          extras_require=extras_require,
           tests_require=["pyutil >= 1.3.19"],
           packages=find_packages(),
           include_package_data=True,
@@ -157,7 +161,7 @@ def _setup(test_suite):
 test_suite_name=PKG+".test"
 try:
     _setup(test_suite=test_suite_name)
-except BaseException, le:
+except Exception, le:
     # to work around a bug in Elisa v0.3.5
     # https://bugs.launchpad.net/elisa/+bug/263697
     if "test_suite must be a list" in str(le):