feat: Added Support for Django 3.2 (#313)

.travis.yml

@@ -7,10 +7,7 @@ env:
   - TOXENV=django22
   - TOXENV=django30
   - TOXENV=django31
-matrix:
-  allow_failures:
-    - python: 3.8
-      env: TOXENV=django31
+  - TOXENV=django32
 install:
   - pip install -r requirements/travis.txt
 script:

edxval/tests/test_api.py

@@ -2410,10 +2410,12 @@ def test_update_video_image(self):
         """
         Verify that `update_video_image` api function works as expected.
         """
-        self.assertEqual(self.course_video.video_image.image.name, self.image_url)
-        self.assertEqual(self.course_video2.video_image.image.name, self.image_url2)
-        self.assertEqual(ImageFile(open(self.image_path1, 'rb')).size, ImageFile(open(self.image_url, 'rb')).size)
-        self.assertEqual(ImageFile(open(self.image_path2, 'rb')).size, ImageFile(open(self.image_url2, 'rb')).size)
+        image_url = self.image_url.lstrip('/')
+        image_url2 = self.image_url2.lstrip('/')
+        self.assertEqual(self.course_video.video_image.image.name, image_url)
+        self.assertEqual(self.course_video2.video_image.image.name, image_url2)
+        self.assertEqual(ImageFile(open(self.image_path1, 'rb')).size, ImageFile(open(image_url, 'rb')).size)
+        self.assertEqual(ImageFile(open(self.image_path2, 'rb')).size, ImageFile(open(image_url2, 'rb')).size)
 
     def test_get_course_video_image_url(self):
         """
@@ -2585,7 +2587,7 @@ def test_video_image_deletion_single(self):
 
         # Verify that new image is set to course_video
         course_video = CourseVideo.objects.get(video=self.video, course_id=self.course_id)
-        self.assertEqual(course_video.video_image.image.name, image_url)
+        self.assertEqual(course_video.video_image.image.url, image_url)
 
         # Verify that an exception is raised if we try to open a delete image file
         with self.assertRaises(IOError) as file_open_exception:
@@ -2848,8 +2850,9 @@ def test_create_or_update_video_transcript(self, file_data, file_name, file_form
         self.assertEqual(video_transcript.language_code, language_code)
 
         if file_data:
-            self.assertTrue(transcript_url.startswith(settings.VIDEO_TRANSCRIPTS_SETTINGS['DIRECTORY_PREFIX']))
-            self.assertEqual(video_transcript.transcript.name, transcript_url)
+            self.assertTrue(transcript_url.lstrip('/').startswith(
+                settings.VIDEO_TRANSCRIPTS_SETTINGS['DIRECTORY_PREFIX']))
+            self.assertEqual(video_transcript.transcript.url, transcript_url)
             with open(video_transcript.transcript.name, encoding='utf8') as saved_transcript:
                 self.assertEqual(saved_transcript.read(), constants.TRANSCRIPT_DATA['overwatch'])
         else:

edxval/tests/test_views.py

@@ -826,6 +826,7 @@ def test_create_transcript(self):
         self.assertEqual(response.status_code, status.HTTP_200_OK)
 
         serialized_data = TranscriptSerializer(VideoTranscript.objects.first()).data
+        serialized_data['url'] = serialized_data['url'].lstrip('/')
         post_transcript_data['url'] = post_transcript_data.pop('name')
         self.assertDictEqual(serialized_data, post_transcript_data)
 

setup.py

@@ -47,7 +47,7 @@ def load_requirements(*requirements_paths):
     return list(requirements)
 
 
-VERSION = '2.0.3'
+VERSION = '2.1.0'
 
 if sys.argv[-1] == 'tag':
     print("Tagging the version on github:")
@@ -74,6 +74,9 @@ def load_requirements(*requirements_paths):
         'Programming Language :: Python :: 3.8',
         'Framework :: Django',
         'Framework :: Django :: 2.2',
+        'Framework :: Django :: 3.0',
+        'Framework :: Django :: 3.1',
+        'Framework :: Django :: 3.2',
     ],
     packages=PACKAGES,
     install_requires=load_requirements('requirements/base.in'),

tox.ini

@@ -1,11 +1,12 @@
 [tox]
-envlist =  py38-django{22,30,31}, quality
+envlist =  py38-django{22,30,31,32}, quality
 
 [testenv]
 deps =
 	django22: Django>=2.2,<2.3
 	django30: Django>=3.0,<3.1
 	django31: Django>=3.1,<3.2
+	django32: Django>=3.2,<3.3
 	-r{toxinidir}/requirements/test.txt
 commands =
 	python -Wd -m pytest {posargs}