Changeset 49591

Show
Ignore:
Timestamp:
10/16/06 11:37:59 (2 years ago)
Author:
bdelbosc
Message:

upgrade to setuptool 0.6c3

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • funkload/trunk/ez_setup.py

    r34831 r49591  
    1515""" 
    1616import sys 
    17 DEFAULT_VERSION = "0.6a11" 
     17DEFAULT_VERSION = "0.6c3" 
    1818DEFAULT_URL     = "http://cheeseshop.python.org/packages/%s/s/setuptools/" % sys.version[:3] 
    1919 
    2020md5_data = { 
    21     'setuptools-0.6a1-py2.3.egg': 'ee819a13b924d9696b0d6ca6d1c5833d', 
    22     'setuptools-0.6a1-py2.4.egg': '8256b5f1cd9e348ea6877b5ddd56257d', 
    23     'setuptools-0.6a10-py2.3.egg': '162d8357f1aff2b0349c6c247ee62987', 
    24     'setuptools-0.6a10-py2.4.egg': '803a2d8db501c1ac3b5b6fb4e907f788', 
    25     'setuptools-0.6a11-py2.3.egg': 'd12bf8e13aaeb25c91350c8d77f01a71', 
    26     'setuptools-0.6a11-py2.4.egg': 'a95d5bc7a070aa1028bc4dcb5270b133', 
    27     'setuptools-0.6a11dev_r43177-py2.3.egg': '068ef7c8522539af12f5fb14b4a8cf21', 
    28     'setuptools-0.6a11dev_r43295-py2.3.egg': 'eb78390e6beac3694342b5629cc6653f', 
    29     'setuptools-0.6a11dev_r43403-py2.3.egg': 'ba1a6b00f5c1fdd482284a7df3d8bd19', 
    30     'setuptools-0.6a11dev_r43417-py2.3.egg': 'c6014183afd9fd167d7d82eee78db2c6', 
    31     'setuptools-0.6a2-py2.3.egg': 'b98da449da411267c37a738f0ab625ba', 
    32     'setuptools-0.6a2-py2.4.egg': 'be5b88bc30aed63fdefd2683be135c3b', 
    33     'setuptools-0.6a3-py2.3.egg': 'ee0e325de78f23aab79d33106dc2a8c8', 
    34     'setuptools-0.6a3-py2.4.egg': 'd95453d525a456d6c23e7a5eea89a063', 
    35     'setuptools-0.6a4-py2.3.egg': 'e958cbed4623bbf47dd1f268b99d7784', 
    36     'setuptools-0.6a4-py2.4.egg': '7f33c3ac2ef1296f0ab4fac1de4767d8', 
    37     'setuptools-0.6a5-py2.3.egg': '748408389c49bcd2d84f6ae0b01695b1', 
    38     'setuptools-0.6a5-py2.4.egg': '999bacde623f4284bfb3ea77941d2627', 
    39     'setuptools-0.6a6-py2.3.egg': '7858139f06ed0600b0d9383f36aca24c', 
    40     'setuptools-0.6a6-py2.4.egg': 'c10d20d29acebce0dc76219dc578d058', 
    41     'setuptools-0.6a7-py2.3.egg': 'cfc4125ddb95c07f9500adc5d6abef6f', 
    42     'setuptools-0.6a7-py2.4.egg': 'c6d62dab4461f71aed943caea89e6f20', 
    43     'setuptools-0.6a8-py2.3.egg': '2f18eaaa3f544f5543ead4a68f3b2e1a', 
    44     'setuptools-0.6a8-py2.4.egg': '799018f2894f14c9f8bcb2b34e69b391', 
    45     'setuptools-0.6a9-py2.3.egg': '8e438ad70438b07b0d8f82cae42b278f', 
    46     'setuptools-0.6a9-py2.4.egg': '8f6e01fc12fb1cd006dc0d6c04327ec1', 
     21    'setuptools-0.6b1-py2.3.egg': '8822caf901250d848b996b7f25c6e6ca', 
     22    'setuptools-0.6b1-py2.4.egg': 'b79a8a403e4502fbb85ee3f1941735cb', 
     23    'setuptools-0.6b2-py2.3.egg': '5657759d8a6d8fc44070a9d07272d99b', 
     24    'setuptools-0.6b2-py2.4.egg': '4996a8d169d2be661fa32a6e52e4f82a', 
     25    'setuptools-0.6b3-py2.3.egg': 'bb31c0fc7399a63579975cad9f5a0618', 
     26    'setuptools-0.6b3-py2.4.egg': '38a8c6b3d6ecd22247f179f7da669fac', 
     27    'setuptools-0.6b4-py2.3.egg': '62045a24ed4e1ebc77fe039aa4e6f7e5', 
     28    'setuptools-0.6b4-py2.4.egg': '4cb2a185d228dacffb2d17f103b3b1c4', 
     29    'setuptools-0.6c1-py2.3.egg': 'b3f2b5539d65cb7f74ad79127f1a908c', 
     30    'setuptools-0.6c1-py2.4.egg': 'b45adeda0667d2d2ffe14009364f2a4b', 
     31    'setuptools-0.6c2-py2.3.egg': 'f0064bf6aa2b7d0f3ba0b43f20817c27', 
     32    'setuptools-0.6c2-py2.4.egg': '616192eec35f47e8ea16cd6a122b7277', 
     33    'setuptools-0.6c3-py2.3.egg': 'f181fa125dfe85a259c9cd6f1d7b78fa', 
     34    'setuptools-0.6c3-py2.4.egg': 'e0ed74682c998bfb73bf803a50e7b71e', 
     35    'setuptools-0.6c3-py2.5.egg': 'abef16fdd61955514841c7c6bd98965e', 
    4736} 
    4837 
    …… 
    5948            ) 
    6049            sys.exit(2) 
    61     return data     
     50    return data 
    6251 
    6352 
    …… 
    7564    should one be required.  If an older version of setuptools is installed, 
    7665    this routine will print a message to ``sys.stderr`` and raise SystemExit in 
    77     an attempt to abort the calling script.   
     66    an attempt to abort the calling script. 
    7867    """ 
    7968    try: 
    …… 
    9483        pkg_resources.require("setuptools>="+version) 
    9584 
    96     except pkg_resources.VersionConflict: 
     85    except pkg_resources.VersionConflict, e: 
    9786        # XXX could we install in a subprocess here? 
    9887        print >>sys.stderr, ( 
    9988            "The required version of setuptools (>=%s) is not available, and\n" 
    10089            "can't be installed while this script is running. Please install\n" 
    101             " a more recent version first." 
    102         ) % version 
     90            " a more recent version first.\n\n(Currently using %r)" 
     91        ) % (version, e.args[0]) 
    10392        sys.exit(2) 
    10493 
    …… 
    156145        import setuptools 
    157146    except ImportError: 
    158         import tempfile, shutil 
    159         tmpdir = tempfile.mkdtemp(prefix="easy_install-") 
     147        egg = None 
    160148        try: 
    161             egg = download_setuptools(version, to_dir=tmpdir, delay=0) 
     149            egg = download_setuptools(version, delay=0) 
    162150            sys.path.insert(0,egg) 
    163151            from setuptools.command.easy_install import main 
    164             main(list(argv)+[egg]) 
     152            return main(list(argv)+[egg])   # we're done here 
    165153        finally: 
    166             shutil.rmtree(tmpdir) 
     154            if egg and os.path.exists(egg): 
     155                os.unlink(egg) 
    167156    else: 
    168157        if setuptools.__version__ == '0.0.1': 
    …… 
    190179 
    191180 
    192              
     181 
    193182def update_md5(filenames): 
    194183    """Update our built-in md5 registry""" 
    …… 
    199188    for name in filenames: 
    200189        base = os.path.basename(name) 
    201         f = open(name,'rb')        
     190        f = open(name,'rb') 
    202191        md5_data[base] = md5(f.read()).hexdigest() 
    203192        f.close()