Merge branch 'master' into sunburnt

[wolnelektury.git] / requirements.txt

diff --git a/requirements.txt b/requirements.txt
index 7f02094..c7e33c2 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,16 +1,21 @@
 --find-links=http://www.pythonware.com/products/pil/
 
 # django
-Django>=1.3,<1.4
+Django>=1.4,<1.5
 South>=0.7 # migrations for django
+django-pipeline>=1.2
 django-pagination>=1.0
-#django-rosetta>=0.5.3
-django-maintenancemode>=0.9
-django-piston
-django-jsonfield
+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
+#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
@@ -31,8 +36,15 @@ lxml>=2.2.2
 # MySQL-python>=1.2,<2.0
 
 # celery tasks
-django-celery
+django-celery>=2.5.1
 django-kombu
 
 # spell checking
 pyenchant
+
+# OAI-PMH
+pyoai
+
+egenix-mx-base
+sunburnt
+