build-deps: require setuptools 0.6c4 or later, because older ones don't allow foolsca...

diff --git a/misc/dependencies/build-deps-setup.py b/misc/dependencies/build-deps-setup.py
index ed8d80e11dac1d6c0cdd565475e707db3bbba809..ad5189d1b67bc468e1d30ba4b74d62a7cb47c957 100644 (file)
--- a/misc/dependencies/build-deps-setup.py
+++ b/misc/dependencies/build-deps-setup.py
@@ -7,8 +7,13 @@ from ez_setup import use_setuptools
 if 'cygwin' in sys.platform.lower():
     min_version='0.6c6'
 else:
-    min_version='0.6a9'
-use_setuptools(min_version=min_version, download_base="file:misc/dependencies/")
+    # 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.
+    min_version='0.6c4'
+use_setuptools(min_version=min_version,
+               download_base="file:misc/dependencies/",
+               download_delay=0)
 
 from setuptools import setup
 

diff --git a/setup.py b/setup.py
index 824c33b4b450bb6b743f66da0096b58e7100d25e..24880d1fce72992dad372f401236700d6861e6fb 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -29,8 +29,13 @@ else:
     if 'cygwin' in sys.platform.lower():
         min_version='0.6c6'
     else:
-        min_version='0.6a9'
-    use_setuptools(min_version=min_version, download_base="file:misc/dependencies/", download_delay=0)
+        # 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.
+        min_version='0.6c4'
+        use_setuptools(min_version=min_version, download_delay=0,
+                       download_base="file:misc/dependencies/",
+                       download_delay=0)
 
 from setuptools import Extension, find_packages, setup