Merge branch 'master' into with-dvcs

[redakcja.git] / requirements.txt

diff --git a/requirements.txt b/requirements.txt
index b52baef..c5d6b04 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,16 +1,20 @@
 ## Python libraries
 ## Python libraries

-lxml>=2.2
-mercurial>=1.3.1
+lxml>=2.2.2
+mercurial>=1.6,<1.7

 PyYAML>=3.0
 PIL>=1.1
 PyYAML>=3.0
 PIL>=1.1

+oauth2
+httplib2 # oauth2 dependency

 
 ## Book conversion library
 
 ## Book conversion library

-git+git://github.com/fnp/librarian.git@master#egg=librarian
+# git+git://github.com/fnp/librarian.git@master#egg=librarian

 
 

-## Django 
-Django>=1.1.1,<1.2
+## Django
+Django>=1.3,<1.4

 sorl-thumbnail>=3.2
 django-maintenancemode>=0.9
 sorl-thumbnail>=3.2
 django-maintenancemode>=0.9

+django-pagination
+django-gravatar

 
 # migrations
 south>=0.6
 
 # migrations
 south>=0.6