Upgrade Django to 1.11

Author: berkerpeksag

.travis.yml

@@ -13,7 +13,7 @@ install: pip install -r dev-requirements.txt
 before_script:
   - psql -c 'create database "python.org";' -U postgres
 script:
-  - coverage run manage.py test -v2
+  - python -Wd -m coverage run manage.py test -v2
   - coverage report --fail-under=75
 notifications:
   irc:

base-requirements.txt

@@ -1,7 +1,7 @@
 dj-database-url==0.4.2
 django-pipeline==1.6.13
 django-sitetree==1.8.0
-Django==1.10.7
+Django==1.11.4
 docutils==0.12
 Markdown==2.5.2
 Pillow==2.7.0
@@ -21,8 +21,8 @@ pyelasticsearch==0.6.1
 # TODO: 0.14.0 only supports Django 1.8 and 1.11.
 django-tastypie==0.13.3
 
-pytz==2016.7
-python-dateutil==2.4.0
+pytz==2017.2
+python-dateutil==2.6.1
 
 requests==2.5.1
 

blogs/templatetags/blogs.py

@@ -5,13 +5,13 @@
 register = template.Library()
 
 
-@register.assignment_tag
+@register.simple_tag
 def get_latest_blog_entries(limit=5):
     """ Return limit of latest blog entries """
     return BlogEntry.objects.order_by("-pub_date")[:limit]
 
 
-@register.assignment_tag
+@register.simple_tag
 def feed_list(slug, limit=10):
     """
     Returns a list of blog entries for the given FeedAggregate slug.

codesamples/templatetags/codesamples.py

@@ -5,7 +5,7 @@
 register = template.Library()
 
 
-@register.assignment_tag
+@register.simple_tag
 def get_code_samples_latest(limit=5):
     """ Return last 5 published code samples """
     return CodeSample.objects.published()[:limit]

community/templatetags/community.py

@@ -8,7 +8,7 @@
 register = template.Library()
 
 
-@register.assignment_tag(takes_context=True)
+@register.simple_tag(takes_context=True)
 def render_template_for(context, obj, template=None, template_directory=None):
     """
     Renders a template based on the `media_type` of the given object in the
