From: zooko Date: Wed, 17 Jun 2009 18:05:21 +0000 (+0530) Subject: setup: raise setuptools version requirement to 0.6c9 on all platforms (0.6c6 had... X-Git-Url: https://git.rkrishnan.org/?a=commitdiff_plain;h=371b3dab3c7660282e370d77516f4d651ddb7f0e;hp=8c49a759889893cd452f2822f075ca2fe3e43bf5;p=tahoe-lafs%2Fzfec.git setup: raise setuptools version requirement to 0.6c9 on all platforms (0.6c6 had that problem with multiple overlapping dependencies on pyutil, on Ubuntu) Ignore-this: 44f27ecb2c593fb1589c43ed5de77bca darcs-hash:612efe9e3db38629223324c28537bc24a262ff4e --- diff --git a/zfec/setup.py b/zfec/setup.py index 938ca2a..4142af2 100755 --- a/zfec/setup.py +++ b/zfec/setup.py @@ -18,16 +18,12 @@ try: except ImportError: pass else: - if sys.platform.lower().startswith('win'): - # 0.6c7 on Windows 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. - min_version='0.6c9' - else: - min_version='0.6c6' - use_setuptools(min_version=min_version, 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. + use_setuptools(min_version='0.6c9', download_delay=0, to_dir=miscdeps) from setuptools import Extension, find_packages, setup