Merge branch 'production'

[wolnelektury.git] / requirements.txt

diff --git a/requirements.txt b/requirements.txt
index 5f99441..9cb7972 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,15 +1,25 @@
 --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.4,<1.5

 South>=0.7 # migrations for django
 South>=0.7 # migrations for django

+django-pipeline>=1.2

 django-pagination>=1.0
 django-pagination>=1.0

-django-rosetta>=0.5.3
-django-maintenancemode>=0.9
-django-piston
+django-maintenancemode>=0.10
+django-piston<=0.2.3
+#django-jsonfield
+-e git+git://github.com/bradjasper/django-jsonfield.git@2f427368ad70bf8d9a0580df58ec0eb0654d62ae#egg=django-jsonfield
+django-picklefield
+#django-allauth>=0.4,<0.5
+# version of django-allauth 0.4 with install script fixed
+-e git+git://github.com/pennersr/django-allauth.git@3a03db9b2ecca370af228df367bd8fa52afea5ea#egg=django-allauth
+
+django-honeypot
+django-uni-form

 
 python-memcached
 piwik
 
 python-memcached
 piwik

+python-fb

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


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

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

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


@@ -26,5 +36,13 @@ lxml>=2.2.2
 # MySQL-python>=1.2,<2.0
 
 # celery tasks
 # MySQL-python>=1.2,<2.0
 
 # celery tasks

-django-celery
+django-celery>=2.5.1

 django-kombu
 django-kombu

+
+# spell checking
+pyenchant
+
+# OAI-PMH
+pyoai
+
+