Django 1.6

diff --git a/apps/catalogue/templates/catalogue/wall.html b/apps/catalogue/templates/catalogue/wall.html
index 6483079..a107dfa 100755 (executable)
--- a/apps/catalogue/templates/catalogue/wall.html
+++ b/apps/catalogue/templates/catalogue/wall.html
@@ -8,7 +8,7 @@
     <li class="{{ item.tag }}{% if not item.user %} anonymous{% endif %}">
         <div class='gravatar'>
             {% if item.get_email %}
     <li class="{{ item.tag }}{% if not item.user %} anonymous{% endif %}">
         <div class='gravatar'>
             {% if item.get_email %}

-                <img src="{% gravatar_for_email item.get_email 32 %}"
+                <img src="{% gravatar_url item.get_email 32 %}"

                     height="32" width="32" alt='Avatar' />
                 <br/>
             {% endif %}
                     height="32" width="32" alt='Avatar' />
                 <br/>
             {% endif %}

diff --git a/apps/cover/tests.py b/apps/cover/tests.py
index 2f5b304..5b4b885 100644 (file)
--- a/apps/cover/tests.py
+++ b/apps/cover/tests.py
@@ -16,5 +16,5 @@ class FlickrTests(TestCase):
         self.assertEqual(form.cleaned_data['author'], "rczajka@Flickr")
         self.assertEqual(form.cleaned_data['title'], u"Pirate Stańczyk")
         self.assertEqual(form.cleaned_data['license_name'], "CC BY 2.0")
         self.assertEqual(form.cleaned_data['author'], "rczajka@Flickr")
         self.assertEqual(form.cleaned_data['title'], u"Pirate Stańczyk")
         self.assertEqual(form.cleaned_data['license_name'], "CC BY 2.0")

-        self.assertEqual(form.cleaned_data['license_url'], "http://creativecommons.org/licenses/by/2.0/deed.en")
+        self.assertEqual(form.cleaned_data['license_url'], "https://creativecommons.org/licenses/by/2.0/deed.en")

         self.assertEqual(form.cleaned_data['download_url'], "https://farm8.staticflickr.com/7069/6941928577_415844c58e_o.jpg")
         self.assertEqual(form.cleaned_data['download_url'], "https://farm8.staticflickr.com/7069/6941928577_415844c58e_o.jpg")

diff --git a/redakcja/settings/common.py b/redakcja/settings/common.py
index 0c1b679..09d5016 100644 (file)
--- a/redakcja/settings/common.py
+++ b/redakcja/settings/common.py
@@ -111,7 +111,7 @@ INSTALLED_APPS = (
     'south',
     'sorl.thumbnail',
     'pagination',
     'south',
     'sorl.thumbnail',
     'pagination',

-    'gravatar',
+    'django_gravatar',

     'djcelery',
     'djkombu',
     'fileupload',
     'djcelery',
     'djkombu',
     'fileupload',

diff --git a/redakcja/settings/test.py b/redakcja/settings/test.py
index d667ddd..80b9a3d 100644 (file)
--- a/redakcja/settings/test.py
+++ b/redakcja/settings/test.py
@@ -20,8 +20,9 @@ DATABASES = {
 import tempfile
 
 CATALOGUE_REPO_PATH = tempfile.mkdtemp(prefix='redakcja-repo')
 import tempfile
 
 CATALOGUE_REPO_PATH = tempfile.mkdtemp(prefix='redakcja-repo')

+CATALOGUE_IMAGE_REPO_PATH = tempfile.mkdtemp(prefix='redakcja-repo-img')

 MEDIA_ROOT = tempfile.mkdtemp(prefix='media-root')
 MEDIA_ROOT = tempfile.mkdtemp(prefix='media-root')

-USE_CELERY = False
+CELERY_ALWAYS_EAGER = True

 
 INSTALLED_APPS += ('django_nose', 'dvcs.tests')
 
 
 INSTALLED_APPS += ('django_nose', 'dvcs.tests')
 

diff --git a/requirements-test.txt b/requirements-test.txt
index e09fd7b..70ee4a0 100644 (file)
--- a/requirements-test.txt
+++ b/requirements-test.txt
@@ -1,4 +1,4 @@
-django-nose==0.1.3
+django-nose==1.2

 nose
 nosexcover
 mock
 nose
 nosexcover
 mock

diff --git a/requirements.txt b/requirements.txt
index 99d38f6..83f494f 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,14 +12,14 @@ httplib2 # oauth2 dependency
 # git+git://github.com/fnp/librarian.git@master#egg=librarian
 
 ## Django
 # git+git://github.com/fnp/librarian.git@master#egg=librarian
 
 ## Django

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

 fnpdjango<0.2
 django-pipeline>=1.2,<1.3
 django_cas>=2.1,<2.2
 sorl-thumbnail>=11.09,<12
 django-maintenancemode>=0.9
 django-pagination
 fnpdjango<0.2
 django-pipeline>=1.2,<1.3
 django_cas>=2.1,<2.2
 sorl-thumbnail>=11.09,<12
 django-maintenancemode>=0.9
 django-pagination

-django-gravatar
+django-gravatar2

 django-celery
 django-kombu
 
 django-celery
 django-kombu