setup: merge two patches which both change VERSIONFILE name computation to the typica...

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

diff --git a/zfec/setup.py b/zfec/setup.py
index a8a2699128ba498eb7e9334a27b4cce46973f951..ef123dcf69e03a7fd642e47d94c19c9d0fb2b13d 100755 (executable)
--- a/zfec/setup.py
+++ b/zfec/setup.py
@@ -18,8 +18,7 @@ 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)
+    use_setuptools(min_version='0.6c9', download_delay=0, to_dir=miscdeps)
 
 from setuptools import Extension, find_packages, setup
 
@@ -104,11 +103,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
@@ -149,7 +156,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):