From: zooko Date: Sat, 19 Jan 2008 03:23:36 +0000 (+0530) Subject: setup: use my own hacked version of ez_setup, which installs setuptools (if necessary... X-Git-Url: https://git.rkrishnan.org/pf/content/en/frontends/status?a=commitdiff_plain;h=f54e2749ee4cac85321635d4ae10754d070909f6;p=tahoe-lafs%2Fzfec.git setup: use my own hacked version of ez_setup, which installs setuptools (if necessary) from misc/dependencies/setuptools-0.6c7.egg darcs-hash:8c72a215f3cd768525f24ac74e91a56fb68c5629 --- diff --git a/zfec/ez_setup.py b/zfec/ez_setup.py index 6dd60f9..537a450 100755 --- a/zfec/ez_setup.py +++ b/zfec/ez_setup.py @@ -15,12 +15,10 @@ This file can also be run as a script to install or upgrade setuptools. """ import os, sys DEFAULT_VERSION = "0.6c7" -DEFAULT_URL = "http://pypi.python.org/packages/%s/s/setuptools/" % sys.version[:3] +DEFAULT_URL = "file:misc/dependencies/" md5_data = { - 'setuptools-0.6c7-py2.3.egg': '209fdf9adc3a615e5115b725658e13e2', - 'setuptools-0.6c7-py2.4.egg': '5a8f954807d46a0fb67cf1f26c55a82e', - 'setuptools-0.6c7-py2.5.egg': '45d2ad28f9750e7434111fde831e8372', + 'setuptools-0.6c7.egg': 'ab87e88b800ad71d5235826b37acdbb1', } def _validate_md5(egg_name, data): @@ -130,7 +128,7 @@ def download_setuptools( `delay` is the number of seconds to pause before an actual download attempt. """ import urllib2, shutil - egg_name = "setuptools-%s-py%s.egg" % (version,sys.version[:3]) + egg_name = "setuptools-%s.egg" % (version,) url = download_base + egg_name saveto = os.path.join(to_dir, egg_name) src = dst = None diff --git a/zfec/setup.py b/zfec/setup.py index 8a70892..5895d89 100755 --- a/zfec/setup.py +++ b/zfec/setup.py @@ -18,12 +18,8 @@ try: except ImportError: pass else: - if 'cygwin' in sys.platform.lower(): - min_version='0.6c6' - else: - min_version='0.6a9' - download_base = "file:"+os.path.join('misc', 'dependencies')+os.path.sep - use_setuptools(min_version=min_version, download_delay=0, download_base=download_base, to_dir=miscdeps) + # On cygwin there was a permissions error that was fixed in 0.6c6. + use_setuptools(min_version='0.6c6', download_delay=0, to_dir=miscdeps) from setuptools import Extension, find_packages, setup