Merge branch 'infographics'

[edumed.git] / requirements.txt

diff --git a/requirements.txt b/requirements.txt
index a8b89af..53db32f 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,8 +1,9 @@
 -i http://pypi.nowoczesnapolska.org.pl/simple
 
 -i http://pypi.nowoczesnapolska.org.pl/simple
 

-Django>=1.4,<1.5
+Django>=1.5,<1.6

 South>=0.7.4
 django-pipeline>=1.2,<1.3
 South>=0.7.4
 django-pipeline>=1.2,<1.3

+python-memcached

 piwik
 #pyScss
 #git+git://github.com/Kronuz/pyScss.git@d8f4da23a3c87696a75b3830ed4ab49b75550a93#egg=pyScss
 piwik
 #pyScss
 #git+git://github.com/Kronuz/pyScss.git@d8f4da23a3c87696a75b3830ed4ab49b75550a93#egg=pyScss


@@ -23,7 +24,9 @@ texml
 
 # sponsors
 pillow
 
 # sponsors
 pillow

-django-sponsors
+django-sponsors>=1.1,<1.2

 
 

--e git+https://github.com/toastdriven/django-haystack.git@61b377d97efd5390c60c5a37acd009b8e69eb2f3#egg=django-haystack
-pysolr>=2,<3
+django-haystack>=2.0,<2.1
+pysolr>=3,<4
+
+sorl-thumbnail>=11,<12