[requirements] Dropped python 2 support

pawelplsi · pawelplsi · commit b00613737f30 · 2020-01-16T18:09:31.000Z
Upgraded necessary dependencies, deleted compatibility code, removed python 2 from travis config and documentation.
diff --git a/.travis.yml b/.travis.yml
@@ -3,22 +3,15 @@ language: python
 cache: pip
 
 python:
-  - "3.5"
-  - "2.7"
+  - "3.6"
+  - "3.7"
 
 branches:
   only:
     - master
 
 env:
-  - DJANGO="django>=2.1,<2.3"
-  - DJANGO="django>=1.11,<1.12"
-
-matrix:
-  exclude:
-    - python: "2.7"
-      env: DJANGO="django>=2.1,<2.3"
-
+  - DJANGO="django>=2.2,<3.3"
 before_install:
   - pip install -U pip wheel setuptools
   - pip install --no-cache-dir -U -r requirements-test.txt
@@ -27,12 +20,11 @@ before_install:
 
 install:
   - pip install $DJANGO
-  - if [[ $TRAVIS_PYTHON_VERSION == 2.7 ]]; then pip install -U "djangorestframework<3.10"; fi
   - python setup.py -q develop
 
 script:
   - coverage run --source=django_netjsongraph runtests.py
-  - if [[ $TRAVIS_PYTHON_VERSION == 3.5 ]]; then ./tests/manage.py makemigrations django_netjsongraph --dry-run | grep "No changes detected"; fi
+  - ./tests/manage.py makemigrations django_netjsongraph --dry-run | grep "No changes detected";
   - openwisp-utils-qa-checks --migration-path "./django_netjsongraph/migrations"
 
 after_success:
diff --git a/django_netjsongraph/api/serializers.py b/django_netjsongraph/api/serializers.py
@@ -14,7 +14,7 @@ def data(self):
     def to_representation(self, data):
         return OrderedDict((
             ('type', 'NetworkCollection'),
-            ('collection', super(NetworkCollectionSerializer, self).to_representation(data))
+            ('collection', super().to_representation(data))
         ))
 
 
diff --git a/django_netjsongraph/base/admin.py b/django_netjsongraph/base/admin.py
@@ -1,7 +1,7 @@
 from django.conf.urls import url
 from django.contrib import messages
 from django.contrib.admin import ModelAdmin
-from django.contrib.admin.templatetags.admin_static import static
+from django.templatetags.static import static
 from django.db.models import Q
 from django.template.response import TemplateResponse
 from django.urls import reverse
@@ -16,7 +16,7 @@ class TimeStampedEditableAdmin(ModelAdmin):
     """
     def __init__(self, *args, **kwargs):
         self.readonly_fields += ('created', 'modified',)
-        super(TimeStampedEditableAdmin, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
 
 class BaseAdmin(TimeStampedEditableAdmin):
@@ -56,7 +56,7 @@ def get_actions(self, request):
         """
         move delete action to last position
         """
-        actions = super(AbstractTopologyAdmin, self).get_actions(request)
+        actions = super().get_actions(request)
         delete = actions['delete_selected']
         del actions['delete_selected']
         actions['delete_selected'] = delete
@@ -77,7 +77,7 @@ def change_view(self, request, object_id, form_url='', extra_context=None):
                 }
             ]
         })
-        return super(AbstractTopologyAdmin, self).change_view(request, object_id, form_url, extra_context)
+        return super().change_view(request, object_id, form_url, extra_context)
 
     def get_urls(self):
         options = getattr(self.model, '_meta')
@@ -86,7 +86,7 @@ def get_urls(self):
             url(r'^visualize/(?P<pk>[^/]+)/$',
                 self.admin_site.admin_view(self.visualize_view),
                 name='{0}_visualize'.format(url_prefix)),
-        ] + super(AbstractTopologyAdmin, self).get_urls()
+        ] + super().get_urls()
 
     def _message(self, request, rows, suffix, level=messages.SUCCESS):
         if rows == 1:
@@ -171,7 +171,7 @@ def change_view(self, request, object_id, form_url='', extra_context=None):
                                                     Q(target_id=object_id)),
             'admin_url': admin_url
         })
-        return super(AbstractNodeAdmin, self).change_view(request, object_id, form_url, extra_context)
+        return super().change_view(request, object_id, form_url, extra_context)
 
 
 class AbstractLinkAdmin(BaseAdmin):
diff --git a/django_netjsongraph/base/link.py b/django_netjsongraph/base/link.py
@@ -5,7 +5,6 @@
 from django.core.exceptions import ValidationError
 from django.db import models
 from django.db.models import Q
-from django.utils.encoding import python_2_unicode_compatible
 from django.utils.timezone import now
 from django.utils.translation import ugettext_lazy as _
 from jsonfield import JSONField
@@ -18,7 +17,6 @@
 from .base import TimeStampedEditableModel
 
 
-@python_2_unicode_compatible
 class AbstractLink(TimeStampedEditableModel):
     """
     NetJSON NetworkGraph Link Object implementation
