Merge remote-tracking branch 'origin/production'

[wolnelektury.git] / requirements.txt

diff --git a/requirements.txt b/requirements.txt
index 5b422ec..1b6930a 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,18 +2,19 @@
 --find-links=http://www.pythonware.com/products/pil/
 
 # django
-Django>=1.5,<1.6
-fnpdjango>=0.1.6,<0.2
+Django>=1.6,<1.7
+fnpdjango>=0.1.15,<0.2
 South>=0.7 # migrations for django
-django-pipeline>=1.2,<1.3
+django-pipeline>=1.3,<1.4
 django-pagination>=1.0
 django-maintenancemode>=0.10
 django-piston>=0.2.2.1,<0.2.3
--e git+git://github.com/bradjasper/django-jsonfield.git@e67ec8c3652e61d8b47cc8db012a63f5ad39323d#egg=django-jsonfield
+jsonfield>=0.9.20
 django-picklefield
+django-modeltranslation
+django-allauth>=0.16,<0.17
 
-#django-allauth<0.10 with migration fix
--e git+git://github.com/rczajka/django-allauth.git@4ecda71b81f9311dea4febe1d2d0105f23c642c7#egg=django-allauth
+pytz
 
 # Some contrib apps still need it
 simplejson
@@ -22,14 +23,13 @@ django-honeypot
 django-uni-form
 
 python-memcached
-piwik
+django-piwik
 python-fb
 
 # Feedparser 
-Feedparser>=4.1
+Feedparser>=5.1
 
-# PIL 
-PIL>=1.1.6
+Pillow
 mutagen>=1.17
 sorl-thumbnail>=11.09,<12
 
@@ -40,8 +40,7 @@ lxml>=2.2.2
 # MySQL-python>=1.2,<2.0
 
 # celery tasks
-django-celery>=2.5.1
-django-kombu
+django-celery>=3.1,<3.2
 
 # spell checking
 pyenchant
@@ -49,5 +48,7 @@ pyenchant
 # OAI-PMH
 pyoai
 
-egenix-mx-base
+## egenix-mx-base  # Doesn't play nice with mx in dist-packages.
 sunburnt
+
+django-getpaid>=1.6,<1.7