Merge lp:~stefanor/ibid/requirements-651992 into lp:~ibid-core/ibid/old-trunk-1.6

[Stefano Rivera]

We don't support SQLAlchemy 0.6 yet

[Max Rabkin (max-rabkin)]

review: Approve

[Jonathan Hitchcock (vhata)]

review: Approve

[Stefano Rivera (stefanor)]

Actually, I think our code works fine with BS 3.2, this is wrong.

review: Needs Fixing

[lp:~stefanor/ibid/requirements-651992]

910. By Stefano Rivera on 2011-02-20

Err what? BeautifulSoup 3.2 works fine

[Stefano Rivera (stefanor)]

review: Approve

[Stefano Rivera (stefanor)]

review: Abstain

=== modified file 'setup.py'
--- setup.py	2011-01-24 21:31:11 +0000
+++ setup.py	2011-02-20 20:17:48 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Copyright (c) 2008-2010, Michael Gorven
+# Copyright (c) 2008-2011, Michael Gorven, Stefano Rivera
 # Released under terms of the MIT/X/Expat Licence. See COPYING for details.
 
 from sys import version_info, argv
@@ -18,7 +18,7 @@
     'PyStemmer',
     'python-dateutil',
     'SOAPpy',
-    'SQLAlchemy>=0.5', # Works with >=0.4.6 except on OS X
+    'SQLAlchemy>=0.5,<0.6a', # Works with >=0.4.6 except on OS X
     'Twisted',
     'wokkel>=0.6.3',
 ]