Upgrade requirements (including django 2.0.6)

.travis.yml

@@ -1,7 +1,6 @@
 language: python
 python:
-  - "3.4"
-  - "3.5"
+  - "3.6"
 sudo: required
 dist: trusty
 before_install:

README.md

@@ -1,6 +1,6 @@
 # Videofront [![Build Status](https://travis-ci.org/openfun/videofront.svg?branch=master)](https://travis-ci.org/openfun/videofront)
 
-A scalable video hosting platform written in Django.
+A scalable video hosting platform written in Django 2, for Python 3.6.
 
 Initially, Videofront was developed to host videos of MOOCs taught on [Open edX](https://open.edx.org/) platforms, but it can easily be used in just any web platform that requires video embedding.
 
@@ -106,7 +106,7 @@ Pick a backend and customize the settings file accordingly:
 
 The recommended approach is to start gunicorn and celery workers with `supervisorctl`:
 
-    $ cat /etc/supervisor/conf.d/videofront.conf 
+    $ cat /etc/supervisor/conf.d/videofront.conf
     [group:videofront]
     programs=gunicorn,celery,celery-beat
 
@@ -141,7 +141,7 @@ The recommended approach is to start gunicorn and celery workers with `superviso
 
 Recommended nginx configuration:
 
-    $ cat /etc/nginx/sites-enabled/videofront.vhost 
+    $ cat /etc/nginx/sites-enabled/videofront.vhost
     upstream django {
         server 127.0.0.1:8000;
     }
@@ -156,7 +156,7 @@ Recommended nginx configuration:
           # This depends on the STATIC_ROOT setting
           alias /home/user/videofront/static/;
         }
-        
+
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
         proxy_set_header Host $http_host;
         proxy_redirect off;

api/apps.py

@@ -2,4 +2,4 @@
 
 
 class ApiConfig(AppConfig):
-    name = 'api'
+    name = "api"

api/models.py

@@ -1,6 +1,7 @@
 from django.conf import settings
 from django.db.models.signals import post_save
 from django.dispatch import receiver
+
 from rest_framework.authtoken.models import Token
 
 

api/tests/test_models.py

@@ -1,10 +1,10 @@
 from django.contrib.auth.models import User
 from django.test import TestCase
+
 from rest_framework.authtoken.models import Token
 
 
 class ApiV1ModelsTests(TestCase):
-
     def test_tokens_are_created_for_all_users(self):
-        user = User.objects.create(username='testuser')
+        user = User.objects.create(username="testuser")
         self.assertEqual(1, Token.objects.filter(user=user).count())

api/tests/v1/base.py

@@ -1,9 +1,8 @@
-from django.test import TestCase
 from django.contrib.auth.models import User
+from django.test import TestCase
 
 
 class BaseAuthenticatedTests(TestCase):
-
     def setUp(self):
         self.user = User.objects.create(username="test", is_active=True)
         self.user.set_password("password")

api/tests/v1/test_playlists.py

@@ -1,77 +1,95 @@
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 
 from pipeline.tests import factories
+
 from .base import BaseAuthenticatedTests
 
 
 class PlaylistTests(BaseAuthenticatedTests):
-
     def test_list_playlists_no_result(self):
-        response = self.client.get(reverse('api:v1:playlist-list'))
+        response = self.client.get(reverse("api:v1:playlist-list"))
         playlists = response.json()
         self.assertEqual([], playlists)
 
     def test_get_playlist(self):
-        playlist = factories.PlaylistFactory(name="Funkadelic playlist", owner=self.user)
-        response = self.client.get(reverse('api:v1:playlist-detail', kwargs={'id': playlist.public_id}))
+        playlist = factories.PlaylistFactory(
+            name="Funkadelic playlist", owner=self.user
+        )
+        response = self.client.get(
+            reverse("api:v1:playlist-detail", kwargs={"id": playlist.public_id})
+        )
         result = response.json()
 
         self.assertEqual(200, response.status_code)
         self.assertEqual("Funkadelic playlist", result["name"])
         self.assertEqual(playlist.public_id, result["id"])
 
     def test_search_playlist_by_name(self):
-        factories.PlaylistFactory(name="Funkadelic", owner=self.user, public_id="funkid")
-        factories.PlaylistFactory(name="Rockabilly", owner=self.user, public_id="rockid")
+        factories.PlaylistFactory(
+            name="Funkadelic", owner=self.user, public_id="funkid"
+        )
+        factories.PlaylistFactory(
+            name="Rockabilly", owner=self.user, public_id="rockid"
+        )
 
-        response_funk = self.client.get(reverse('api:v1:playlist-list'), data={'name': 'Funk'})
+        response_funk = self.client.get(
+            reverse("api:v1:playlist-list"), data={"name": "Funk"}
+        )
         playlists_funk = response_funk.json()
 
         self.assertEqual(1, len(playlists_funk))
-        self.assertEqual('funkid', playlists_funk[0]['id'])
+        self.assertEqual("funkid", playlists_funk[0]["id"])
 
     def test_insert_video_in_playlist(self):
-        playlist = factories.PlaylistFactory(name="Funkadelic playlist", owner=self.user)
+        playlist = factories.PlaylistFactory(
+            name="Funkadelic playlist", owner=self.user
+        )
         factories.VideoFactory(public_id="videoid", owner=self.user)
 
         response = self.client.post(
-            reverse("api:v1:playlist-add-video", kwargs={'id': playlist.public_id}),
-            data={"id": 'videoid'}
+            reverse("api:v1:playlist-add-video", kwargs={"id": playlist.public_id}),
+            data={"id": "videoid"},
         )
 
         self.assertEqual(204, response.status_code)
         self.assertEqual(1, playlist.videos.count())
 
     def test_insert_non_existing_video_in_playlist(self):
-        playlist = factories.PlaylistFactory(name="Funkadelic playlist", owner=self.user)
+        playlist = factories.PlaylistFactory(
+            name="Funkadelic playlist", owner=self.user
+        )
 
         response = self.client.post(
-            reverse("api:v1:playlist-add-video", kwargs={'id': playlist.public_id}),
-            data={"id": 'videoid'}
+            reverse("api:v1:playlist-add-video", kwargs={"id": playlist.public_id}),
+            data={"id": "videoid"},
         )
 
         self.assertEqual(404, response.status_code)
 
     def test_insert_video_from_different_user_in_playlist(self):
-        playlist = factories.PlaylistFactory(name="Funkadelic playlist", owner=self.user)
+        playlist = factories.PlaylistFactory(
+            name="Funkadelic playlist", owner=self.user
+        )
         different_user = factories.UserFactory()
         factories.VideoFactory(public_id="videoid", owner=different_user)
 
         response = self.client.post(
-            reverse("api:v1:playlist-add-video", kwargs={'id': playlist.public_id}),
-            data={"id": 'videoid'}
+            reverse("api:v1:playlist-add-video", kwargs={"id": playlist.public_id}),
+            data={"id": "videoid"},
         )
 
         self.assertEqual(404, response.status_code)
 
     def test_remove_video_from_playlist(self):
-        playlist = factories.PlaylistFactory(name="Funkadelic playlist", owner=self.user)
+        playlist = factories.PlaylistFactory(
+            name="Funkadelic playlist", owner=self.user
+        )
         video = factories.VideoFactory(public_id="videoid", owner=self.user)
         playlist.videos.add(video)
 
         response = self.client.post(
-            reverse("api:v1:playlist-remove-video", kwargs={'id': playlist.public_id}),
-            data={"id": 'videoid'}
+            reverse("api:v1:playlist-remove-video", kwargs={"id": playlist.public_id}),
+            data={"id": "videoid"},
         )
 
         self.assertEqual(204, response.status_code)