From: zooko Date: Mon, 17 Aug 2009 01:15:44 +0000 (+0530) Subject: setup: relax requirement on setuptools from >= 0.6c12dev to >= 0.6c8 X-Git-Url: https://git.rkrishnan.org/pf/content/%22file:/frontends/somewhere?a=commitdiff_plain;h=d92273a1f38a274a715867885d190cf2060c4d84;p=tahoe-lafs%2Fzfec.git setup: relax requirement on setuptools from >= 0.6c12dev to >= 0.6c8 Ignore-this: a4ae434ee99f36a307f2a3da4f126042 v0.6c12dev is our toothpick; v0.6c8 is the official setuptools that comes with Lenny and Hardy. There were some problems that were fixed by patches to our toothpick, but I'm hoping that those problems don't crop up on build machines which setuptools v0.6c8, and/or that those situations or machines where the problems do crop up already have our toothpick installed. I don't like making this sort of change without knowing exactly what problems we observed with what other versions of setuptools on what other systems, but on the other hand almost everything that we care about is now automatically tested by the buildbots, so if they go green after this patch I'll be fairly satisfied. (Note: the longer-term plan is to switch to Distribute, which has most of the same patches that our toothpick has, and which is official and supported to boot.) darcs-hash:8235f285acbe7db2239c837feccfc425c11fc591 --- diff --git a/zfec/setup.py b/zfec/setup.py index cda9ed0..926d132 100755 --- a/zfec/setup.py +++ b/zfec/setup.py @@ -2,7 +2,7 @@ # zfec -- fast forward error correction library with Python interface # -# Copyright (C) 2007-2008 Allmydata, Inc. +# Copyright (C) 2007-2009 Allmydata, Inc. # Author: Zooko Wilcox-O'Hearn # # This file is part of zfec. @@ -26,10 +26,9 @@ else: # 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") + # 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.6c8") from setuptools import Extension, find_packages, setup