Merge pull request #79 from edx/jeskew/drf_upgrade

Upgrade DRF version.

edxval/serializers.py

@@ -100,7 +100,7 @@ class CourseSerializer(serializers.RelatedField):
         Convert data into CourseVideo instance and image filename tuple.
         """
         course_id = data
-        course_video = image = None
+        course_video = image = ''
         if data:
             if isinstance(data, dict):
                 (course_id, image), = data.items()

edxval/tests/test_views.py

@@ -498,7 +498,7 @@ class VideoListTest(APIAuthTestCase):
         self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
         self.assertEqual(
             response.data.get("edx_video_id")[0],
-            "This field must be unique."
+            u'video with this edx video id already exists.'
         )
         videos = len(self.client.get("/edxval/videos/").data)
         self.assertEqual(videos, 1)

requirements.txt

 django>=1.8,<1.9
-djangorestframework>=3.1,<3.2
+git+https://github.com/edx/django-rest-framework.git@1ceda7c086fddffd1c440cc86856441bbf0bd9cb#egg=djangorestframework==3.6.3
 enum34==1.0.4
 lxml==3.3.6
 -e git+https://github.com/edx/django-oauth2-provider.git@0.2.7-fork-edx-6a#egg=django-oauth2-provider==0.2.7-fork-edx-6

setup.py

@@ -39,7 +39,7 @@ def load_requirements(*requirements_paths):
 
 setup(
     name='edxval',
-    version='0.0.17',
+    version='0.0.18',
     author='edX',
     url='http://github.com/edx/edx-val',
     description='edx-val',