@@ -30,6 +30,7 @@ def render_template_for(context, obj, template=None, template_directory=None):
         {% render_template_for object template_directory='includes/types' as html %}
 
     """
+    context = context.flatten()
     context['object'] = obj
 
     template_list = []

events/models.py

@@ -308,8 +308,10 @@ def freq_interval_as_timedelta(self):
     @property
     def dt_start(self):
         since = timezone.now()
-
-        return self.to_rrule().after(since)
+        recurrence = self.to_rrule().after(since)
+        if recurrence is None:
+            return since
+        return recurrence
 
     @property
     def dt_end(self):

events/templatetags/events.py

@@ -7,7 +7,7 @@
 register = template.Library()
 
 
-@register.assignment_tag
+@register.simple_tag
 def get_events_upcoming(limit=5, only_featured=False):
     qs = Event.objects.for_datetime(timezone.now()).order_by(
         'occurring_rule__dt_start')

events/tests/test_models.py

@@ -116,8 +116,8 @@ def test_event(self):
         self.assertEqual(Event.objects.for_datetime().count(), 1)
         self.assertEqual(self.event.next_time.dt_start, recurring_time_dtstart)
 
-        rt.begin = now + datetime.timedelta(days=5)
-        rt.finish = now + datetime.timedelta(days=3)
+        rt.begin = now + datetime.timedelta(days=7)
+        rt.finish = now + datetime.timedelta(days=9)
         rt.save()
 
         event = Event.objects.get(pk=self.event.pk)

events/tests/test_views.py

@@ -10,21 +10,28 @@
 
 
 class EventsViewsTests(TestCase):
-    def setUp(self):
-        self.user = get_user_model().objects.create_user(username='username', password='password')
-        self.calendar = Calendar.objects.create(creator=self.user, slug="test-calendar")
-        self.event = Event.objects.create(creator=self.user, calendar=self.calendar)
+    @classmethod
+    def setUpTestData(cls):
+        cls.user = get_user_model().objects.create_user(username='username', password='password')
+        cls.calendar = Calendar.objects.create(creator=cls.user, slug="test-calendar")
+        cls.event = Event.objects.create(creator=cls.user, calendar=cls.calendar)
+        cls.event_past = Event.objects.create(title='Past Event', creator=cls.user, calendar=cls.calendar)
 
-        self.now = timezone.now()
+        cls.now = timezone.now()
 
-        recurring_time_dtstart = self.now + datetime.timedelta(days=3)
+        recurring_time_dtstart = cls.now + datetime.timedelta(days=3)
         recurring_time_dtend = recurring_time_dtstart + datetime.timedelta(days=5)
 
-        self.rule = RecurringRule.objects.create(
-            event=self.event,
+        cls.rule = RecurringRule.objects.create(
+            event=cls.event,
             begin=recurring_time_dtstart,
             finish=recurring_time_dtend,
         )
+        cls.rule_past = RecurringRule.objects.create(
+            event=cls.event_past,
+            begin=cls.now - datetime.timedelta(days=2),
+            finish=cls.now - datetime.timedelta(days=1),
+        )
 
     def test_calendar_list(self):
         calendars_count = Calendar.objects.count()
@@ -50,15 +57,6 @@ def test_event_list_past(self):
         url = reverse('events:event_list_past', kwargs={"calendar_slug": self.calendar.slug})
         response = self.client.get(url)
 
-        self.assertEqual(response.status_code, 200)
-        self.assertEqual(len(response.context['object_list']), 0)
-
-        self.rule.begin = self.now - datetime.timedelta(days=3)
-        self.rule.finish = self.now - datetime.timedelta(days=2)
-        self.rule.save()
-
-        response = self.client.get(url)
-
         self.assertEqual(response.status_code, 200)
         self.assertEqual(len(response.context['object_list']), 1)
 
@@ -108,7 +106,7 @@ def test_event_list_date(self):
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200)
         self.assertEqual(response.context['object'], dt.date())
-        self.assertEqual(len(response.context['object_list']), 1)
+        self.assertEqual(len(response.context['object_list']), 2)
 
     def test_eventlocation_list(self):
         venue = EventLocation.objects.create(

jobs/migrations/0012_auto_20170809_1849.py

@@ -2,7 +2,7 @@
 from __future__ import unicode_literals
 
 from django.apps import apps as global_apps
-from django.contrib.contenttypes.management import update_contenttypes
+from django.contrib.contenttypes.management import create_contenttypes
 from django.db import models, migrations
 from django.utils.timezone import now
 
@@ -18,7 +18,7 @@ def migrate_old_content(apps, schema_editor):
     except LookupError:
         # django_comments_xtd isn't installed.
         return
-    update_contenttypes(apps.app_configs['contenttypes'])
+    create_contenttypes(apps.app_configs['contenttypes'])
     JobReviewComment = apps.get_model('jobs', 'JobReviewComment')
     Job = apps.get_model('jobs', 'Job')
     ContentType = apps.get_model('contenttypes', 'ContentType')

peps/templatetags/peps.py

@@ -5,7 +5,7 @@
 register = template.Library()
 
 
-@register.assignment_tag()
+@register.simple_tag
 def get_newest_pep_pages(limit=5):
     """ Retrieve the most recently added PEPs """
     latest_peps = Page.objects.filter(

successstories/templatetags/successstories.py

@@ -6,21 +6,21 @@
 register = template.Library()
 
 
-@register.assignment_tag
+@register.simple_tag
 def get_story_categories():
     return StoryCategory.objects.all()
 
 
-@register.assignment_tag
+@register.simple_tag
 def get_featured_story():
     return Story.objects.random_featured()
 
 
-@register.assignment_tag
+@register.simple_tag
 def get_stories_by_category(category_slug, limit=5):
     return Story.objects.published().filter(category__slug__exact=category_slug)[:limit]
 
 
-@register.assignment_tag
+@register.simple_tag
 def get_stories_latest(limit=5):
     return Story.objects.published()[:limit]