[deps] Added support for Django 4.1.0 and Django 4.2.0

- Dropped support for Python 3.7
- Bumped django-notifications-hq~=1.8.2
- Bumped markdown~=3.4.3
- [ci] Run testsuite with parallel support

Author: pandafy

.coveragerc

@@ -4,4 +4,7 @@ omit =
     /tests
     /*/__init__.py
     /setup.py
-    /*/migrations/*
+    /*/migrations/*
+source = openwisp_notifications
+parallel = true
+concurrency = multiprocessing

.github/workflows/build.yml

@@ -26,18 +26,13 @@ jobs:
       fail-fast: false
       matrix:
         python-version:
-          - 3.7
-          - 3.8
-          - 3.9
+          - "3.8"
+          - "3.9"
+          - "3.10"
         django-version:
-          - django~=3.0.0
-          - django~=3.1.0
           - django~=3.2.0
-        include:
-          - django-version: django~=4.0.0
-            python-version: 3.9
-          - django-version: django~=4.0.0
-            python-version: 3.8
+          - django~=4.1.0
+          - django~=4.2.0
 
     steps:
     - uses: actions/checkout@v2
@@ -57,14 +52,14 @@ jobs:
     - name: Upgrade python system packages
       run: pip install -U pip wheel setuptools
 
-    - name: Install openwisp-notifications
+    - name: Install test dependencies
       run: |
-        pip install -e .
+        pip install -U -r requirements-test.txt
 
-    - name: Install test dependencies
+    - name: Install openwisp-notifications
       run: |
+        pip install -U -e .
         pip install ${{ matrix.django-version }}
-        pip install -U -r requirements-test.txt
 
     - name: Install npm dependencies
       run: sudo npm install -g jshint stylelint
@@ -75,8 +70,9 @@ jobs:
 
     - name: Tests
       run: |
-        SAMPLE_APP=1 coverage run --source=openwisp_notifications runtests.py
-        coverage run -a --source=openwisp_notifications runtests.py
+        SAMPLE_APP=1 ./runtests.py
+        coverage run runtests.py --parallel
+        coverage combine
 
     - name: Upload Coverage
       run: coveralls --service=github

openwisp_notifications/__init__.py

@@ -16,6 +16,3 @@ def get_version():
                 rev = 0
             version = '%s%s%s' % (version, VERSION[3][0:1], rev)
     return version
-
-
-default_app_config = 'openwisp_notifications.apps.OpenwispNotificationsConfig'

openwisp_notifications/migrations/0001_initial.py

@@ -97,30 +97,74 @@ class Migration(migrations.Migration):
                         ],
                         default='info',
                         max_length=20,
+                        verbose_name='level',
                     ),
                 ),
-                ('unread', models.BooleanField(db_index=True, default=True)),
-                ('actor_object_id', models.CharField(max_length=255)),
-                ('verb', models.CharField(max_length=255)),
-                ('description', models.TextField(blank=True, null=True)),
+                (
+                    'unread',
+                    models.BooleanField(
+                        db_index=True, default=True, verbose_name='unread'
+                    ),
+                ),
+                (
+                    'actor_object_id',
+                    models.CharField(max_length=255, verbose_name='actor object id'),
+                ),
+                ('verb', models.CharField(max_length=255, verbose_name='verb')),
+                (
+                    'description',
+                    models.TextField(blank=True, null=True, verbose_name='description'),
+                ),
                 (
                     'target_object_id',
-                    models.CharField(blank=True, max_length=255, null=True),
+                    models.CharField(
+                        blank=True,
+                        max_length=255,
+                        null=True,
+                        verbose_name='target object id',
+                    ),
                 ),
                 (
                     'action_object_object_id',
-                    models.CharField(blank=True, max_length=255, null=True),
+                    models.CharField(
+                        blank=True,
+                        max_length=255,
+                        null=True,
+                        verbose_name='action object object id',
+                    ),
                 ),
                 (
                     'timestamp',
                     models.DateTimeField(
-                        db_index=True, default=django.utils.timezone.now
+                        db_index=True,
+                        default=django.utils.timezone.now,
+                        verbose_name='timestamp',
+                    ),
+                ),
+                (
+                    'public',
+                    models.BooleanField(
+                        db_index=True, default=True, verbose_name='public'
+                    ),
+                ),
+                (
+                    'deleted',
+                    models.BooleanField(
+                        db_index=True, default=False, verbose_name='deleted'
+                    ),
+                ),
+                (
+                    'emailed',
+                    models.BooleanField(
+                        db_index=True, default=False, verbose_name='emailed'
+                    ),
+                ),
+                (
+                    'data',
+                    jsonfield.fields.JSONField(
+                        blank=True, null=True, verbose_name='data'
                     ),
                 ),
-                ('public', models.BooleanField(db_index=True, default=True)),
-                ('deleted', models.BooleanField(db_index=True, default=False)),
-                ('emailed', models.BooleanField(db_index=True, default=False)),
-                ('data', jsonfield.fields.JSONField(blank=True, null=True)),
                 (
                     'id',
                     models.UUIDField(
@@ -138,6 +182,7 @@ class Migration(migrations.Migration):
                         on_delete=django.db.models.deletion.CASCADE,
                         related_name='notify_action_object',
                         to='contenttypes.ContentType',
+                        verbose_name='action object content type',
                     ),
                 ),
                 (
@@ -146,6 +191,7 @@ class Migration(migrations.Migration):
                         on_delete=django.db.models.deletion.CASCADE,
                         related_name='notify_actor',
                         to='contenttypes.ContentType',
+                        verbose_name='actor content type',
                     ),
                 ),
                 (
@@ -154,6 +200,7 @@ class Migration(migrations.Migration):
                         on_delete=django.db.models.deletion.CASCADE,
                         related_name='notifications',
                         to=settings.AUTH_USER_MODEL,
+                        verbose_name='recipient',
                     ),
                 ),
                 (
@@ -164,6 +211,7 @@ class Migration(migrations.Migration):
                         on_delete=django.db.models.deletion.CASCADE,
                         related_name='notify_target',
                         to='contenttypes.ContentType',
+                        verbose_name='target content type',
                     ),
                 ),
             ],
@@ -172,6 +220,8 @@ class Migration(migrations.Migration):
                 'abstract': False,
                 'swappable': 'OPENWISP_NOTIFICATIONS_NOTIFICATION_MODEL',
                 'index_together': {('recipient', 'unread')},
+                'verbose_name': 'Notification',
+                'verbose_name_plural': 'Notifications',
             },
         ),
     ]

openwisp_notifications/templatetags/notification_tags.py

@@ -2,9 +2,6 @@
 from django.core.cache import cache
 from django.template import Library
 from django.utils.html import format_html
-from notifications.templatetags.notifications_tags import (
-    notifications_unread as base_notification_unread,
-)
 
 from openwisp_notifications.swapper import load_model
 from openwisp_notifications.utils import normalize_unread_count
@@ -14,12 +11,16 @@
 register = Library()
 
 
+def _get_user_unread_count(user):
+    return user.notifications.unread().count()
+
+
 def get_notifications_count(context):
     user_pk = context['user'].is_authenticated and context['user'].pk
     cache_key = Notification.count_cache_key(user_pk)
     count = cache.get(cache_key)
     if count is None:
-        count = base_notification_unread(context)
+        count = _get_user_unread_count(context['user'])
         count = normalize_unread_count(count)
         cache.set(cache_key, count)
     return count

openwisp_notifications/tests/test_admin.py

@@ -87,7 +87,7 @@ def test_zero_notifications(self):
         self.assertContains(r, self._expected_output())
 
     def test_non_zero_notifications(self):
-        patched_function = 'openwisp_notifications.templatetags.notification_tags.base_notification_unread'
+        patched_function = 'openwisp_notifications.templatetags.notification_tags._get_user_unread_count'
         with self.subTest("Test UI for less than 100 notifications"):
             with patch(patched_function, return_value=10):
                 r = self.client.get(self._url)

requirements-test.txt

@@ -1,8 +1,7 @@
 openwisp-utils[qa] @ https://github.com/openwisp/openwisp-utils/tarball/master
-django-redis~=4.12.1
-django-cors-headers~=3.5.0
-redis~=3.5.3
-channels_redis~=3.4.0
-pytest-asyncio~=0.14.0
-pytest-django~=4.1.0
-freezegun~=1.1.0
+django-cors-headers~=4.0.0
+django-redis~=5.2.0
+channels_redis~=4.1.0
+pytest-asyncio~=0.21.0
+pytest-django~=4.5.0
+freezegun~=1.2.2

requirements.txt

@@ -1,5 +1,5 @@
-django-notifications-hq~=1.7.0
+django-notifications-hq~=1.8.2
 channels~=3.0.2
 openwisp-users @ https://github.com/openwisp/openwisp-users/tarball/master
 openwisp-utils[rest,celery] @ https://github.com/openwisp/openwisp-utils/tarball/master
-markdown~=3.2.0
+markdown~=3.4.3

setup.py

@@ -64,6 +64,6 @@ def get_install_requires():
         'License :: OSI Approved :: GNU General Public License v3 (GPLv3)',
         'Operating System :: OS Independent',
         'Framework :: Django',
-        'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
     ],
 )

tests/openwisp2/sample_notifications/__init__.py

@@ -1 +0,0 @@
-default_app_config = 'openwisp2.sample_notifications.apps.SampleNotificationsConfig'

tests/openwisp2/sample_notifications/apps.py

@@ -43,3 +43,6 @@ def connect_recievers(self):
             test_app_name_changed,
             dispatch_uid='test_app_name_changed_invalidation',
         )
+
+
+del OpenwispNotificationsConfig