Merge branch 'merge_1' into edumed

[redakcja.git] / requirements.txt

diff --git a/requirements.txt b/requirements.txt
index 227f79c..4c3aafd 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,8 +1,25 @@
---find-links=http://stigma.nowoczesnapolska.org.pl/pypi/
-
-Django==1.1.1
-lxml==2.2.2
-mercurial==1.3.1
-librarian==1.2.6
-django-piston==0.2.3rc1
-django-cas-consumer==0.1dev
+## Python libraries
+lxml>=2.2.2
+mercurial>=1.6,<1.7
+PyYAML>=3.0
+PIL>=1.1
+oauth2
+httplib2 # oauth2 dependency
+
+## Book conversion library
+# git+git://github.com/fnp/librarian.git@master#egg=librarian
+
+## Django
+Django>=1.3,<1.4
+sorl-thumbnail>=11.09,<12
+django-maintenancemode>=0.9
+django-pagination
+django-gravatar
+django-celery
+django-kombu
+
+# migrations
+south>=0.6
+
+# etherpad lite api
+-e git+git://github.com/devjones/PyEtherpadLite.git#egg=PyEtherpadLite