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

Proposed by Adrien Saladin
Status: Merged
Merged at revision: 121
Proposed branch: lp:~adrien-saladin/sloecode/814106
Merge into: lp:sloecode
Diff against target: 20 lines (+2/-1)
1 file modified
setup.py (+2/-1)
To merge this branch: bzr merge lp:~adrien-saladin/sloecode/814106
Reviewer Review Type Date Requested Status
sloecode Pending
Review via email: mp+68697@code.launchpad.net
To post a comment you must log in.

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 2011-07-02 11:43:29 +0000
3+++ setup.py 2011-07-21 14:10:19 +0000
4@@ -18,7 +18,7 @@
5 license = 'GNU Affero General Public License v3',
6 install_requires=[
7 "Pylons>=0.10",
8- "SQLAlchemy>=0.6",
9+ "SQLAlchemy>=0.6, <0.7",
10 "Jinja2",
11 "repoze.who<=1.99",
12 "repoze.what",
13@@ -28,6 +28,7 @@
14 "pycrypto", #for smartserver
15 "pyasn1",
16 "zope.component",
17+ "repoze.who-friendlyform"
18 ],
19 packages=find_packages(exclude=['ez_setup']),
20 include_package_data=True,

Subscribers

People subscribed via source and target branches