Funding: behave nicer with time conflicts.

[wolnelektury.git] / requirements.txt

diff --git a/requirements.txt b/requirements.txt
index 70cf8b9..d6355f2 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,16 +1,26 @@
+-i http://pypi.nowoczesnapolska.org.pl/simple/ 

 --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.6,<0.2

 South>=0.7 # migrations for django
 South>=0.7 # migrations for django

-django-pipeline>=1.2
+django-pipeline>=1.2.24,<1.3

 django-pagination>=1.0
 django-maintenancemode>=0.10
 django-pagination>=1.0
 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-piston>=0.2.2.1,<0.2.3
+-e git+git://github.com/bradjasper/django-jsonfield.git@e67ec8c3652e61d8b47cc8db012a63f5ad39323d#egg=django-jsonfield

 django-picklefield
 django-picklefield

-django-allauth<=0.4.0
+
+#django-allauth<0.10 with migration fix
+-e git+git://github.com/rczajka/django-allauth.git@4ecda71b81f9311dea4febe1d2d0105f23c642c7#egg=django-allauth
+
+pytz
+pyScss
+
+# Some contrib apps still need it
+simplejson
+

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


@@ -33,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


@@ -42,4 +52,7 @@ pyenchant
 # OAI-PMH
 pyoai
 
 # OAI-PMH
 pyoai
 

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

 
 

+django-getpaid>=1.4,<1.5