Merge pull request #86 from benjaoming/django2.2

Django 2.2 support

Author: benjaoming

.travis.yml

@@ -26,9 +26,13 @@ matrix:
     sudo: false
     env: DJANGO="2.0"
   - python: 3.5
-    dist: trusty
+    dist: xenial
     sudo: false
     env: DJANGO="2.1"
+  - python: 3.5
+    dist: xenial
+    sudo: false
+    env: DJANGO="2.2"
 
   - python: 3.6
     dist: trusty
@@ -39,9 +43,13 @@ matrix:
     sudo: false
     env: DJANGO="2.0"
   - python: 3.6
-    dist: trusty
+    dist: xenial
     sudo: false
     env: DJANGO="2.1"
+  - python: 3.6
+    dist: xenial
+    sudo: false
+    env: DJANGO="2.2"
 
   - python: 3.7
     dist: xenial
@@ -51,11 +59,19 @@ matrix:
     dist: xenial
     sudo: true
     env: DJANGO="2.1"
+  - python: 3.7
+    dist: xenial
+    sudo: true
+    env: DJANGO="2.2"
 
   - python: pypy
     dist: trusty
     sudo: false
     env: DJANGO="2.1"
+  - python: pypy
+    dist: trusty
+    sudo: false
+    env: DJANGO="2.2"
 
 install:
   - pip install tox tox-travis coverage codecov

django_nyt/__init__.py

@@ -1,5 +1,5 @@
 _disable_notifications = False
 
-__version__ = "1.1.2"
+__version__ = "1.1.3"
 
 default_app_config = "django_nyt.apps.DjangoNytConfig"

django_nyt/management/commands/notifymail.py

@@ -10,8 +10,12 @@
 from django.core import mail
 from django.core.management.base import BaseCommand
 from django.template.loader import render_to_string
-from django.utils.translation import activate, deactivate, gettext as _
-from django_nyt import models, settings as nyt_settings
+from django.utils.translation import activate
+from django.utils.translation import deactivate
+from django.utils.translation import gettext as _
+
+from django_nyt import models
+from django_nyt import settings as nyt_settings
 
 # Daemon / mail loop sleep between each database poll (seconds)
 SLEEP_TIME = 120
@@ -166,10 +170,8 @@ def send_loop(self, connection, sleep_time):
             if last_sent:
                 user_settings = models.Settings.objects.filter(
                     interval__lte=(
-                        (started_sending_at -
-                         last_sent).seconds //
-                        60) //
-                    60).order_by('user')
+                        (started_sending_at - last_sent).seconds // 60) // 60
+                ).order_by('user')
             else:
                 user_settings = None
 

django_nyt/models.py

@@ -2,9 +2,11 @@
 from django.core.exceptions import ValidationError
 from django.db import models
 from django.db.models import Q
-from django.db.models.signals import post_delete, post_save
+from django.db.models.signals import post_delete
+from django.db.models.signals import post_save
 from django.dispatch import receiver
 from django.utils.translation import gettext_lazy as _
+
 from django_nyt import settings
 
 _notification_type_cache = {}
