whitespace, docstrings, copyright statements

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

diff --git a/zfec/setup.py b/zfec/setup.py
index b2f047409ed6a86c1eff26aa4f1eb6c1a635db9e..21e9739a256fef9ad28614f958e6d4856e81f03a 100755 (executable)
--- a/zfec/setup.py
+++ b/zfec/setup.py
@@ -1,10 +1,10 @@
 #!/usr/bin/env python
 
 # zfec -- fast forward error correction library with Python interface
-# 
-# Copyright (C) 2007-2008 Allmydata, Inc.
+#
+# Copyright (C) 2007-2010 Allmydata, Inc.
 # Author: Zooko Wilcox-O'Hearn
-# 
+#
 # This file is part of zfec.
 #
 # See README.txt for licensing information.
@@ -18,8 +18,17 @@ 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)
+    # 0.6c7 on Windows and 0.6c6 on Ubuntu 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.
+    # On cygwin there was a conflict with swig with setuptools 0.6c7:
+    #   File "/home/Buildslave/windows-cygwin-pycryptopp/windows-cygwin/build/misc/dependencies/setuptools-0.6c7.egg/setuptools/command/build_ext.py", line 77, in swig_sources
+    # TypeError: swig_sources() takes exactly 3 arguments (2 given)
+    # If there isn't a setuptools already installed, then this will install
+    # setuptools v0.6c12dev (which is our own toothpick of setuptools).
+    use_setuptools(download_delay=0, min_version="0.6c12dev")
 
 from setuptools import Extension, find_packages, setup
 
@@ -54,10 +63,10 @@ if DEBUGMODE:
 trove_classifiers=[
     "Development Status :: 5 - Production/Stable",
     "Environment :: Console",
-    "License :: OSI Approved :: GNU General Public License (GPL)", 
+    "License :: OSI Approved :: GNU General Public License (GPL)",
     "License :: DFSG approved",
     "License :: Other/Proprietary License",
-    "Intended Audience :: Developers", 
+    "Intended Audience :: Developers",
     "Intended Audience :: End Users/Desktop",
     "Intended Audience :: System Administrators",
     "Operating System :: Microsoft",
@@ -67,9 +76,9 @@ trove_classifiers=[
     "Operating System :: POSIX",
     "Operating System :: MacOS :: MacOS X",
     "Operating System :: Microsoft :: Windows :: Windows NT/2000",
-    "Operating System :: OS Independent", 
-    "Natural Language :: English", 
-    "Programming Language :: C", 
+    "Operating System :: OS Independent",
+    "Natural Language :: English",
+    "Programming Language :: C",
     "Programming Language :: Python", 
     "Programming Language :: Python :: 2",
     "Programming Language :: Python :: 2.4",
@@ -80,9 +89,9 @@ trove_classifiers=[
     "Topic :: System :: Distributed Computing",
     "Topic :: Software Development :: Libraries",
     "Topic :: Communications :: Usenet News",
-    "Topic :: System :: Archiving :: Backup", 
-    "Topic :: System :: Archiving :: Mirroring", 
-    "Topic :: System :: Archiving", 
+    "Topic :: System :: Archiving :: Backup",
+    "Topic :: System :: Archiving :: Mirroring",
+    "Topic :: System :: Archiving",
     ]
 
 PKG = "zfec"
@@ -124,11 +133,15 @@ 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
-# docs in "share/doc/python-$PKG".
-doc_loc = "share/doc/python-" + PKG
+# docs in "share/doc/$PKG".
+doc_loc = "share/doc/" + PKG
 data_files = [(doc_loc, data_fnames)]
 
 def _setup(test_suite):