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

Proposed by Stefano Rivera
Status: Merged
Approved by: Stefano Rivera
Approved revision: 910
Merged at revision: 1008
Proposed branch: lp:~stefanor/ibid/requirements-651992
Merge into: lp:~ibid-core/ibid/old-trunk-1.6
Diff against target: 19 lines (+2/-2)
1 file modified
setup.py (+2/-2)
To merge this branch: bzr merge lp:~stefanor/ibid/requirements-651992
Reviewer Review Type Date Requested Status
Stefano Rivera Abstain
Jonathan Hitchcock Approve
Max Rabkin Approve
Review via email: mp+47150@code.launchpad.net

Commit message

We don't support SQLAlchemy 0.6 yet

To post a comment you must log in.
Revision history for this message
Max Rabkin (max-rabkin) :
review: Approve
Revision history for this message
Jonathan Hitchcock (vhata) :
review: Approve
Revision history for this message
Stefano Rivera (stefanor) wrote :

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

review: Needs Fixing
910. By Stefano Rivera

Err what? BeautifulSoup 3.2 works fine

Revision history for this message
Stefano Rivera (stefanor) :
review: Approve
Revision history for this message
Stefano Rivera (stefanor) :
review: Abstain

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
1#!/usr/bin/env python1#!/usr/bin/env python
2# Copyright (c) 2008-2010, Michael Gorven2# Copyright (c) 2008-2011, Michael Gorven, Stefano Rivera
3# Released under terms of the MIT/X/Expat Licence. See COPYING for details.3# Released under terms of the MIT/X/Expat Licence. See COPYING for details.
44
5from sys import version_info, argv5from sys import version_info, argv
@@ -18,7 +18,7 @@
18 'PyStemmer',18 'PyStemmer',
19 'python-dateutil',19 'python-dateutil',
20 'SOAPpy',20 'SOAPpy',
21 'SQLAlchemy>=0.5', # Works with >=0.4.6 except on OS X21 'SQLAlchemy>=0.5,<0.6a', # Works with >=0.4.6 except on OS X
22 'Twisted',22 'Twisted',
23 'wokkel>=0.6.3',23 'wokkel>=0.6.3',
24]24]

Subscribers

People subscribed via source and target branches