Merge pull request #5 from open-craft/aayush/BB-3045-juniper-upgrade

[BB-3045] Juniper Upgrade

.travis.yml

@@ -1,5 +1,5 @@
 language: python
 python:
- - "2.7"
+ - "3.5"
 
 script: nosetests

requirements.txt

@@ -1,4 +1,4 @@
-git+https://github.com/edx/XBlock.git#egg=XBlock==0.4.12
-git+https://github.com/edx/xblock-utils.git#egg=xblock-utils==1.0.2
-django==1.11.29
+XBlock~=1.3.1
+xblock-utils~=2.1.1
+django==2.2.15
 mako==1.0.2

setup.py

@@ -22,7 +22,7 @@ def package_data(pkg, roots):
 
 setup(
     name='wistiavideo-xblock',
-    version='0.1',
+    version='0.2',
     description='wistiavideo XBlock',   # TODO: write a better description.
     license='GPL v3',
     packages=[

wistiavideo/tests/test_xblock.py

@@ -3,7 +3,7 @@
 
 from xblock.runtime import KvsFieldData, DictKeyValueStore
 from xblock.test.tools import (
-    assert_in, assert_equals, assert_true, assert_false, TestRuntime
+    TestRuntime
 )
 
 from wistiavideo import WistiaVideoXBlock
@@ -22,13 +22,13 @@ class WistiaXblockTests(WistiaXblockBaseTests, unittest.TestCase):
     def test_media_id_property(self):
         xblock = self.make_xblock()
         xblock.href = 'https://example.wistia.com/medias/12345abcde'
-        assert_equals(xblock.media_id, '12345abcde')
+        self.assertEquals(xblock.media_id, '12345abcde')
 
     def test_student_view(self):
         xblock = self.make_xblock()
 
         student_view_html = xblock.student_view()
-        assert_in(xblock.media_id, student_view_html.body_html())
+        self.assertIn(xblock.media_id, student_view_html.body_html())
 
 
 class WistiaXblockValidationTests(WistiaXblockBaseTests, unittest.TestCase):
@@ -45,7 +45,7 @@ def test_validate_correct_inputs(self):
             validation.add = Mock()
             xblock.validate_field_data(validation, data)
 
-            assert_false(validation.add.called)
+            self.assertFalse(validation.add.called)
 
     @patch('xblock.validation.ValidationMessage')
     def test_validate_incorrect_inputs(self, ValidationMessage):
@@ -56,4 +56,4 @@ def test_validate_incorrect_inputs(self, ValidationMessage):
         validation.add = Mock()
 
         xblock.validate_field_data(validation, data)
-        assert_true(validation.add.called)
+        self.assertTrue(validation.add.called)

wistiavideo/wistiavideo.py

@@ -53,7 +53,7 @@ def validate_field_data(self, validation, data):
         if data.href != '' and not VIDEO_URL_RE.match(data.href):
             validation.add(ValidationMessage(
                 ValidationMessage.ERROR,
-                _(u"Incorrect video url, please recheck")
+                _("Incorrect video url, please recheck")
             ))
 
     def resource_string(self, path):