Merge branch 'master' into rwd

[wolnelektury.git] / requirements.txt

diff --git a/requirements.txt b/requirements.txt
index 645015c..3ed01b3 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,19 +2,24 @@
 --find-links=http://www.pythonware.com/products/pil/
 
 # django
 --find-links=http://www.pythonware.com/products/pil/
 
 # django

-Django>=1.4,<1.5
+Django>=1.5,<1.6
+fnpdjango>=0.1.8,<0.2

 South>=0.7 # migrations for django
 django-pipeline>=1.2.24,<1.3
 django-pagination>=1.0
 django-maintenancemode>=0.10
 South>=0.7 # migrations for django
 django-pipeline>=1.2.24,<1.3
 django-pagination>=1.0
 django-maintenancemode>=0.10

-django-piston==0.2.2
-#django-jsonfield
--e git+git://github.com/bradjasper/django-jsonfield.git@2f427368ad70bf8d9a0580df58ec0eb0654d62ae#egg=django-jsonfield
+django-piston>=0.2.2.1,<0.2.3
+jsonfield>=0.9.20

 django-picklefield
 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-allauth<0.10 with migration fix
+-e git+git://github.com/rczajka/django-allauth.git@4ecda71b81f9311dea4febe1d2d0105f23c642c7#egg=django-allauth
+

 pytz
 pytz

+pyScss
+
+# Some contrib apps still need it
+simplejson

 
 django-honeypot
 django-uni-form
 
 django-honeypot
 django-uni-form


@@ -38,7 +43,7 @@ lxml>=2.2.2
 # MySQL-python>=1.2,<2.0
 
 # celery tasks
 # MySQL-python>=1.2,<2.0
 
 # celery tasks

-django-celery>=2.5.1
+django-celery>=3.0.11

 django-kombu
 
 # spell checking
 django-kombu
 
 # spell checking


@@ -47,6 +52,7 @@ pyenchant
 # OAI-PMH
 pyoai
 
 # OAI-PMH
 pyoai
 

-egenix-mx-base
+## egenix-mx-base  # Doesn't play nice with mx in dist-packages.

 sunburnt
 
 sunburnt
 

+django-getpaid>=1.4,<1.5