@@ -266,8 +268,7 @@ def create_notifications(cls, key, **kwargs):
         )
         if object_id:
             subscriptions = subscriptions.filter(
-                Q(object_id=object_id) |
-                Q(object_id=None)
+                Q(object_id=object_id) | Q(object_id=None)
             )
         if recipient_users:
             subscriptions = subscriptions.filter(
@@ -286,9 +287,9 @@ def create_notifications(cls, key, **kwargs):
 
             # Check if it's the same as the previous message
             latest = subscription.latest
-            if latest and (latest.message == kwargs.get('message', None) and
-                           latest.url == kwargs.get('url', None) and
-                           latest.is_viewed is False):
+            if latest and (latest.message == kwargs.get('message', None)
+                           and latest.url == kwargs.get('url', None)
+                           and latest.is_viewed is False):
                 # Both message and URL are the same, and it hasn't been viewed
                 # so just increment occurrence count.
                 latest.occurrences = latest.occurrences + 1

django_nyt/settings.py

@@ -59,8 +59,8 @@
 ############
 
 ENABLE_CHANNELS = (
-    'channels' in django_settings.INSTALLED_APPS and
-    not getattr(django_settings, 'NYT_CHANNELS_DISABLE', False)
+    'channels' in django_settings.INSTALLED_APPS
+    and not getattr(django_settings, 'NYT_CHANNELS_DISABLE', False)
 )
 """Channels are enabled automatically when 'channels' application is installed,
 however you can explicitly disable it with NYT_CHANNELS_DISABLE."""

django_nyt/urls.py

@@ -6,13 +6,13 @@
 app_name = 'nyt'
 
 urlpatterns = [
-    url('^json/get/$', views.get_notifications, name='json_get'),
-    url('^json/get/(?P<latest_id>\d+)/$', views.get_notifications, name='json_get'),
-    url('^json/mark-read/$', views.mark_read, name='json_mark_read_base'),
-    url('^json/mark-read/(\d+)/$', views.mark_read, name='json_mark_read'),
-    url('^json/mark-read/(?P<id_lte>\d+)/(?P<id_gte>\d+)/$', views.mark_read, name='json_mark_read'),
-    url('^goto/(?P<notification_id>\d+)/$', views.goto, name='goto'),
-    url('^goto/$', views.goto, name='goto_base'),
+    url(r'^json/get/$', views.get_notifications, name='json_get'),
+    url(r'^json/get/(?P<latest_id>\d+)/$', views.get_notifications, name='json_get'),
+    url(r'^json/mark-read/$', views.mark_read, name='json_mark_read_base'),
+    url(r'^json/mark-read/(\d+)/$', views.mark_read, name='json_mark_read'),
+    url(r'^json/mark-read/(?P<id_lte>\d+)/(?P<id_gte>\d+)/$', views.mark_read, name='json_mark_read'),
+    url(r'^goto/(?P<notification_id>\d+)/$', views.goto, name='goto'),
+    url(r'^goto/$', views.goto, name='goto_base'),
 ]
 
 

django_nyt/views.py

@@ -1,9 +1,12 @@
 from django.contrib.auth.decorators import login_required
 from django.db.models import Q
-from django.shortcuts import get_object_or_404, redirect
+from django.shortcuts import get_object_or_404
+from django.shortcuts import redirect
 from django.utils.translation import gettext as _
+
 from django_nyt import models
-from django_nyt.decorators import json_view, login_required_ajax
+from django_nyt.decorators import json_view
+from django_nyt.decorators import login_required_ajax
 
 
 @login_required_ajax
@@ -36,8 +39,7 @@ def get_notifications(
     """
 
     notifications = models.Notification.objects.filter(
-        Q(subscription__settings__user=request.user) |
-        Q(user=request.user),
+        Q(subscription__settings__user=request.user) | Q(user=request.user),
     )
 
     if is_viewed is not None:
@@ -73,8 +75,7 @@ def goto(request, notification_id=None):
         return redirect(referer)
     notification = get_object_or_404(
         models.Notification,
-        Q(subscription__settings__user=request.user) |
-        Q(user=request.user),
+        Q(subscription__settings__user=request.user) | Q(user=request.user),
         id=notification_id
     )
     notification.is_viewed = True
@@ -89,8 +90,7 @@ def goto(request, notification_id=None):
 def mark_read(request, id_lte, notification_type_id=None, id_gte=None):
 
     notifications = models.Notification.objects.filter(
-        Q(subscription__settings__user=request.user) |
-        Q(user=request.user),
+        Q(subscription__settings__user=request.user) | Q(user=request.user),
         id__lte=id_lte
     )
 

docs/release_notes.rst

@@ -1,6 +1,16 @@
 Release Notes
 =============
 
+1.1.3
+-----
+
+Added
+^^^^^
+
+ * Django 2.2 support (added to test matrix)
+ * Linting (no changes to functionality)
+
+
 1.1.2
 -----
 

runtests.py

@@ -10,6 +10,7 @@
     'django.contrib.contenttypes',
     'django.contrib.sessions',
     'django.contrib.admin',
+    'django.contrib.messages',
     'django.contrib.humanize',
     'django.contrib.sites',
     'django_nyt',

setup.cfg

@@ -5,7 +5,7 @@ universal = 0
 description-file = README.rst
 
 [flake8]
-ignore = E226,E302,E303,E41,E501
+ignore = E226,E302,E303,E41,E501,W503
 max-line-length = 160
 max-complexity = 10
 exclude = */*migrations

setup.py

@@ -17,7 +17,7 @@
     keywords=["django", "notification" "alerts"],
     packages=find_packages(),
     zip_safe=False,
-    install_requires=["django>=1.11,<2.2"],
+    install_requires=["django>=1.11,<2.3"],
     classifiers=[
         'Development Status :: 5 - Production/Stable',
         'License :: OSI Approved :: GNU General Public License v3 (GPLv3)',

tox.ini

@@ -1,19 +1,21 @@
 [tox]
 # Ensure you add to .travis.yml if you add here
-envlist = {py34,py35,py36}-django{111,20,21}
+envlist = {py34,py35,py36,py37,pypy}-django{111,20,21,22}
 
 [travis]
 python =
   3.4: py34
-  3.5: py35,lint
-  3.6: py36
+  3.5: py35
+  3.6: py36,lint
   3.7: py37
+  pypy: py
 
 [travis:env]
 DJANGO =
   1.11: django111
   2.0: django20
   2.1: django21
+  2.2: django22
 LINT =
   yes: lint
 
@@ -30,16 +32,17 @@ deps =
   django111: Django>=1.11,<2.0
   django20: Django>=2.0,<2.1
   django21: Django>=2.1,<2.2
+  django22: Django>=2.2,<2.3
 
 basepython =
   py34: python3.4
   py35: python3.5
   py36: python3.6
   py37: python3.7
-
+  pypy: python
 
 [testenv:lint]
-basepython = python3.5
+basepython = python3.6
 deps = flake8
 commands =
   flake8 django_nyt