setup: upgrade the bundled copy of zetuptoolz from 0.6c10dev to 0.6c12dev and increas...

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

diff --git a/zfec/setup.py b/zfec/setup.py
index a8a2699128ba498eb7e9334a27b4cce46973f951..cda9ed0144fe360a77829e09c0c93346d6c6f996 100755 (executable)
--- a/zfec/setup.py
+++ b/zfec/setup.py
@@ -18,8 +18,18 @@ try:
 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)
+    # 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)
+    # This invokes our own customized version of ez_setup.py to make sure
+    # that setuptools v0.6c12dev (which is our own toothpick of setuptools)
+    # is used to build.
+    use_setuptools(download_delay=0, min_version="0.6c12dev")
 
 from setuptools import Extension, find_packages, setup
 
@@ -104,11 +114,19 @@ else:
 dependency_links=[os.path.join(miscdeps, t) for t in os.listdir(miscdeps) if t.endswith(".tar")]
 setup_requires = []
 
-# darcsver is needed only if you want "./setup.py darcsver" to write a new
-# version stamp in zfec/_version.py, with a version number derived from
-# darcs history.  http://pypi.python.org/pypi/darcsver
-if "darcsver" in sys.argv[1:]:
-    setup_requires.append('darcsver >= 1.0.0')
+# The darcsver command from the darcsver plugin is needed to initialize the
+# distribution's .version attribute correctly. (It does this either by
+# examining darcs history, or if that fails by reading the
+# zfec/_version.py file). darcsver will also write a new version
+# stamp in zfec/_version.py, with a version number derived from
+# darcs history. Note that the setup.cfg file has an "[aliases]" section
+# which enumerates commands that you might run and specifies that it will run
+# darcsver before each one. If you add different commands (or if I forgot
+# some that are already in use), you may need to add it to setup.cfg and
+# configure it to run darcsver before your command, if you want the version
+# number to be correct when that command runs.
+# http://pypi.python.org/pypi/darcsver
+setup_requires.append('darcsver >= 1.2.0')
 
 # setuptools_darcs is required to produce complete distributions (such as with
 # "sdist" or "bdist_egg"), unless there is a zfec.egg-info/SOURCE.txt file
@@ -116,11 +134,15 @@ if "darcsver" in sys.argv[1:]:
 # 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):
@@ -149,7 +171,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):