Merge lp:~adrien-saladin/sloecode/733781 into lp:sloecode

Proposed by Adrien Saladin
Status: Merged
Approved by: Thomi Richards
Approved revision: 66
Merge reported by: Thomi Richards
Merged at revision: not available
Proposed branch: lp:~adrien-saladin/sloecode/733781
Merge into: lp:sloecode
Diff against target: 16 lines (+4/-1)
1 file modified
setup.py (+4/-1)
To merge this branch: bzr merge lp:~adrien-saladin/sloecode/733781
Reviewer Review Type Date Requested Status
Thomi Richards (community) Approve
Review via email: mp+53124@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Thomi Richards (thomir-deactivatedaccount) wrote :

Thanks. Merging now.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'setup.py'
2--- setup.py 2010-12-14 20:52:13 +0000
3+++ setup.py 2011-03-12 12:28:54 +0000
4@@ -14,8 +14,11 @@
5 url='',
6 install_requires=[
7 "Pylons>=0.10",
8- "SQLAlchemy>=0.5",
9+ "SQLAlchemy>=0.6",
10 "Jinja2",
11+ "repoze.who<=1.99",
12+ "repoze.what",
13+ "repoze.who.plugins.sa"
14 ],
15 setup_requires=["PasteScript>=1.6.3"],
16 packages=find_packages(exclude=['ez_setup']),

Subscribers

People subscribed via source and target branches