From: Zooko O'Whielacronx <zooko@zooko.com>
Date: Mon, 31 Jan 2011 00:04:20 +0000 (-0800)
Subject: setup: comment out the setup_requires on setuptools_darcs in order to work-around... 
X-Git-Url: https://git.rkrishnan.org/pf/content/en/service?a=commitdiff_plain;h=2ed6019f78300254d95d5823e0e849604ac10fc9;p=tahoe-lafs%2Ftahoe-lafs.git

setup: comment out the setup_requires on setuptools_darcs in order to work-around distribute bug 55
Note that we still inject the setuptools_darcs egg at the beginning of setup.py, which makes the setuptools_darcs plugin work when building dists from tahoe-lafs source so those dists have all of the needed files.
http://bitbucket.org/tarek/distribute/issue/55/revision-control-plugin-automatically-installed-as-a-build-dependency-is-not-present-when-another-build-dependency-is-being
---

diff --git a/setup.py b/setup.py
index eaaf67a8..cbdc4d2b 100644
--- a/setup.py
+++ b/setup.py
@@ -145,10 +145,22 @@ setup_requires.append('Twisted >= 2.4.0')
 
 # setuptools_darcs is required to produce complete distributions (such
 # as with "sdist" or "bdist_egg"), unless there is a
-# src/allmydata_tahoe.egg-info/SOURCE.txt file, which if present
-# contains a complete list of files that should be included.
+# src/allmydata_tahoe.egg-info/SOURCE.txt file present which contains
+# a complete list of files that should be included.
+
 # http://pypi.python.org/pypi/setuptools_darcs
-setup_requires.append('setuptools_darcs >= 1.1.0')
+
+# However, requiring it runs afoul of a bug in Distribute, which was
+# shipped in Ubuntu Lucid, so for now you have to manually install it
+# before building sdists or eggs:
+# http://bitbucket.org/tarek/distribute/issue/55/revision-control-plugin-automatically-installed-as-a-build-dependency-is-not-present-when-another-build-dependency-is-being
+
+# Note that we explicitly inject setuptools_darcs at the beginning of
+# this setup.py file, so it is still in effect when building dists
+# using this setup.py file even when the following requirement is
+# disabled.
+if False:
+    setup_requires.append('setuptools_darcs >= 1.1.0')
 
 # trialcoverage is required if you want the "trial" unit test runner to have a
 # "--reporter=bwverbose-coverage" option which produces code-coverage results.