setup: bundle the latest zetuptoolz as unpacked source egg and change setup.py to...

[tahoe-lafs/zfec.git] / zfec / setup.py

diff --git a/zfec/setup.py b/zfec/setup.py
index 2fb9a4b85089756c13d5b880b8a2af4649cfbc10..fcd470e85991516e73fce8b93c452135c32a9966 100755 (executable)
--- a/zfec/setup.py
+++ b/zfec/setup.py
@@ -1,29 +1,19 @@
 #!/usr/bin/env python
 
 # zfec -- fast forward error correction library with Python interface
-# 
-# Copyright (C) 2007-2008 Allmydata, Inc.
+#
+# Copyright (C) 2007-2010 Allmydata, Inc.
 # Author: Zooko Wilcox-O'Hearn
-# 
+#
 # This file is part of zfec.
 #
 # See README.txt for licensing information.
 
-import os, re, sys
-
-miscdeps=os.path.join(os.getcwd(), 'misc', 'dependencies')
+import glob, os, re, sys
 
-try:
-    from ez_setup import use_setuptools
-except ImportError:
-    pass
-else:
-    # 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)
+egg = os.path.realpath(glob.glob('setuptools-*.egg')[0])
+sys.path.insert(0, egg)
+import setuptools; setuptools.bootstrap_install_from = egg
 
 from setuptools import Extension, find_packages, setup
 
@@ -58,10 +48,10 @@ if DEBUGMODE:
 trove_classifiers=[
     "Development Status :: 5 - Production/Stable",
     "Environment :: Console",
-    "License :: OSI Approved :: GNU General Public License (GPL)", 
+    "License :: OSI Approved :: GNU General Public License (GPL)",
     "License :: DFSG approved",
     "License :: Other/Proprietary License",
-    "Intended Audience :: Developers", 
+    "Intended Audience :: Developers",
     "Intended Audience :: End Users/Desktop",
     "Intended Audience :: System Administrators",
     "Operating System :: Microsoft",
@@ -71,9 +61,9 @@ trove_classifiers=[
     "Operating System :: POSIX",
     "Operating System :: MacOS :: MacOS X",
     "Operating System :: Microsoft :: Windows :: Windows NT/2000",
-    "Operating System :: OS Independent", 
-    "Natural Language :: English", 
-    "Programming Language :: C", 
+    "Operating System :: OS Independent",
+    "Natural Language :: English",
+    "Programming Language :: C",
     "Programming Language :: Python", 
     "Programming Language :: Python :: 2",
     "Programming Language :: Python :: 2.4",
@@ -84,9 +74,9 @@ trove_classifiers=[
     "Topic :: System :: Distributed Computing",
     "Topic :: Software Development :: Libraries",
     "Topic :: Communications :: Usenet News",
-    "Topic :: System :: Archiving :: Backup", 
-    "Topic :: System :: Archiving :: Mirroring", 
-    "Topic :: System :: Archiving", 
+    "Topic :: System :: Archiving :: Backup",
+    "Topic :: System :: Archiving :: Mirroring",
+    "Topic :: System :: Archiving",
     ]
 
 PKG = "zfec"
@@ -105,7 +95,6 @@ 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_requires = []
 
 # The darcsver command from the darcsver plugin is needed to initialize the
@@ -148,7 +137,6 @@ def _setup(test_suite):
           author_email='zooko@zooko.com',
           url='http://allmydata.org/trac/'+PKG,
           license='GNU GPL',
-          dependency_links=dependency_links,
           install_requires=["argparse >= 0.8", "pyutil >= 1.3.19"],
           tests_require=["pyutil >= 1.3.19"],
           packages=find_packages(),