[deps] Improved PR #99 (drop python2 and add django 3.0)

Author: nemesifier

.travis.yml

@@ -11,7 +11,9 @@ branches:
     - master
 
 env:
-  - DJANGO="django>=2.2,<3.3"
+  - DJANGO="django>=2.2,<3.0"
+  - DJANGO="django>=3.0,<3.1"
+
 before_install:
   - pip install -U pip wheel setuptools
   - pip install --no-cache-dir -U -r requirements-test.txt
@@ -22,10 +24,13 @@ install:
   - pip install $DJANGO
   - python setup.py -q develop
 
+before_script:
+  - |
+    openwisp-utils-qa-checks --migration-path "./django_netjsongraph/migrations" \
+                             --migration-module django_netjsongraph
+
 script:
   - coverage run --source=django_netjsongraph runtests.py
-  - ./tests/manage.py makemigrations django_netjsongraph --dry-run | grep "No changes detected";
-  - openwisp-utils-qa-checks --migration-path "./django_netjsongraph/migrations"
 
 after_success:
   coveralls

django_netjsongraph/api/urls.py

@@ -1,4 +1,4 @@
-from . import views
 from ..utils import get_api_urls
+from . import views
 
 urlpatterns = get_api_urls(views)

django_netjsongraph/base/admin.py

@@ -1,9 +1,9 @@
 from django.conf.urls import url
 from django.contrib import messages
 from django.contrib.admin import ModelAdmin
-from django.templatetags.static import static
 from django.db.models import Q
 from django.template.response import TemplateResponse
+from django.templatetags.static import static
 from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _
 

django_netjsongraph/base/topology.py

@@ -276,7 +276,7 @@ def link_status_changed(self, link, status):
         # if using fetch strategy or
         # using receive strategy and link is coming back up or
         # receive strategy and ``expiration_time is 0``
-        elif self.strategy == 'fetch' or status == 'up' or self.expiration_time is 0:
+        elif self.strategy == 'fetch' or status == 'up' or self.expiration_time == 0:
             return True
         # if using receive strategy and expiration_time of link has expired
         elif link.modified < (now() - timedelta(seconds=self.expiration_time)):

django_netjsongraph/management/commands/save_snapshot.py

@@ -1,5 +1,5 @@
-from . import BaseSaveSnapshotCommand
 from ...models import Topology
+from . import BaseSaveSnapshotCommand
 
 
 class Command(BaseSaveSnapshotCommand):

django_netjsongraph/management/commands/update_topology.py

@@ -1,5 +1,5 @@
-from . import BaseUpdateCommand
 from ...models import Topology
+from . import BaseUpdateCommand
 
 
 class Command(BaseUpdateCommand):

django_netjsongraph/migrations/0001_initial.py

@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.9 on 2015-12-23 09:04
+# Edited manually on 2020-01-20
+import collections
 import uuid
 
 import django.db.models.deletion
@@ -26,7 +28,7 @@ class Migration(migrations.Migration):
                 ('cost', models.FloatField()),
                 ('cost_text', models.CharField(blank=True, max_length=24)),
                 ('status', model_utils.fields.StatusField(choices=[('up', 'up'), ('down', 'down')], default='up', max_length=100, no_check_for_status=True)),
-                ('properties', jsonfield.fields.JSONField(blank=True, default=dict)),
+                ('properties', jsonfield.fields.JSONField(blank=True, default=dict, dump_kwargs={'indent': 4}, load_kwargs={'object_pairs_hook': collections.OrderedDict})),
             ],
             options={
                 'abstract': False,
@@ -40,7 +42,7 @@ class Migration(migrations.Migration):
                 ('modified', model_utils.fields.AutoLastModifiedField(default=django.utils.timezone.now, editable=False, verbose_name='modified')),
                 ('label', models.CharField(blank=True, max_length=64)),
                 ('addresses', models.CharField(db_index=True, max_length=255)),
-                ('properties', jsonfield.fields.JSONField(blank=True, default=dict)),
+                ('properties', jsonfield.fields.JSONField(blank=True, default=dict, dump_kwargs={'indent': 4}, load_kwargs={'object_pairs_hook': collections.OrderedDict})),
             ],
             options={
                 'abstract': False,

django_netjsongraph/tests/base/test_link.py

@@ -39,7 +39,8 @@ def test_json(self):
         t = self.topology_model.objects.first()
         node1, node2 = self._get_nodes()
         link = t._create_link(source=node1, target=node2, cost=1.0,
-                              cost_text='100mbit/s', properties='{"pretty": true}')
+                              cost_text='100mbit/s',
+                              properties={"pretty": True})
         self.assertEqual(dict(link.json(dict=True)), {
             'source': '192.168.0.1',
             'target': '192.168.0.2',

django_netjsongraph/tests/base/test_node.py

@@ -51,7 +51,7 @@ def test_json(self):
         t = self.topology_model.objects.first()
         n = t._create_node(label='test node',
                            addresses=['192.168.0.1', '10.0.0.1'],
-                           properties='{"gateway": true}')
+                           properties={"gateway": True})
         self.assertEqual(dict(n.json(dict=True)), {
             'id': '192.168.0.1',
             'label': 'test node',

django_netjsongraph/tests/test_admin.py

@@ -1,7 +1,7 @@
 from django.test import TestCase
 
-from . import CreateGraphObjectsMixin
 from ..models import Link, Node, Topology
+from . import CreateGraphObjectsMixin
 from .base.test_admin import TestAdminMixin