Merge branch 'master' into production

[wolnelektury.git] / requirements.txt

diff --git a/requirements.txt b/requirements.txt
index efaddf3..037fa76 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,40 @@
-Django==1.1
-django-piston==0.2.3rc1
-librarian==1.2.2
-lxml==2.2.2
-mercurial==1.3.1
--e git://github.com/zuber/django-cas-consumer.git#egg=django-cas-consumer
+--find-links=http://www.pythonware.com/products/pil/
+
+# django
+Django>=1.4,<1.5
+South>=0.7 # migrations for django
+django-pipeline>=1.2
+django-pagination>=1.0
+django-maintenancemode>=0.10
+django-piston
+#django-jsonfield
+-e git+git://github.com/bradjasper/django-jsonfield.git@2f427368ad70bf8d9a0580df58ec0eb0654d62ae#egg=django-jsonfield
+django-picklefield
+django-allauth
+django-honeypot
+django-uni-form
+
+python-memcached
+piwik
+python-fb
+
+# Feedparser 
+Feedparser>=4.1
+
+# PIL 
+PIL>=1.1.6
+mutagen>=1.17
+sorl-thumbnail>=11.09,<12
+
+# home-brewed & dependencies
+lxml>=2.2.2
+# -e git+git://github.com/fnp/librarian.git@d43d87400dcc19851442#egg=librarian
+
+# MySQL-python>=1.2,<2.0
+
+# celery tasks
+django-celery>=2.5.1
+django-kombu
+
+# spell checking
+pyenchant