Merge pull request #219 from eduNEXT/lmm/py38

[BD-6] Upgrade requirements and add python 3.8 tests

Author: awais786

.travis.yml

@@ -1,13 +1,17 @@
 language: python
 
-matrix:
-  include:
-    - python: "3.5"
-      env: DJANGO_SETTINGS_MODULE=settings
-      script:
-        - tox -e py35
-        - ./node_modules/gulp/bin/gulp.js test
-        - bash ./run_bokchoy_tests.sh
+python:
+  - 3.5
+  - 3.8
+
+envs:
+  - TOXENV=django22
+  - TOXENV=quality
+
+script:
+  - tox
+  - ./node_modules/gulp/bin/gulp.js test
+  - bash ./run_bokchoy_tests.sh
 
 addons:
   firefox: "46.0"

Makefile

@@ -3,3 +3,8 @@ upgrade: ## update the requirements/*.txt files with the latest packages satisfy
 	pip install -q pip-tools
 	pip-compile --upgrade -o requirements/base.txt requirements/base.in
 	pip-compile --upgrade -o requirements/testing.txt requirements/testing.in
+	# Let tox control the Django version for tests
+	grep -e "^django==" requirements/base.txt > requirements/django.txt
+	sed -i.tmp '/^[dD]jango==/d' requirements/testing.txt
+	rm requirements/testing.txt.tmp
+

edx_notifications/base_data.py

@@ -47,10 +47,9 @@ class Dict(dict):
     Create a subclass of dict to make it weak referencable
     per https://docs.python.org/2/library/weakref.html
     """
-    pass
 
 
-class TypedField(object):
+class TypedField:
     """
     Field Decscriptors used to enforce correct typing
     """
@@ -417,7 +416,7 @@ def validate(self):
         Validations should throw a ValidationError if there
         is a problem.
         """
-        pass  # this intentionally does nothing
+        # this intentionally does nothing
 
 
 class RelatedObjectField(TypedField):

edx_notifications/channels/link_resolvers.py

@@ -105,7 +105,7 @@ def resolve(self, msg_type_name, link_name, params, exact_match_only=False):
             return None
 
 
-class MsgTypeToUrlResolverMixin(object):
+class MsgTypeToUrlResolverMixin:
     """
     Helper mix-in class to share logic when channels need to use
     similar link resolvers

edx_notifications/channels/tests/test_parse_push.py

@@ -19,7 +19,7 @@
 from edx_notifications.channels.parse_push import _PARSE_SERVICE_USER_ID, ParsePushNotificationChannelProvider
 
 
-class MockCrashingParsePush(object):
+class MockCrashingParsePush:
     """
     Simulate an exception
     """

edx_notifications/lib/tests/test_lib.py

@@ -254,7 +254,7 @@ def test_bulk_publish_list(self):
 
         # now send to more than our internal chunking size
         bulk_publish_notification_to_users(
-            [user_id for user_id in range(1, const.NOTIFICATION_BULK_PUBLISH_CHUNK_SIZE * 2 + 1)],
+            list(range(1, const.NOTIFICATION_BULK_PUBLISH_CHUNK_SIZE * 2 + 1)),
             msg
         )
 
@@ -282,8 +282,8 @@ def test_bulk_publish_list_exclude(self):
             }
         )
 
-        user_ids = [user_id for user_id in range(1, const.NOTIFICATION_BULK_PUBLISH_CHUNK_SIZE * 2 + 1)]
-        exclude_user_ids = [user_id for user_id in range(1, const.NOTIFICATION_BULK_PUBLISH_CHUNK_SIZE * 2 + 1, 2)]
+        user_ids = list(range(1, const.NOTIFICATION_BULK_PUBLISH_CHUNK_SIZE * 2 + 1))
+        exclude_user_ids = list(range(1, const.NOTIFICATION_BULK_PUBLISH_CHUNK_SIZE * 2 + 1, 2))
 
         # now send to more than our internal chunking size
         bulk_publish_notification_to_users(

edx_notifications/openedx/group_project.py

@@ -19,7 +19,7 @@
 GROUP_PROJECT_RENDERER_PREFIX = 'edx_notifications.openedx.group_project'
 
 
-class NotificationMessageTypes(object):
+class NotificationMessageTypes:
     """
     Message type constants
     """

edx_notifications/renderers/basic.py

@@ -64,7 +64,7 @@ class UnderscoreStaticFileRenderer(BaseNotificationRenderer):
     underscore_template_name = None
     underscore_template = None
 
-    def __init__(self, template_name=None):
+    def __init__(self, template_name=None):  # pylint: disable=super-init-not-called
         """
         Initializer
         """

edx_notifications/scopes.py

@@ -31,7 +31,7 @@ def resolve(self, scope_name, scope_context, instance_context):
         raise NotImplementedError()
 
 
-class SingleUserScopeResolver(object):
+class SingleUserScopeResolver:
     """
     Simple implementation for scope_name='user' where there must
     be a user_id inside the scope_context

edx_notifications/server/api/consumer.py

@@ -79,7 +79,7 @@ def _get_parameters_from_request(request, allowed_parameters):
                     raise ValueError(
                         "Passed in expected bool '{val}' does not map to True or False".format(val=str_val)
                     )
-            elif filter_type == str or filter_type == six.text_type:
+            elif filter_type in (str, six.text_type):
                 value = str_val
             else:
                 raise ValueError('Unknown parameter type {name}'.format(name=filter_type))