@@ -45,11 +43,11 @@ class Meta:
         abstract = True
 
     def __init__(self, *args, **kwargs):
-        super(AbstractLink, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         self._initial_status = self.status
 
     def save(self, *args, **kwargs):
-        super(AbstractLink, self).save(*args, **kwargs)
+        super().save(*args, **kwargs)
         if self.status != self._initial_status:
             self.send_status_changed_signal()
             self.status_changed = now()
diff --git a/django_netjsongraph/base/node.py b/django_netjsongraph/base/node.py
@@ -3,7 +3,6 @@
 from datetime import timedelta
 
 from django.db import models
-from django.utils.encoding import python_2_unicode_compatible
 from django.utils.functional import cached_property
 from django.utils.timezone import now
 from jsonfield import JSONField
@@ -14,7 +13,6 @@
 from .base import TimeStampedEditableModel
 
 
-@python_2_unicode_compatible
 class AbstractNode(TimeStampedEditableModel):
     """
     NetJSON NetworkGraph Node Object implementation
@@ -40,7 +38,7 @@ def clean(self):
             self.properties = {}
 
     def save(self, *args, **kwargs):
-        super(AbstractNode, self).save(*args, **kwargs)
+        super().save(*args, **kwargs)
 
     @property
     def netjson_id(self):
diff --git a/django_netjsongraph/base/topology.py b/django_netjsongraph/base/topology.py
@@ -5,7 +5,6 @@
 from django.core.exceptions import ValidationError
 from django.db import models
 from django.urls import reverse
-from django.utils.encoding import python_2_unicode_compatible
 from django.utils.functional import cached_property
 from django.utils.module_loading import import_string
 from django.utils.timezone import now
@@ -24,7 +23,6 @@
 )
 
 
-@python_2_unicode_compatible
 class AbstractTopology(TimeStampedEditableModel):
     label = models.CharField(_('label'), max_length=64)
     parser = models.CharField(_('format'),
diff --git a/django_netjsongraph/migrations/0001_initial.py b/django_netjsongraph/migrations/0001_initial.py
@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.9 on 2015-12-23 09:04
-from __future__ import unicode_literals
-
 import uuid
 
 import django.db.models.deletion
diff --git a/django_netjsongraph/migrations/0002_topology_published.py b/django_netjsongraph/migrations/0002_topology_published.py
@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.9 on 2015-12-26 17:05
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 
diff --git a/django_netjsongraph/migrations/0003_topology_receive_strategy.py b/django_netjsongraph/migrations/0003_topology_receive_strategy.py
@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.9 on 2016-01-24 14:35
-from __future__ import unicode_literals
-
 import django_netjsongraph.models
 from django.db import migrations, models
 
diff --git a/django_netjsongraph/migrations/0004_increased_addresses_maxlength.py b/django_netjsongraph/migrations/0004_increased_addresses_maxlength.py
@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.9.1 on 2016-01-24 17:08
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 
diff --git a/django_netjsongraph/migrations/0005_snapshot.py b/django_netjsongraph/migrations/0005_snapshot.py
@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.3 on 2017-07-24 20:26
-from __future__ import unicode_literals
-
 import uuid
 
 import django.db.models.deletion
diff --git a/django_netjsongraph/migrations/0006_added_openvpn_parser.py b/django_netjsongraph/migrations/0006_added_openvpn_parser.py
@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.7 on 2018-01-05 12:25
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 
diff --git a/django_netjsongraph/migrations/0007_link_status_changed.py b/django_netjsongraph/migrations/0007_link_status_changed.py
@@ -1,5 +1,4 @@
 # Generated by Django 2.0.1 on 2018-01-05 14:48
-
 from django.db import migrations, models
 
 
diff --git a/django_netjsongraph/tests/test_admin.py b/django_netjsongraph/tests/test_admin.py
@@ -14,4 +14,4 @@ def setUp(self):
         t = self._create_topology()
         self._create_node(label="node1", addresses=["192.168.0.1"], topology=t)
         self._create_node(label="node2", addresses=["192.168.0.2"], topology=t)
-        super(TestAdmin, self).setUp()
+        super().setUp()
diff --git a/django_netjsongraph/tests/utils.py b/django_netjsongraph/tests/utils.py
@@ -4,6 +4,7 @@
 import sys
 from contextlib import contextmanager
 from datetime import timedelta
+from io import StringIO
 
 import responses
 from django.core.management import call_command
@@ -12,11 +13,6 @@
 
 from .. import settings
 
-try:
-    from cStringIO import StringIO  # noqa
-except ImportError:
-    from io import StringIO  # noqa
-
 
 @contextmanager
 def redirect_stdout(stream):
@@ -31,9 +27,9 @@ class LoggingDisabledTestRunner(DiscoverRunner):
     def run_tests(self, test_labels, extra_tests=None, **kwargs):
         # disable logging below CRITICAL while testing
         logging.disable(logging.CRITICAL)
-        return super(LoggingDisabledTestRunner, self).run_tests(test_labels,
-                                                                extra_tests,
-                                                                **kwargs)
+        return super().run_tests(test_labels,
+                                 extra_tests,
+                                 **kwargs)
 
 
 class UnpublishMixin(object):
diff --git a/django_netjsongraph/visualizer/generics.py b/django_netjsongraph/visualizer/generics.py
@@ -1,4 +1,4 @@
-from django.shortcuts import render_to_response
+from django.shortcuts import render
 from django.urls import reverse
 from django.views import View
 
@@ -9,15 +9,15 @@
 class BaseTopologyListView(View):
     def get(self, request):
         topologies = self.topology_model.objects.filter(published=True)
-        return render_to_response('netjsongraph/list.html',
+        return render(request, 'netjsongraph/list.html',
                                   {'topologies': topologies,
                                    'VISUALIZER_CSS': VISUALIZER_CSS})
 
 
 class BaseTopologyDetailView(View):
     def get(self, request, pk):
         topology = get_object_or_404(self.topology_model, pk)
-        return render_to_response('netjsongraph/detail.html', {
+        return render(request, 'netjsongraph/detail.html', {
             'topology': topology,
             'graph_url': reverse('network_graph', args=[topology.pk]),
             'history_url': reverse('network_graph_history', args=[topology.pk]),
diff --git a/requirements.txt b/requirements.txt
@@ -1,7 +1,6 @@
-django>=1.11,<2.3
+django>=2.2,<3.3
 djangorestframework>=3.3,<3.12
 django-model-utils
 netdiff>=0.6.0,<0.7
-openwisp-utils>=0.3,<0.4
-jsonfield
-six
+openwisp-utils>=0.3,<0.5
+jsonfield2
diff --git a/setup.py b/setup.py
@@ -58,7 +58,6 @@ def get_install_requires():
         'Operating System :: OS Independent',
         'Framework :: Django',
         'Topic :: System :: Networking',
-        'Programming Language :: Python :: 2.7',
-        'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3',
     ]
 )
