setup: move the requirement on simplejson from setup.py to _auto_deps.py, and loosen...

We'll see if this fixes the tests on all of our current buildslaves, and if it does then I'll be happy to leave it at "> 1.8.1" for now, even though I don't know exactly what versions of simplejson changed exactly what behavior that interacts with exactly what environment.  See http://allmydata.org/trac/tahoe/ticket/534 for uncertainties.

diff --git a/_auto_deps.py b/_auto_deps.py
index 59c6d6c5b36216958035e0d189f5e7af2dbf9557..a8b06026b2a7ffbf21184836be249ace827e6b02 100644 (file)
--- a/_auto_deps.py
+++ b/_auto_deps.py
@@ -8,7 +8,9 @@ install_requires=[
                   # incorrect AES results.
                   "pycryptopp >= 0.5",
                   "zfec >= 1.1.0",
-                  "simplejson >= 1.4",
+
+                  # We had a unicode problem with simplejson 1.8.1 on dapper -- see ticket #543.
+                  "simplejson > 1.8.1",
 
                   "zope.interface",
                   "Twisted >= 2.4.0",

diff --git a/setup.py b/setup.py
index 216840543f40ee9c703601ae0ec747c78f11e8c3..c2b0bc691c0d10e6a16edf1bde50e5abc19f0f70 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -208,10 +208,6 @@ if 'darcsver' in sys.argv[1:]:
 if not os.path.exists('PKG-INFO'):
     setup_requires.append('setuptools_darcs >= 1.1.0')
 
-# Previous versions seems to have unicode issues
-# See Bug #543
-setup_requires.append('simplejson >= 2.0.5')
-
 class ShowSupportLib(Command):
     user_options = []
     def initialize_options(self):