From: Zooko O'Whielacronx Date: Wed, 26 Mar 2008 19:13:02 +0000 (-0700) Subject: setup: require setuptools >= v0.6c8 X-Git-Url: https://git.rkrishnan.org/pf/content/en/service/rgr-080307.php?a=commitdiff_plain;h=d7cf033049628e96cc3e26a09c2f5de1103b2c75;p=tahoe-lafs%2Ftahoe-lafs.git setup: require setuptools >= v0.6c8 --- diff --git a/ez_setup.py b/ez_setup.py index b964e717..e050dcd7 100644 --- a/ez_setup.py +++ b/ez_setup.py @@ -14,12 +14,12 @@ the appropriate options to ``use_setuptools()``. This file can also be run as a script to install or upgrade setuptools. """ import os, sys -DEFAULT_VERSION = "0.6c7" +DEFAULT_VERSION = "0.6c8" DEFAULT_DIR = "misc/dependencies/" DEFAULT_URL = "file:"+DEFAULT_DIR md5_data = { - 'setuptools-0.6c7.egg': 'bd04f1074b86a1b35618cb2b96b38ffa', + 'setuptools-0.6c8.egg': '0f52a78daffb0efaa02e870bbbbca2fe', } import sys, os diff --git a/setup.py b/setup.py index 2af89ce9..0926c379 100644 --- a/setup.py +++ b/setup.py @@ -15,11 +15,14 @@ try: except ImportError: pass else: - # On cygwin there was a permissions error that was fixed in 0.6c6. (Also - # foolscap uses a module-level os.urandom() during import, which breaks - # inside older setuptools' sandboxing. 0.6c4 is the first version which - # fixed this problem.) - use_setuptools(min_version='0.6c6') + # This invokes our own customized version of ez_setup.py to make sure that + # setuptools >= v0.6c8 (a.k.a. v0.6-final) is installed. + + # setuptools < v0.6c8 doesn't handle eggs which get installed into the CWD + # as a result of being transitively depended on in a setup_requires, but + # then are needed for the installed code to run, i.e. in an + # install_requires. + use_setuptools(download_delay=0, min_version="0.6c8") from setuptools import Extension, find_packages, setup