Merge branch 'master' into lucene_memory

[wolnelektury.git] / requirements.txt

diff --git a/requirements.txt b/requirements.txt
index ed684cc..3c85e31 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,15 +1,20 @@
 --find-links=http://www.pythonware.com/products/pil/
 
 # django
 --find-links=http://www.pythonware.com/products/pil/
 
 # django

-Django>=1.2.4,<1.3
+Django>=1.3,<1.4

 South>=0.7 # migrations for django
 django-pagination>=1.0
 django-rosetta>=0.5.3
 django-maintenancemode>=0.9
 django-piston
 South>=0.7 # migrations for django
 django-pagination>=1.0
 django-rosetta>=0.5.3
 django-maintenancemode>=0.9
 django-piston

+django-jsonfield
+django-picklefield
+django-allauth
+django-honeypot

 
 python-memcached
 piwik
 
 python-memcached
 piwik

+python-fb

 
 # Feedparser 
 Feedparser>=4.1
 
 # Feedparser 
 Feedparser>=4.1


@@ -17,7 +22,7 @@ Feedparser>=4.1
 # PIL 
 PIL>=1.1.6
 mutagen>=1.17
 # PIL 
 PIL>=1.1.6
 mutagen>=1.17

-sorl-thumbnail>=11.09<12
+sorl-thumbnail>=11.09,<12

 
 # home-brewed & dependencies
 lxml>=2.2.2
 
 # home-brewed & dependencies
 lxml>=2.2.2