setup: require setuptools >= 0.6c9 on Windows, but >= 0.6c6 on other platforms

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

diff --git a/zfec/setup.py b/zfec/setup.py
index 98adc6274bc14769d79c252cbfed97ebdf4e00a4..938ca2a9b9df70036df47dbd2d61a5911acb9c2d 100755 (executable)
--- a/zfec/setup.py
+++ b/zfec/setup.py
@@ -18,8 +18,16 @@ try:
 except ImportError:
     pass
 else:
-    # On cygwin there was a permissions error that was fixed in 0.6c6.
-    use_setuptools(min_version='0.6c10', download_delay=0, to_dir=miscdeps)
+    if sys.platform.lower().startswith('win'):
+        # 0.6c7 on Windows had a problem with multiple overlapping dependencies
+        # on pyutil -- it would end up with the 'pyutil' key set in sys.modules
+        # but the actual code (and the temporary directory in the filesystem in
+        # which the code used to reside) gone, when it needed pyutil again
+        # later.
+        min_version='0.6c9'
+    else:
+        min_version='0.6c6'
+    use_setuptools(min_version=min_version, download_delay=0, to_dir=miscdeps)
 
 from setuptools import Extension, find_packages, setup
 
@@ -86,7 +94,7 @@ trove_classifiers=[
     ]
 
 PKG = "zfec"
-VERSIONFILE = PKG+"/_version.py"
+VERSIONFILE = os.path.join(PKG, "_version.py")
 verstr = "unknown"
 try:
     verstrline = open(VERSIONFILE, "rt").read()
@@ -124,6 +132,10 @@ setup_requires.append('darcsver >= 1.2.0')
 # http://pypi.python.org/pypi/setuptools_darcs
 setup_requires.append('setuptools_darcs >= 1.1.0')
 
+# stdeb is required to build Debian dsc files.
+if "sdist_dsc" in sys.argv:
+    setup_requires.append('stdeb')
+
 data_fnames=[ 'COPYING.GPL', 'changelog', 'COPYING.TGPPL.html', 'TODO', 'README.txt' ]
 
 # In case we are building for a .deb with stdeb's sdist_dsc command, we put the
@@ -131,10 +143,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 +153,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,