setup: undo the recent change to make argparse and pyutil required only for building...

Ignore-this: 47a4604cde20c159be18f7c906c81b8f
It breaks the current release of stdeb, and also it looks like we might be able to get argparse and pyutil into Debian, and a version of zfec without its command-line tools wouldn't be nearly as generally useful.

darcs-hash:04ac3c650749cdb3a636d49e07ee1e7633280e07

diff --git a/zfec/setup.py b/zfec/setup.py
index 98adc6274bc14769d79c252cbfed97ebdf4e00a4..84bdb2d0cfa5f5c748b8b87d8dfde1c2152396d6 100755 (executable)
--- a/zfec/setup.py
+++ b/zfec/setup.py
@@ -131,10 +131,6 @@ 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,
@@ -145,7 +141,7 @@ def _setup(test_suite):
           url='http://allmydata.org/trac/'+PKG,
           license='GNU GPL',
           dependency_links=dependency_links,
-          extras_require=extras_require,
+          install_requires=["argparse >= 0.8", "pyutil >= 1.3.19"],
           tests_require=["pyutil >= 1.3.19"],
           packages=find_packages(),
           include_package_data=True,