From: Zooko O'Whielacronx Date: Thu, 10 Jan 2008 20:58:00 +0000 (-0700) Subject: setup: remove the hack to determine if we can avoid the explicit setuptools-managed... X-Git-Url: https://git.rkrishnan.org/Site?a=commitdiff_plain;h=3e22dbb3bc48f698453582abd0e7766b2709c513;p=tahoe-lafs%2Ftahoe-lafs.git setup: remove the hack to determine if we can avoid the explicit setuptools-managed dependency on nevow (which was useful for building on dapper) For simplicity, and to avoid weird failure modes that result from importing nevow during the build process, we now simply require nevow >= 0.6.0. We currently bundle in misc/dependencies nevow v0.9.18, which will not work on Dapper, since it requires Twisted >= 2.4.0, and Dapper comes with Twisted 2.2.0. Dapper users can (a) install a newer Twisted, (b) install nevow 0.6.0 in egg form so that setuptools can tell that it is installed (without importing it), (c) beg us to start shipping nevow 0.6.0 instead of nevow 0.9.18 in our bundle. --- diff --git a/calcdeps.py b/calcdeps.py index 282e8cb2..81fb148d 100644 --- a/calcdeps.py +++ b/calcdeps.py @@ -16,34 +16,6 @@ install_requires=["zfec >= 1.3.0", "zope.interface >= 3.1.0", ] -nevow_version = None -try: - import nevow - nevow_version = nevow.__version__ -except ImportError: - pass - -# We also require zope.interface, but some older versions of setuptools such -# as setuptools v0.6a9 don't handle the "." in its name correctly, and anyway -# people have to manually install Twisted before using our automatic -# dependency resolution, and they have to manually install zope.interface in -# order to install Twisted. - -# Ubuntu Dapper includes nevow-0.6.0 and twisted-2.2.0, both of which work. -# However, setuptools doesn't know about them, so our install_requires= -# dependency upon nevow causes our 'build-auto-deps' step to try and build the -# latest version (nevow-0.9.18), which *doesn't* work with twisted-2.2.0 . To -# work around this, remove nevow from our dependency list if we detect that -# we've got nevow-0.6.0 installed. This will allow build-auto-deps (and everything -# else) to work on dapper systems that have the python-nevow package -# installed, and shouldn't hurt any other systems. Dapper systems *without* -# python-nevow will try to build it (and will fail unless they also have a -# newer version of Twisted installed). - -if nevow_version != "0.6.0": - install_requires.append("nevow >= 0.6.0") - - if __name__ == '__main__': print "install_requires:" for ir in install_requires: