From: zooko <zooko@zooko.com> Date: Sat, 22 Dec 2007 04:40:51 +0000 (+0530) Subject: zfec: setup: use setuptools egg in-place in misc/dependencies, and automatically... X-Git-Url: https://git.rkrishnan.org/%5B/%5D%20/uri/frontends/%22doc.html/status?a=commitdiff_plain;h=f876223aaffff66d10fb87bdcc0fb222c8c2b35f;p=tahoe-lafs%2Fzfec.git zfec: setup: use setuptools egg in-place in misc/dependencies, and automatically discover dependencies bundled into misc/dependencies darcs-hash:1614ef177b5ed2fb6a1c95e314c76b825b77789a --- diff --git a/zfec/misc/dependencies/setuptools-0.6c7-py2.5.egg b/zfec/misc/dependencies/setuptools-0.6c7-py2.5.egg new file mode 100755 index 0000000..f1c81d8 Binary files /dev/null and b/zfec/misc/dependencies/setuptools-0.6c7-py2.5.egg differ diff --git a/zfec/setup.py b/zfec/setup.py index a7cccf3..3064160 100755 --- a/zfec/setup.py +++ b/zfec/setup.py @@ -9,7 +9,9 @@ # # See README.txt for licensing information. -import sys +import os, re, sys + +miscdeps=os.path.join('misc', 'dependencies') try: from ez_setup import use_setuptools @@ -20,7 +22,8 @@ else: min_version='0.6c6' else: min_version='0.6a9' - use_setuptools(min_version=min_version, download_delay=0) + 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) from setuptools import Extension, find_packages, setup @@ -72,12 +75,10 @@ trove_classifiers=[ ] try: - import os (cin, cout, cerr,) = os.popen3("darcsver --quiet") print cout.read() except Exception, le: pass -import re VERSIONFILE = "zfec/_version.py" verstr = "unknown" VSRE = re.compile("^verstr = ['\"]([^'\"]*)['\"]", re.M) @@ -93,6 +94,8 @@ else: print "unable to find version in %s" % (VERSIONFILE,) raise RuntimeError("if %s.py exists, it is required to be well-formed" % (VERSIONFILE,)) +dependency_links=[os.path.join(miscdeps, t) for t in os.listdir(miscdeps) if t.endswith(".tar")] + setup(name='zfec', version=verstr, description='a fast erasure code with command-line, C, and Python interfaces', @@ -101,7 +104,8 @@ setup(name='zfec', author_email='zooko@zooko.com', url='http://allmydata.org/source/zfec', license='GNU GPL', - install_requires=["argparse >= 0.8", "pyutil >= 1.3.5",], + dependency_links=dependency_links, + install_requires=["argparse >= 0.8", "pyutil >= 1.3.5"], packages=find_packages(), include_package_data=True, setup_requires=['setuptools_darcs >= 1.1.0',], diff --git a/zfec/setuptools-0.6c7-py2.5.egg b/zfec/setuptools-0.6c7-py2.5.egg deleted file mode 100755 index f1c81d8..0000000 Binary files a/zfec/setuptools-0.6c7-py2.5.egg and /dev/null differ